[Lunar-commits] <moonbase> firefox: updated to 3.6 Scripts rewritten to clean up not existing configure options, broken paths etc...

Zbigniew Luszpinski zbiggy at lunar-linux.org
Sun Jan 24 20:10:07 CET 2010 

commit 0bbe2877367c3dc138f002dc58a513d9cc9a1710
Author: Zbigniew Luszpinski <zbiggy at lunar-linux.org>
Date:   Sun Jan 24 20:10:07 2010 +0100

    firefox: updated to 3.6
    Scripts rewritten to clean up not existing configure options, broken paths etc...
---
 web/firefox/BUILD           |   65 +++++++++++++++++++++----------------------
 web/firefox/BUILD.x86_64    |   65 +++++++++++++++++++++----------------------
 web/firefox/CONFIGURE       |    1 -
 web/firefox/CONFLICTS       |    1 -
 web/firefox/DEPENDS         |    5 +--
 web/firefox/DETAILS         |   10 +++---
 web/firefox/POST_REMOVE     |    2 +-
 web/firefox/firefox.desktop |    2 +-
 web/firefox/mozconfig       |   15 ++--------
 9 files changed, 75 insertions(+), 91 deletions(-)

diff --git a/web/firefox/BUILD b/web/firefox/BUILD
index 2af4909..c3b9831 100644
--- a/web/firefox/BUILD
+++ b/web/firefox/BUILD
@@ -1,29 +1,30 @@
 (
 
+ MOZILLA_DIR=mozilla-1.9.2
   #Really? You go and call fprintf and don't #include <cstdio>?
   #How exactly did you plan on doing that?!?!
-  sedit 's:<cstdlib>:<cstdlib>\n#include <cstdio>:g' mozilla-1.9.1/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc
-  sedit 's:<cstdlib>:<cstdlib>\n#include <cstdio>:g' mozilla-1.9.1/toolkit/crashreporter/google-breakpad/src/client/linux/handler/exception_handler.cc
-  sedit 's:<cstdlib>:<cstdlib>\n#include <cstdio>:g' mozilla-1.9.1/toolkit/crashreporter/google-breakpad/src/client/linux/handler/minidump_generator.cc
+  sedit 's:<cstdlib>:<cstdlib>\n#include <cstdio>:g' $MOZILLA_DIR/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc
+  sedit 's:<cstdlib>:<cstdlib>\n#include <cstdio>:g' $MOZILLA_DIR/toolkit/crashreporter/google-breakpad/src/client/linux/handler/exception_handler.cc
+  sedit 's:<cstdlib>:<cstdlib>\n#include <cstdio>:g' $MOZILLA_DIR/toolkit/crashreporter/google-breakpad/src/client/linux/handler/minidump_generator.cc
 
   if module_is_expired $MODULE && [ "$VERSION" != "`installed_version $MODULE`" ]; then
         set_module_config OLD_VER "`installed_version $MODULE`"
   fi  &&
 
-  # This should always be just a link
-  rm -rf /usr/lib/firefox-$VERSION/plugins  &&
-
   export MOZILLA_HOME=/usr/lib/$MODULE-$VERSION
   export MOZ_CO_PROJECT=browser
   export MOZILLA_OFFICIAL=1
   export BUILD_OFFICIAL=1
 
-  cp $SCRIPT_DIRECTORY/mozconfig mozilla-1.9.1/  &&
+  # This should always be just a link
+  rm -rf $MOZILLA_HOME/plugins  &&
+
+  cp $SCRIPT_DIRECTORY/mozconfig $MOZILLA_DIR/  &&
 
   export MOZ_OBJDIR="${SOURCE_DIRECTORY}/build-mozilla"
   mkdir -p ${MOZ_OBJDIR}  &&
 
-  cd mozilla-1.9.1  &&
+  cd $MOZILLA_DIR  &&
 
   echo "ac_add_options --disable-necko-wifi" >> mozconfig
 
@@ -39,27 +40,29 @@
     echo "ac_add_options --enable-system-sqlite" >> mozconfig
   fi  &&
 
-  if in_depends $MODULE heimdal ; then
-    echo "ac_add_options --with-gssapi=/usr/include/heimdal" >> mozconfig
-  else
-    echo "ac_add_options --without-gssapi" >> mozconfig
-  fi  &&
-
   if in_depends $MODULE "xulrunner" ; then
     XUL=`module_version xulrunner`
     echo "ac_add_options --with-libxul-sdk=/usr/lib/xulrunner-devel-$XUL" >> mozconfig
   fi  &&
 
+  if in_depends $MODULE gnome-vfs ; then
+    echo "ac_add_options --enable-gnomevfs" >> mozconfig
+  else
+    echo "ac_add_options --disable-gnomevfs" >> mozconfig
+  fi  &&
+
+  if in_depends $MODULE sun-jdk ; then
+    echo "ac_add_options --with-java-include-path=/usr/java/include" >> mozconfig
+    echo "ac_add_options --with-java-bin-path=/usr/java/bin" >> mozconfig
+    echo "ac_add_options --enable-javaxpcom" >> mozconfig
+  fi  &&
+
   #Add CONFIGURE options
-  
+
   if [ "$SAFE" == "y" ] ; then
     echo "ac_add_options --enable-safe-browsing" >> mozconfig
   fi  &&
 
-  if [ "$WEBSERVICES" == "y" ] ; then
-    echo "ac_add_options --enable-webservices" >> mozconfig
-  fi  &&
-
   setterm -bfreq -blength &&
 
   #Finally, the build!
@@ -84,27 +87,23 @@
 
   # Install the plugins in the right directories
   mkdir -p /opt/lunar/plugins  &&
-  for plugin in `ls /usr/lib/firefox-$VERSION/plugins`; do
-       `install -m755 /usr/lib/firefox-$VERSION/plugins/$plugin /opt/lunar/plugins`; done  &&
+  for plugin in `ls $MOZILLA_HOME/plugins`; do
+       `install -m755 $MOZILLA_HOME/plugins/$plugin /opt/lunar/plugins`; done  &&
 
-  rm -rf /usr/lib/firefox-$VERSION/plugins  &&
-  ln -snf /opt/lunar/plugins /usr/lib/firefox-$VERSION/plugins  &&
+  rm -rf $MOZILLA_HOME/plugins  &&
+  ln -snf /opt/lunar/plugins $MOZILLA_HOME/plugins  &&
 
   # Now the .desktop file and the icon
   mkdir -p /usr/share/applications /usr/share/pixmaps  &&
   install -m644 $SCRIPT_DIRECTORY/firefox.desktop /usr/share/applications  &&
-  # please, dont just let the lin fail because /usr/share/pixmaps/firefox.xpm is an existing symlink...
-  rm -f /usr/share/pixmaps/firefox.xpm  &&
-  install -m644 $MOZILLA_HOME/icons/mozicon50.xpm /usr/share/pixmaps/firefox.xpm  &&
+  # please, dont just let the lin fail because /usr/share/pixmaps/firefox48.png is an existing symlink...
+  rm -f /usr/share/pixmaps/firefox48.png  &&
+  install -m644 $MOZILLA_HOME/chrome/icons/default/default48.png /usr/share/pixmaps/firefox48.png  &&
 
   # Make firefox use its own icon
-
-  rm -rf /usr/lib/firefox-$VERSION/chrome/icons  &&
-  mkdir -p /usr/lib/firefox-$VERSION/chrome/icons/default  &&
-
-  for icon in 16 32 48; do
-    ln -sf /usr/lib/firefox-$VERSION/icons/mozicon128.png \
-           /usr/lib/firefox-$VERSION/chrome/icons/default/default$icon.png
+  for icon in `ls $MOZILLA_HOME/icons`; do
+    ln -sf $MOZILLA_HOME/icons/$icon \
+           $MOZILLA_HOME/chrome/icons/default/$icon
   done
 
 ) > $C_FIFO 2>&1
