[Lunar-commits] <moonbase> firefox: Some more tweaks.

[Moritz Heiber]

commit f418313da0bba2a332f00c25c037b61091382ab9
Author: Moritz Heiber <moe at lunar-linux.org>
Date:   Sat Jun 21 22:56:52 2008 +0200

    firefox: Some more tweaks.
---
 web/firefox/BUILD     |   25 ++++++++++++++++---------
 web/firefox/DETAILS   |    1 -
 web/firefox/PRE_BUILD |    5 +++++
 3 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/web/firefox/BUILD b/web/firefox/BUILD
index d85cfcc..85024c1 100644
--- a/web/firefox/BUILD
+++ b/web/firefox/BUILD
@@ -9,7 +9,6 @@
   MOZILLA_HOME=/usr/lib/$MODULE-$VERSION
 
   MOZ_EXTENSIONS="default,xforms"
-  # wallet extension makes empty duplicate password dialog so do not use it
 
   if in_depends $MODULE heimdal ; then
         MOZ_EXTENSIONS="${MOZ_EXTENSIONS},auth"
@@ -17,16 +16,22 @@
         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 &&
+  if in_depends $MODULE gnome-vfs2 ; then
+        MOZ_EXTENSIONS="${MOZ_EXTENSIONS},gnomevfs"
+  else
+        MOZ_EXTENSIONS="${MOZ_EXTENSIONS},-gnomevfs"
+  fi &&
 
-  export MOZ_FREETYPE2="no"
-  export MOZ_PANGO="yes"
   export MOZ_CO_PROJECT=browser
   export MOZILLA_OFFICIAL=1
   export BUILD_OFFICIAL=1
 
-  ./configure           \
+  export MOZ_OBJDIR="${SOURCE_DIRECTORY}/build-mozilla"
+  mkdir -p ${MOZ_OBJDIR} &&
+
+  cd ${MOZ_OBJDIR} &&
+
+  ../mozilla/configure  \
     --prefix=/usr       \
     --with-x            \
     --with-pthreads     \
@@ -40,9 +45,7 @@
     --enable-places \
     --enable-places_bookmarks \
     --enable-application=browser   \
-    --enable-default-toolkit=cairo-gtk2  \
     --enable-optimize="$CFLAGS"    \
-    --enable-xft        \
     --enable-reorder    \
     --enable-cpp-rtti   \
     --enable-cpp-exceptions \
@@ -54,9 +57,12 @@
     --enable-svg-renderer=cairo  \
     --enable-system-cairo        \
     --enable-xterm-updates       \
+    --enable-libxul \
     --enable-official-branding   \
     --disable-debug     \
+    --disable-freetype2 \
     --disable-tests     \
+    --disable-mochitest \
     --disable-installer \
     --disable-pedantic  \
     --disable-mailnews  \
@@ -92,7 +98,8 @@
 
   rm -rf /usr/lib/firefox-$VERSION/chrome/icons &&
   mkdir -p /usr/lib/firefox-$VERSION/chrome/icons/default &&
-  for icon in main-window.png extensionsManager.png ; do
+
+  for icon in in main-window.png extensionsManager.png ; do
     ln -sf /usr/lib/firefox-$VERSION/icons/mozicon128.png \
            /usr/lib/firefox-$VERSION/chrome/icons/default/$icon
   done
diff --git a/web/firefox/DETAILS b/web/firefox/DETAILS
index a1de1ca..4f55d74 100644
--- a/web/firefox/DETAILS
+++ b/web/firefox/DETAILS
@@ -1,7 +1,6 @@
           MODULE=firefox
          VERSION=3.0
           SOURCE=${MODULE}-${VERSION}-source.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/mozilla
    SOURCE_URL[0]=ftp://ftp.mozilla.org/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/
diff --git a/web/firefox/PRE_BUILD b/web/firefox/PRE_BUILD
new file mode 100644
index 0000000..ed41125
--- /dev/null
+++ b/web/firefox/PRE_BUILD
@@ -0,0 +1,5 @@
+mk_source_dir &&
+validate_source_dir &&
+
+cd $SOURCE_DIRECTORY &&
+unpack $SOURCE