Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by George Sherwood (446f031bd28e0af4f0d4e546a93570bb3791e3f2)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: George Sherwood <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by George Sherwood (446f031bd28e0af4f0d4e546a93570bb3791e3f2)
  • Date: Sun, 25 Jul 2010 20:51:17 -0500

GIT changes to master grimoire by George Sherwood <gsherwood AT sourcemage.org>:

http/firefox/DEPENDS | 7 ++++---
http/firefox/DETAILS | 2 +-
http/firefox/HISTORY | 6 ++++++
http/firefox/PRE_BUILD | 7 ++++++-
http/firefox/mozconfig4 | 28 ++++++++++++++++++++++++++++
5 files changed, 45 insertions(+), 5 deletions(-)

New commits:
commit 446f031bd28e0af4f0d4e546a93570bb3791e3f2
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

firefox: Added devel version 4.0b1

diff --git a/http/firefox/DEPENDS b/http/firefox/DEPENDS
index 9d53187..eddcf79 100755
--- a/http/firefox/DEPENDS
+++ b/http/firefox/DEPENDS
@@ -2,8 +2,6 @@ depends atk &&
depends curl &&
depends g++ &&
depends glib2 &&
-depends nspr &&
-depends -sub "3.12.x" nss &&
depends jpeg &&
depends pango &&
depends perl &&
@@ -12,11 +10,14 @@ depends zlib &&
depends cairo &&
depends python &&
if [[ "$FIREFOX_CVS" = "n" ]]; then
+depends nspr &&
+depends -sub "3.12.x" nss &&
+depends -sub APNG libpng &&
depends xulrunner
else
depends autoconf-2.13
fi &&
-depends -sub APNG libpng &&
+
depends gtk+2 &&
depends libidl &&

diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index 54e2da2..33fa3f0 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -1,6 +1,6 @@
SPELL=firefox
if [[ $FIREFOX_CVS == y ]]; then
- VERSION=3.6.8
+ VERSION=4.0b1
SOURCE=$SPELL-$VERSION.source.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_GPG=firefox.gpg:$SOURCE2:UPSTREAM_KEY
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index 24bac76..6f6d9be 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,4 +1,10 @@
2010-07-25 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated devel to version 4.0b1
+ * DEPENDS: Updated depends to build devel version
+ * PRE_BUILD: Updated to use mozconfig4 to devel version
+ * mozconfig4: Added to tweak 4.0 build options
+
+2010-07-25 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: SECURITY_PATCH++. Now 3.68 is listed as a security update.

2010-07-23 George Sherwood <gsherwood AT sourcemage.org>
diff --git a/http/firefox/PRE_BUILD b/http/firefox/PRE_BUILD
index e9b2cfb..f2f9e2b 100755
--- a/http/firefox/PRE_BUILD
+++ b/http/firefox/PRE_BUILD
@@ -5,7 +5,12 @@ cd mozilla* &&

patch -p0 < $SCRIPT_DIRECTORY/firefox-xulrunner.patch &&

-cp -v $SPELL_DIRECTORY/mozconfig3 .mozconfig &&
+if [[ "$FIREFOX_CVS" == "n" ]]; then
+ cp -v $SPELL_DIRECTORY/mozconfig3 .mozconfig
+else
+ cp -v $SPELL_DIRECTORY/mozconfig4 .mozconfig
+fi
+

if [[ $FIREFOX_OFFICIAL == y ]]; then
sed -i '24iac_add_options --enable-official-branding' .mozconfig || return
1
diff --git a/http/firefox/mozconfig4 b/http/firefox/mozconfig4
new file mode 100644
index 0000000..5fd53fb
--- /dev/null
+++ b/http/firefox/mozconfig4
@@ -0,0 +1,28 @@
+#
+# See http://www.mozilla.org/build/ for build instructions.
+#
+
+# Options for client.mk.
+mk_add_options MOZ_CO_PROJECT=browser
+
+# 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 --with-system-png=/usr/lib
+#ac_add_options --with-system-nspr
+#ac_add_options --with-system-nss
+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 --disable-dbus
+ac_add_options --disable-installer
+ac_add_options --disable-updater
+ac_add_options --disable-tests
+#ac_add_options --with-system-libxul
+#ac_add_options --with-libxul-sdk=/usr/lib/xulrunner-1.9
+ac_add_options --prefix=$INSTALL_ROOT/usr
+ac_add_options --mandir=$INSTALL_ROOT/usr
+ac_add_options --enable-optimize="$CFLAGS"



  • [SM-Commit] GIT changes to master grimoire by George Sherwood (446f031bd28e0af4f0d4e546a93570bb3791e3f2), George Sherwood, 07/25/2010

Archive powered by MHonArc 2.6.24.

Top of Page