diff --git a/web/firefox/BUILD.x86_64 b/web/firefox/BUILD.x86_64
index 2af4909..c3b9831 100644
--- a/web/firefox/BUILD.x86_64
+++ b/web/firefox/BUILD.x86_64
@@ -1,29 +1,30 @@
 (
 
+ MOZILLA_DIR=mozilla-1.9.2
   #Really? You go and call fprintf and don't #include <cstdio>?
   #How exactly did you plan on doing that?!?!
-  sedit 's:<cstdlib>:<cstdlib>\n#include <cstdio>:g' mozilla-1.9.1/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc
-  sedit 's:<cstdlib>:<cstdlib>\n#include <cstdio>:g' mozilla-1.9.1/toolkit/crashreporter/google-breakpad/src/client/linux/handler/exception_handler.cc
-  sedit 's:<cstdlib>:<cstdlib>\n#include <cstdio>:g' mozilla-1.9.1/toolkit/crashreporter/google-breakpad/src/client/linux/handler/minidump_generator.cc
+  sedit 's:<cstdlib>:<cstdlib>\n#include <cstdio>:g' $MOZILLA_DIR/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc
+  sedit 's:<cstdlib>:<cstdlib>\n#include <cstdio>:g' $MOZILLA_DIR/toolkit/crashreporter/google-breakpad/src/client/linux/handler/exception_handler.cc
+  sedit 's:<cstdlib>:<cstdlib>\n#include <cstdio>:g' $MOZILLA_DIR/toolkit/crashreporter/google-breakpad/src/client/linux/handler/minidump_generator.cc
 
   if module_is_expired $MODULE && [ "$VERSION" != "`installed_version $MODULE`" ]; then
         set_module_config OLD_VER "`installed_version $MODULE`"
   fi  &&
 
-  # This should always be just a link
-  rm -rf /usr/lib/firefox-$VERSION/plugins  &&
-
   export MOZILLA_HOME=/usr/lib/$MODULE-$VERSION
   export MOZ_CO_PROJECT=browser
   export MOZILLA_OFFICIAL=1
   export BUILD_OFFICIAL=1
 
-  cp $SCRIPT_DIRECTORY/mozconfig mozilla-1.9.1/  &&
+  # This should always be just a link
+  rm -rf $MOZILLA_HOME/plugins  &&
+
+  cp $SCRIPT_DIRECTORY/mozconfig $MOZILLA_DIR/  &&
 
   export MOZ_OBJDIR="${SOURCE_DIRECTORY}/build-mozilla"
   mkdir -p ${MOZ_OBJDIR}  &&
 
-  cd mozilla-1.9.1  &&
+  cd $MOZILLA_DIR  &&
 
   echo "ac_add_options --disable-necko-wifi" >> mozconfig
 
@@ -39,27 +40,29 @@
     echo "ac_add_options --enable-system-sqlite" >> mozconfig
   fi  &&
 
-  if in_depends $MODULE heimdal ; then
-    echo "ac_add_options --with-gssapi=/usr/include/heimdal" >> mozconfig
-  else
-    echo "ac_add_options --without-gssapi" >> mozconfig
-  fi  &&
-
   if in_depends $MODULE "xulrunner" ; then
     XUL=`module_version xulrunner`
     echo "ac_add_options --with-libxul-sdk=/usr/lib/xulrunner-devel-$XUL" >> mozconfig
   fi  &&
 
+  if in_depends $MODULE gnome-vfs ; then
+    echo "ac_add_options --enable-gnomevfs" >> mozconfig
+  else
+    echo "ac_add_options --disable-gnomevfs" >> mozconfig
+  fi  &&
+
+  if in_depends $MODULE sun-jdk ; then
+    echo "ac_add_options --with-java-include-path=/usr/java/include" >> mozconfig
+    echo "ac_add_options --with-java-bin-path=/usr/java/bin" >> mozconfig
+    echo "ac_add_options --enable-javaxpcom" >> mozconfig
+  fi  &&
+
   #Add CONFIGURE options
-  
+
   if [ "$SAFE" == "y" ] ; then
     echo "ac_add_options --enable-safe-browsing" >> mozconfig
   fi  &&
 
-  if [ "$WEBSERVICES" == "y" ] ; then
-    echo "ac_add_options --enable-webservices" >> mozconfig
-  fi  &&
-
   setterm -bfreq -blength &&
 
   #Finally, the build!
@@ -84,27 +87,23 @@
 
   # Install the plugins in the right directories
   mkdir -p /opt/lunar/plugins  &&
-  for plugin in `ls /usr/lib/firefox-$VERSION/plugins`; do
-       `install -m755 /usr/lib/firefox-$VERSION/plugins/$plugin /opt/lunar/plugins`; done  &&
+  for plugin in `ls $MOZILLA_HOME/plugins`; do
+       `install -m755 $MOZILLA_HOME/plugins/$plugin /opt/lunar/plugins`; done  &&
 
-  rm -rf /usr/lib/firefox-$VERSION/plugins  &&
-  ln -snf /opt/lunar/plugins /usr/lib/firefox-$VERSION/plugins  &&
+  rm -rf $MOZILLA_HOME/plugins  &&
+  ln -snf /opt/lunar/plugins $MOZILLA_HOME/plugins  &&
 
   # Now the .desktop file and the icon
   mkdir -p /usr/share/applications /usr/share/pixmaps  &&
   install -m644 $SCRIPT_DIRECTORY/firefox.desktop /usr/share/applications  &&
-  # please, dont just let the lin fail because /usr/share/pixmaps/firefox.xpm is an existing symlink...
-  rm -f /usr/share/pixmaps/firefox.xpm  &&
-  install -m644 $MOZILLA_HOME/icons/mozicon50.xpm /usr/share/pixmaps/firefox.xpm  &&
+  # please, dont just let the lin fail because /usr/share/pixmaps/firefox48.png is an existing symlink...
+  rm -f /usr/share/pixmaps/firefox48.png  &&
+  install -m644 $MOZILLA_HOME/chrome/icons/default/default48.png /usr/share/pixmaps/firefox48.png  &&
 
   # Make firefox use its own icon
-
-  rm -rf /usr/lib/firefox-$VERSION/chrome/icons  &&
-  mkdir -p /usr/lib/firefox-$VERSION/chrome/icons/default  &&
-
-  for icon in 16 32 48; do
-    ln -sf /usr/lib/firefox-$VERSION/icons/mozicon128.png \
-           /usr/lib/firefox-$VERSION/chrome/icons/default/default$icon.png
+  for icon in `ls $MOZILLA_HOME/icons`; do
+    ln -sf $MOZILLA_HOME/icons/$icon \
+           $MOZILLA_HOME/chrome/icons/default/$icon
   done
 
 ) > $C_FIFO 2>&1
