[Lunar-commits] <moonbase> firefox: BUILD improved. +0.0.0.01

[Zbigniew Luszpinski]

commit d6b04172247525a4fa0a7da01baae251031f7ebd
Author: Zbigniew Luszpinski <zbiggy at lunar-linux.org>
Date:   Fri Feb 8 22:16:11 2008 +0100

    firefox: BUILD improved. +0.0.0.01
---
 web/firefox/BUILD   |   25 +++++++++++++++----------
 web/firefox/DETAILS |   10 +++-------
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/web/firefox/BUILD b/web/firefox/BUILD
index d70f2ea..6d98685 100644
--- a/web/firefox/BUILD
+++ b/web/firefox/BUILD
@@ -1,15 +1,15 @@
-( 
-  patch_it $SOURCE_CACHE/$SOURCE2 1 &&
+(
   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
+  rm -rf /usr/lib/firefox-$VERSION/plugins &&
+
+  MOZILLA_HOME=/usr/lib/$MODULE-$VERSION
 
-  MOZILLA_HOME=/usr/lib/$MODULE-$VERSION 
-  
-  MOZ_EXTENSIONS="cookie,xml-rpc,xmlextras,pref,transformiix,universalchardet,webservices,permissions,spellcheck"
+  MOZ_EXTENSIONS="default,xmlextras,xforms,webservices,universalchardet,transformiix,tasks,schema-validation,reporter,cookie,cview,datetime,finger,p3p,permissions,spellcheck,-gnomevfs"
+  # wallet extension makes empty duplicate password dialog so do not use it
 
   if in_depends $MODULE heimdal ; then
         MOZ_EXTENSIONS="${MOZ_EXTENSIONS},auth"
@@ -17,6 +17,9 @@
         MOZ_EXTENSIONS="${MOZ_EXTENSIONS},-auth"
   fi &&
 
+  # This hack added to fix a gtk+-2/pango/atk update that broke firefox. This should be removed in the future.
+  sedit "s/(MOZ_GTK2_LIBS)/(MOZ_GTK2_LIBS) -lX11 -lXrender/" layout/build/Makefile.in &&
+
   export MOZ_FREETYPE2="no"
   export MOZ_PANGO="yes"
   export MOZ_CO_PROJECT=browser
@@ -41,6 +44,7 @@
     --enable-xft        \
     --enable-reorder    \
     --enable-cpp-rtti   \
+    --enable-cpp-exceptions \
     --enable-crypto     \
     --enable-strip      \
     --enable-strip-libs \
@@ -61,7 +65,7 @@
     --disable-profilesharing    \
     --disable-mathml    \
     $OPTS               &&
-              
+
   default_make        &&
 
   # Put some important headers in place
@@ -72,7 +76,7 @@
   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  &&
-    
+
   rm -rf /usr/lib/firefox-$VERSION/plugins &&
   ln -snf /opt/lunar/plugins /usr/lib/firefox-$VERSION/plugins &&
 
@@ -87,6 +91,7 @@
 
   rm -rf /usr/lib/firefox-$VERSION/chrome/icons &&
   mkdir -p /usr/lib/firefox-$VERSION/chrome/icons/default &&
-  ln -snf /usr/lib/firefox-$VERSION/icons/default.xpm /usr/lib/firefox-$VERSION/chrome/icons/default/default.xpm
+for icon in `ls /usr/lib/firefox-$VERSION/icons`; do
+`ln -snf /usr/lib/firefox-$VERSION/icons/$icon /usr/lib/firefox-$VERSION/chrome/icons/default/$icon`; done
 
 ) > $C_FIFO 2>&1
diff --git a/web/firefox/DETAILS b/web/firefox/DETAILS
index 24197e4..b2e8008 100644
--- a/web/firefox/DETAILS
+++ b/web/firefox/DETAILS
@@ -1,20 +1,16 @@
           MODULE=firefox
-         VERSION=2.0.0.11
+         VERSION=2.0.0.12
           SOURCE=${MODULE}-${VERSION}-source.tar.bz2
-         SOURCE2=sm-xrender.patch
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/mozilla
    SOURCE_URL[0]=ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$VERSION/source/
    SOURCE_URL[1]=ftp://ftp.uni-erlangen.de/pub/mozilla.org/firefox/releases/$VERSION/source/
    SOURCE_URL[2]=ftp://mozilla.isc.org/pub/mozilla.org/firefox/releases/$VERSION/source/
-      SOURCE_VFY=sha1:6d070bf04f1a037b621237d02ef9be7802a51bf1
-     SOURCE2_URL=$PATCH_URL
-     SOURCE2_VFY=sha1:cab357aa5854456ffd24713126e64a18b391a4cb
+      SOURCE_VFY=sha1:766f3e945145d9e4d36d5eb3e551b5eb44a1d862
         WEB_SITE=http://www.mozilla.org/projects/firefox
          ENTERED=20030810
-         UPDATED=20071130
+         UPDATED=20080208
       MAINTAINER="tchan at lunar-linux.org"
            SHORT="a speedy, full-featured web browser."
-
 cat << EOF
 Mozilla Firefox is the successor of Mozilla Firebird.