Source Mage code commit list

[George Sherwood <scm AT sourcemage.org>]

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

 http/firefox/DETAILS                 |    4 ++--
 http/firefox/HISTORY                 |    8 ++++++++
 http/firefox/INSTALL                 |   14 ++++----------
 http/firefox/PRE_BUILD               |   10 ++--------
 http/firefox/firefox-xulrunner.patch |   18 ++++--------------
 http/firefox/mozconfig3              |    1 +
 http/firefox/mozconfig31             |   26 --------------------------
 7 files changed, 21 insertions(+), 60 deletions(-)

New commits:
commit 5e8afebcfb4b2c139180b0f97f460b279b70f813
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

    firefox: Updated devel and stable to version 3.5.  Updated spell
    to work with xulrunner 1.9.1

diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index 388c258..cc967e9 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -1,6 +1,6 @@
            SPELL=firefox
 if [[ $FIREFOX_CVS == y ]]; then
-         VERSION=3.5rc3
+         VERSION=3.5
           SOURCE=$SPELL-$VERSION-source.tar.bz2
          SOURCE2=$SOURCE.asc
       SOURCE_GPG=firefox.gpg:$SOURCE2:UPSTREAM_KEY
@@ -8,7 +8,7 @@ if [[ $FIREFOX_CVS == y ]]; then
 #     
SOURCE_HASH=sha512:eb38349212a352718987e611315405c869fad9ebd6026ce4662bbbb12c5914178c6d348ea12686a7efbb046870e44238a1b46e20fe3d9eb323e3d6ab8f9dfacc
   SOURCE2_URL[0]=$SOURCE_URL.asc
 else
-         VERSION=3.0.11
+         VERSION=3.5
           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 bb1d513..8a588c4 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,11 @@
+2009-06-30 George Sherwood <gsherwood AT sourcemage.org>
+       * DETAILS: Updated devel and stable to 3.5
+       * INSTALL: Removed hack for 3.5rc's
+       * PRE_BUILD: Patch all versions. Use only one mozconfig file
+       * firefox-xulrunner.patch: Updated for version 3.5
+       * mozconfig3: Updated for version 3.5
+       * mozconfig31: Removed, after updating mozconfig3
+
 2009-06-29 George Sherwood <gsherwood AT sourcemage.org>
        * DETAILS: Updated devel to 3.5rc3
 
diff --git a/http/firefox/INSTALL b/http/firefox/INSTALL
index 9591a55..aba58af 100755
--- a/http/firefox/INSTALL
+++ b/http/firefox/INSTALL
@@ -8,11 +8,8 @@ fi  &&
 
 make install &&
 
-if [[ "$FIREFOX_CVS" == "n" ]]; then
-  ln -s $INSTALL_ROOT/usr/lib/firefox-$VERSION $INSTALL_ROOT/usr/lib/firefox
-else
-  ln -s $INSTALL_ROOT/usr/lib/firefox-3.5 $INSTALL_ROOT/usr/lib/firefox
-fi &&
+
+ln -s $INSTALL_ROOT/usr/lib/firefox-$VERSION $INSTALL_ROOT/usr/lib/firefox &&
 
 #
 # Script to set MOZILLA_FIVE_HOME
@@ -46,10 +43,7 @@ if  test  -f   $INSTALL_ROOT/usr/lib/libnssckbi.so;  then
   fi
 fi  &&
 
-if [[ "$FIREFOX_CVS" == "n" ]]; then
  ln -vs "$INSTALL_ROOT/usr/lib/xulrunner/plugins" \
        "$INSTALL_ROOT/usr/lib/$SPELL-$VERSION/plugins"
-else
- ln -vs "$INSTALL_ROOT/usr/lib/xulrunner/plugins" \
-       "$INSTALL_ROOT/usr/lib/$SPELL-3.5/plugins"
-fi
\ No newline at end of file
+
+
diff --git a/http/firefox/PRE_BUILD b/http/firefox/PRE_BUILD
index 4e0b155..1940e19 100755
--- a/http/firefox/PRE_BUILD
+++ b/http/firefox/PRE_BUILD
@@ -3,15 +3,9 @@ cd  $SOURCE_DIRECTORY             &&
 unpack_file  ''                   &&
 cd  mozilla*                       &&
 
-if [[ "$FIREFOX_CVS" == "n" ]]; then
-patch -p0 < $SCRIPT_DIRECTORY/firefox-xulrunner.patch
-fi &&
+patch -p0 < $SCRIPT_DIRECTORY/firefox-xulrunner.patch &&
 
-if [[ "$FIREFOX_CVS" == "n" ]]; then
-cp -v $SPELL_DIRECTORY/mozconfig3 .mozconfig
-else
-cp -v $SPELL_DIRECTORY/mozconfig31 .mozconfig
-fi &&
+cp -v $SPELL_DIRECTORY/mozconfig3 .mozconfig &&
 
 if [[ $FIREFOX_OFFICIAL == y ]]; then
   sed -i '24iac_add_options --enable-official-branding' .mozconfig
diff --git a/http/firefox/firefox-xulrunner.patch 
b/http/firefox/firefox-xulrunner.patch
index bf94426..e9cabf9 100644
--- a/http/firefox/firefox-xulrunner.patch
+++ b/http/firefox/firefox-xulrunner.patch
@@ -1,12 +1,7 @@
---- config/rules.mk
-+++ config/rules.mk
-@@ -57,16 +57,21 @@
- REPORT_BUILD = @echo $(notdir $<)
- 
- ifeq ($(OS_ARCH),OS2)
- EXEC                  =
- else
- EXEC                  = exec
+--- config/rules.mk.orig       2009-06-30 09:00:33.000000000 -0500
++++ config/rules.mk    2009-06-30 09:00:57.000000000 -0500
+@@ -67,6 +67,11 @@
+   SKIP_COPY_XULRUNNER=1
  endif
  
 +# Don't copy xulrunner files at install time, when using system xulrunner
@@ -17,8 +12,3 @@
  # ELOG prints out failed command when building silently (gmake -s).
  ifneq (,$(findstring -s,$(MAKEFLAGS)))
    ELOG := $(EXEC) sh $(BUILD_TOOLS)/print-failed-commands.sh
- else
-   ELOG :=
- endif
- 
- ifeq ($(MOZ_OS2_TOOLS),VACPP)
diff --git a/http/firefox/mozconfig3 b/http/firefox/mozconfig3
index e9ec093..fa47e6e 100644
--- a/http/firefox/mozconfig3
+++ b/http/firefox/mozconfig3
@@ -21,6 +21,7 @@ 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
diff --git a/http/firefox/mozconfig31 b/http/firefox/mozconfig31
deleted file mode 100644
index adaadc1..0000000
--- a/http/firefox/mozconfig31
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# 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"