diff --git a/web/firefox/CONFIGURE b/web/firefox/CONFIGURE
index 7343b8e..c8311d9 100644
--- a/web/firefox/CONFIGURE
+++ b/web/firefox/CONFIGURE
@@ -1,3 +1,2 @@
 mquery PGO "Build with Profile Guided Optimization?"  y  "--enable-profile-guided-optimization"  ""
 mquery SAFE "Enable safe browsing (anti-phishing)?"  y  "--enable-safe-browsing"  ""
-mquery WEBSERVICES "Enable webservices support?"  y  "--enable-webservices"  ""
diff --git a/web/firefox/CONFLICTS b/web/firefox/CONFLICTS
deleted file mode 100644
index 6ed29af..0000000
--- a/web/firefox/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts firefox2
diff --git a/web/firefox/DEPENDS b/web/firefox/DEPENDS
index ee318dd..f888b6f 100644
--- a/web/firefox/DEPENDS
+++ b/web/firefox/DEPENDS
@@ -1,10 +1,10 @@
 depends ORBit2
 depends zip
 depends unzip
-depends expat
 depends gtk+-2
 depends nss
 depends curl
+depends libnotify
 
 # Firefox crashes with sqlite 3.6.18 when adding new bookmarks:
 # https://bugzilla.mozilla.org/show_bug.cgi?id=512940
