Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (84c0b2655c5d024b1b508255e7d2c65a8a7c2f31)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ladislav Hagara <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (84c0b2655c5d024b1b508255e7d2c65a8a7c2f31)
  • Date: Tue, 5 Jun 2012 21:38:56 -0500

GIT changes to master grimoire by Ladislav Hagara <hgr AT vabo.cz>:

http/firefox/DETAILS | 6 +++---
http/firefox/HISTORY | 5 +++++
http/firefox/PRE_BUILD | 2 +-
http/firefox/mozconfig | 31 +++++++++++++++++++++++++++++++
http/firefox/mozconfig5 | 30 ------------------------------
5 files changed, 40 insertions(+), 34 deletions(-)

New commits:
commit 84c0b2655c5d024b1b508255e7d2c65a8a7c2f31
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

firefox 13.0, SECURITY_PATCH=49

diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index b75ffc9..22d6e7d 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -1,13 +1,13 @@
SPELL=firefox
if [[ $FIREFOX_CVS == y ]]; then
- VERSION=12.0
+ VERSION=13.0
SOURCE=$SPELL-$VERSION.source.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_GPG=firefox.gpg:$SOURCE2:UPSTREAM_KEY

SOURCE_URL[0]=http://releases.mozilla.org/pub/mozilla.org/${SPELL}/releases/${VERSION}/source/${SOURCE}
SOURCE2_URL[0]=$SOURCE_URL.asc
else
- VERSION=12.0
+ VERSION=13.0
SOURCE=$SPELL-$VERSION.source.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_GPG=firefox.gpg:$SOURCE2:UPSTREAM_KEY
@@ -15,7 +15,7 @@ else

SOURCE_URL[1]=ftp://ftp.mozilla.org/pub/$SPELL/releases/$VERSION/source/$SOURCE

SOURCE_URL[2]=ftp://ftp.in2p3.fr/pub/mozilla/$SPELL/releases/$VERSION/source/$SOURCE
SOURCE2_URL[0]=$SOURCE_URL.asc
- SECURITY_PATCH=48
+ SECURITY_PATCH=49
fi
SOURCE2_IGNORE=signature
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index f9caefc..a673d2c 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,8 @@
+2012-06-06 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 13.0, SECURITY_PATCH=49
+ * PRE_BUILD, mozconfig5: mozconfig5 -> mozconfig
+ * mozconfig: --disable-crashreporter added
+
2012-04-25 Pol Vinogradov <vin.public AT gmail.com>
* DETAILS: 12.0, SECURITY_PATCH=48

diff --git a/http/firefox/PRE_BUILD b/http/firefox/PRE_BUILD
index f62a6d3..8b10399 100755
--- a/http/firefox/PRE_BUILD
+++ b/http/firefox/PRE_BUILD
@@ -11,7 +11,7 @@ patch -p0 < $SPELL_DIRECTORY/glyph.patch &&
#
http://projects.archlinux.org/svntogit/packages.git/plain/trunk/firefox-install-dir.patch?h=packages/firefox
patch -p1 < $SPELL_DIRECTORY/install_dir.patch &&

-cp -v $SPELL_DIRECTORY/mozconfig5 .mozconfig &&
+cp -v $SPELL_DIRECTORY/mozconfig .mozconfig &&

if [[ "$FIREFOX_SAFE" == "y" ]]; then
sed -i '27iac_add_options --enable-safe-browsing' .mozconfig
diff --git a/http/firefox/mozconfig b/http/firefox/mozconfig
new file mode 100644
index 0000000..609fcbb
--- /dev/null
+++ b/http/firefox/mozconfig
@@ -0,0 +1,31 @@
+#
+# See http://www.mozilla.org/build/ for build instructions.
+#
+
+# Options for client.mk.
+mk_add_options MOZ_CO_PROJECT=browser
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/firefox-build
+mk_add_options AUTOCONF=autoconf2.13
+
+# Options for 'configure' (same as command-line options).
+ac_add_options --with-pthreads
+ac_add_options --with-system-jpeg=/usr/lib
+ac_add_options --with-system-zlib=/usr/lib
+ac_add_options --disable-system-png
+ac_add_options --enable-application=browser
+ac_add_options --disable-system-cairo
+ac_add_options --enable-default-toolkit=cairo-gtk2
+ac_add_options --disable-freetype2
+ac_add_options --enable-pango
+ac_add_options --enable-svg
+ac_add_options --with-system-nspr
+ac_add_options --with-system-nss
+ac_add_options --disable-dbus
+ac_add_options --disable-installer
+ac_add_options --disable-updater
+ac_add_options --disable-crashreporter
+ac_add_options --disable-tests
+ac_add_options --prefix=$INSTALL_ROOT/usr
+ac_add_options --mandir=$INSTALL_ROOT/usr
+ac_add_options --enable-optimize="$CFLAGS"
+ac_add_options --with-default-mozilla-five-home=/usr/lib/firefox
diff --git a/http/firefox/mozconfig5 b/http/firefox/mozconfig5
deleted file mode 100644
index 9e9d2f0..0000000
--- a/http/firefox/mozconfig5
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# See http://www.mozilla.org/build/ for build instructions.
-#
-
-# Options for client.mk.
-mk_add_options MOZ_CO_PROJECT=browser
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/firefox-build
-mk_add_options AUTOCONF=autoconf2.13
-
-# Options for 'configure' (same as command-line options).
-ac_add_options --with-pthreads
-ac_add_options --with-system-jpeg=/usr/lib
-ac_add_options --with-system-zlib=/usr/lib
-ac_add_options --disable-system-png
-ac_add_options --enable-application=browser
-ac_add_options --disable-system-cairo
-ac_add_options --enable-default-toolkit=cairo-gtk2
-ac_add_options --disable-freetype2
-ac_add_options --enable-pango
-ac_add_options --enable-svg
-ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
-ac_add_options --disable-dbus
-ac_add_options --disable-installer
-ac_add_options --disable-updater
-ac_add_options --disable-tests
-ac_add_options --prefix=$INSTALL_ROOT/usr
-ac_add_options --mandir=$INSTALL_ROOT/usr
-ac_add_options --enable-optimize="$CFLAGS"
-ac_add_options --with-default-mozilla-five-home=/usr/lib/firefox



  • [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (84c0b2655c5d024b1b508255e7d2c65a8a7c2f31), Ladislav Hagara, 06/05/2012

Archive powered by MHonArc 2.6.24.

Top of Page