[SM-Commit] GIT changes to master grimoire by George Sherwood (e998f353a3e62605ec84d972131ff0188f962cf2)

George Sherwood scm at sourcemage.org
Tue Oct 14 21:29:49 EDT 2008


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

 http/firefox/BUILD       |    4 +++-
 http/firefox/DEPENDS     |    6 +++++-
 http/firefox/DETAILS     |    2 +-
 http/firefox/HISTORY     |   10 ++++++++++
 http/firefox/INSTALL     |    2 +-
 http/firefox/PRE_BUILD   |    8 ++++++--
 http/firefox/mozconfig31 |   26 ++++++++++++++++++++++++++
 7 files changed, 52 insertions(+), 6 deletions(-)

New commits:
commit e998f353a3e62605ec84d972131ff0188f962cf2
Author: George Sherwood <gsherwood at sourcemage.org>
Commit: George Sherwood <gsherwood at sourcemage.org>

    firefox: Updated devel to version 3.1b1. Doesn't build again
    xulrunner though.

diff --git a/http/firefox/BUILD b/http/firefox/BUILD
index 0ba7903..07490df 100755
--- a/http/firefox/BUILD
+++ b/http/firefox/BUILD
@@ -1,4 +1,4 @@
-cd "$SOURCE_DIRECTORY/mozilla" &&
+cd $SOURCE_DIRECTORY/mozilla* &&
 
 FIREFOX_HOME="$INSTALL_ROOT/usr/lib/firefox" &&
 export  MOZ_PHOENIX=1 &&
@@ -22,6 +22,8 @@ CXXFLAGS="${CXXFLAGS//-O3/-O2}"  &&
 CFLAGS="${CFLAGS//-ffast-math/}"      &&
 CXXFLAGS="${CXXFLAGS//-ffast-math/}"  &&
 
+autoconf-2.13 &&
+
 make_single  &&
 make -f client.mk build &&
 make_normal
diff --git a/http/firefox/DEPENDS b/http/firefox/DEPENDS
index c50fc0b..d150fa4 100755
--- a/http/firefox/DEPENDS
+++ b/http/firefox/DEPENDS
@@ -9,7 +9,11 @@ depends  zip                               &&
 depends  zlib                              &&
 depends  cairo                             &&
 depends  python                            &&
-depends  xulrunner                         &&
+if [[ "$FIREFOX_CVS" = "n" ]]; then 
+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 4d739da..71ac346 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -1,6 +1,6 @@
            SPELL=firefox
 if [[ $FIREFOX_CVS == y ]]; then
-         VERSION=3.0.3
+         VERSION=3.1b1
           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 8a0e187..a35c619 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,13 @@
+2008-10-14 George Sherwood <gsherwood at sourcemage.org>
+	* DETAILS: Updated devel to 3.1b1
+	* PRE_BUILD: Updated cd since new directory is mozilla-central
+	* BUILD: Allow directory mozilla-central and mozilla
+	  Devel version use autoconf-2.13
+	* INSTALL: Allow directory mozilla-central and mozilla
+	* DEPENDS: Devel version requires autoconf-2.13 and won't
+	  build against xulrunner since newer GECKO
+	* mozconfig31: Added file for devel version to not use xulrunner
+
 2008-10-11 George Sherwood <gsherwood at sourcemage.org>
 	* mozconfig3: Changed to --with-system-nspr. Needs to match xulrunner
 
diff --git a/http/firefox/INSTALL b/http/firefox/INSTALL
index e6ecb7f..6331a9a 100755
--- a/http/firefox/INSTALL
+++ b/http/firefox/INSTALL
@@ -1,4 +1,4 @@
-cd "$SOURCE_DIRECTORY/mozilla"  &&
+cd $SOURCE_DIRECTORY/mozilla*  &&
 
 FIREFOX_HOME="$INSTALL_ROOT/usr/lib/firefox" &&
 
diff --git a/http/firefox/PRE_BUILD b/http/firefox/PRE_BUILD
index 65cce7b..0f0e63d 100755
--- a/http/firefox/PRE_BUILD
+++ b/http/firefox/PRE_BUILD
@@ -1,11 +1,15 @@
 mk_source_dir  $SOURCE_DIRECTORY  &&
 cd  $SOURCE_DIRECTORY             &&
 unpack_file  ''                   &&
-cd  mozilla                       &&
+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/mozconfig31 .mozconfig
+fi &&
 
 if [[ $FIREFOX_OFFICIAL == y ]]; then
   sed -i '24iac_add_options --enable-official-branding' .mozconfig
diff --git a/http/firefox/mozconfig31 b/http/firefox/mozconfig31
new file mode 100644
index 0000000..002bdef
--- /dev/null
+++ b/http/firefox/mozconfig31
@@ -0,0 +1,26 @@
+#
+# 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-nspr
+ac_add_options --without-system-nss
+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 --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 --prefix=$INSTALL_ROOT/usr
+ac_add_options --mandir=$INSTALL_ROOT/usr
+ac_add_options --enable-optimize="$CFLAGS"



More information about the SM-Commit mailing list