@@ -19,8 +19,5 @@ optional_depends "flash-plugin-10"  ""  ""  \
 optional_depends "gnome-vfs"  ""  ""  \
                  "For Gnome VFS support"
 
-optional_depends "heimdal"  ""  ""  \
-                 "Heimdal GSSAPI Support"
-
 optional_depends "Python"  ""  "" \
                  "Needed to do a Profile Guided Optimization build"
diff --git a/web/firefox/DETAILS b/web/firefox/DETAILS
index eed14e8..b58dc8b 100644
--- a/web/firefox/DETAILS
+++ b/web/firefox/DETAILS
@@ -1,13 +1,13 @@
           MODULE=firefox
-         VERSION=3.5.7
+         VERSION=3.6
           SOURCE=${MODULE}-${VERSION}.source.tar.bz2
-   SOURCE_URL[0]=ftp://ftp.mozilla.org/pub/firefox/releases/$VERSION/source/
+   SOURCE_URL[0]=ftp://ftp.uni-erlangen.de/pub/mozilla.org/firefox/releases/$VERSION/source
    SOURCE_URL[1]=ftp://mozilla.isc.org/pub/mozilla.org/firefox/releases/$VERSION/source
-   SOURCE_URL[2]=ftp://ftp.uni-erlangen.de/pub/mozilla.org/firefox/releases/$VERSION/source
-      SOURCE_VFY=sha1:7605d89b3d3e458db74dea4d227dd86d0d12ba1b
+   SOURCE_URL[2]=ftp://ftp.mozilla.org/pub/firefox/releases/$VERSION/source/
+      SOURCE_VFY=sha1:33226b45a0bcd795545a980cab475c5492f0ea69
         WEB_SITE=http://www.mozilla.org/projects/firefox
          ENTERED=20030810
-         UPDATED=20100106
+         UPDATED=20100123
       MAINTAINER="tchan at lunar-linux.org"
            PSAFE=no
            SHORT="A speedy, full-featured web browser"
diff --git a/web/firefox/POST_REMOVE b/web/firefox/POST_REMOVE
index 520460e..a46a092 100644
--- a/web/firefox/POST_REMOVE
+++ b/web/firefox/POST_REMOVE
@@ -1,4 +1,4 @@
-rm -f  /usr/share/pixmaps/firefox.xpm
+rm -f  /usr/share/pixmaps/firefox48.png
 rm -rf /usr/include/firefox-$VERSION
 rm -rf /usr/lib/firefox-$VERSION
 rm -rf /usr/lib/firefox-devel-$VERSION
diff --git a/web/firefox/firefox.desktop b/web/firefox/firefox.desktop
index f8733ea..d750023 100644
--- a/web/firefox/firefox.desktop
+++ b/web/firefox/firefox.desktop
@@ -3,7 +3,7 @@ Encoding=UTF-8
 Name=Firefox
 Comment=Firefox Web Browser
 Exec=firefox
-Icon=/usr/share/pixmaps/firefox.xpm
+Icon=/usr/share/pixmaps/firefox48.png
 Terminal=false
 Type=Application
 Categories=Application;Network;
diff --git a/web/firefox/mozconfig b/web/firefox/mozconfig
index a1fe69d..71dbdb5 100644
--- a/web/firefox/mozconfig
+++ b/web/firefox/mozconfig
@@ -5,34 +5,25 @@ ac_add_options --with-default-mozilla-five-home=$MOZILLA_HOME
 ac_add_options --with-user-appdir=".firefox"
 ac_add_options --with-system-zlib
 ac_add_options --with-system-jpeg
-ac_add_options --enable-single-profile
+ac_add_options --with-system-bz2
 ac_add_options --enable-storage
 ac_add_options --enable-places
-ac_add_options --enable-places_bookmarks
 ac_add_options --enable-application=browser
+ac_add_options --enable-default-toolkit=cairo-gtk2
 ac_add_options --enable-optimize="$CFLAGS"
-ac_add_options --enable-reorder
-ac_add_options --enable-cpp-rtti
-ac_add_options --enable-cpp-exceptions
 ac_add_options --enable-crypto
 ac_add_options --enable-strip
-ac_add_options --enable-strip-libs
 ac_add_options --enable-canvas
 ac_add_options --enable-svg
-ac_add_options --enable-svg-renderer=cairo
 ac_add_options --enable-system-cairo
 ac_add_options --enable-xterm-updates
 ac_add_options --enable-libxul
 ac_add_options --enable-official-branding
+ac_add_options --enable-jemalloc
 ac_add_options --disable-debug
 ac_add_options --disable-tests
-ac_add_options --disable-mochitest
 ac_add_options --disable-installer
 ac_add_options --disable-pedantic
-ac_add_options --disable-mailnews
 ac_add_options --disable-logging
 ac_add_options --disable-accessibility
-ac_add_options --disable-ldap
-ac_add_options --disable-profilesharing
 ac_add_options --enable-mathml
-

More information about the Lunar-commits mailing list