[Lunar-commits] <moonbase> firefox, firefox2: Add new module for the "old" firefox. Bump firefox to 3.0.

Moritz Heiber moe at lunar-linux.org
Fri Jun 20 21:24:42 CEST 2008


commit d07a7b7115f49e76a5e19e06a25aa0cf4b1136f9
Author: Moritz Heiber <moe at lunar-linux.org>
Date:   Fri Jun 20 16:10:02 2008 +0200

    firefox, firefox2: Add new module for the "old" firefox. Bump firefox to 3.0.
---
 web/firefox/BUILD            |    9 ++--
 web/firefox/DEPENDS          |   29 +++++++------
 web/firefox/DETAILS          |   12 +++---
 web/firefox2/BUILD           |   97 ++++++++++++++++++++++++++++++++++++++++++
 web/firefox2/DEPENDS         |   14 ++++++
 web/firefox2/DETAILS         |   17 +++++++
 web/firefox2/POST_INSTALL    |   16 +++++++
 web/firefox2/POST_REMOVE     |    3 +
 web/firefox2/firefox.desktop |    9 ++++
 9 files changed, 183 insertions(+), 23 deletions(-)

diff --git a/web/firefox/BUILD b/web/firefox/BUILD
index 6d98685..e8c3fe5 100644
--- a/web/firefox/BUILD
+++ b/web/firefox/BUILD
@@ -8,7 +8,7 @@
 
   MOZILLA_HOME=/usr/lib/$MODULE-$VERSION
 
-  MOZ_EXTENSIONS="default,xmlextras,xforms,webservices,universalchardet,transformiix,tasks,schema-validation,reporter,cookie,cview,datetime,finger,p3p,permissions,spellcheck,-gnomevfs"
+  MOZ_EXTENSIONS="default,typeaheadfind,xforms,tasks,schema-validation,reporter,cview,datetime,finger"
   # wallet extension makes empty duplicate password dialog so do not use it
 
   if in_depends $MODULE heimdal ; then
@@ -23,7 +23,6 @@
   export MOZ_FREETYPE2="no"
   export MOZ_PANGO="yes"
   export MOZ_CO_PROJECT=browser
-  export MOZ_PHOENIX=1
   export MOZILLA_OFFICIAL=1
   export BUILD_OFFICIAL=1
 
@@ -34,12 +33,14 @@
     --with-default-mozilla-five-home=$MOZILLA_HOME \
     --with-user-appdir=".firefox"       \
     --with-system-zlib  \
-    --with-system-png   \
     --with-system-jpeg  \
     --enable-extensions=${MOZ_EXTENSIONS}       \
     --enable-single-profile        \
+    --enable-storage \
+    --enable-places \
+    --enable-places_bookmarks \
     --enable-application=browser   \
-    --enable-default-toolkit=gtk2  \
+    --enable-default-toolkit=cairo-gtk2  \
     --enable-optimize="$CFLAGS"    \
     --enable-xft        \
     --enable-reorder    \
diff --git a/web/firefox/DEPENDS b/web/firefox/DEPENDS
index 2f0ea9e..204c8d3 100644
--- a/web/firefox/DEPENDS
+++ b/web/firefox/DEPENDS
@@ -1,14 +1,17 @@
-depends  ORBit2  &&
-depends  zip     &&
-depends  unzip   &&
-depends  expat   &&
-depends  gtk+-2  &&
+depends ORBit2
+depends zip
+depends unzip
+depends expat
+depends gtk+-2
+depends nss
 
-optional_depends  "flash-plugin-9"  ""  ""                    \
-                  "to enable Shockwave Flash 9"               &&
-optional_depends  "gnome-vfs2"    ""  "--disable-gnomevfs"  \
-                  "for Gnome VFS support"                   &&
-optional_depends  "heimdal"                                 \
-                  "--with-gssapi=/usr/include/heimdal"      \
-                  "--without-gssapi"                        \
-                  "Heimdal GSSAPI Support"
+optional_depends "sqlite" \
+                 "--enable-system-sqlite" \
+                 "--disable-system-sqlite" \
+                 "use sqlite for firefox storage"
+optional_depends "flash-plugin-9" "" "" "to enable Shockwave Flash 9"
+optional_depends "gnome-vfs2" "" "--disable-gnomevfs" "for Gnome VFS support"
+optional_depends "heimdal" \
+                 "--with-gssapi=/usr/include/heimdal" \
+                 "--without-gssapi" \
+                 "Heimdal GSSAPI Support"
diff --git a/web/firefox/DETAILS b/web/firefox/DETAILS
index b7e2a9a..a1de1ca 100644
--- a/web/firefox/DETAILS
+++ b/web/firefox/DETAILS
@@ -1,14 +1,14 @@
           MODULE=firefox
-         VERSION=2.0.0.14
+         VERSION=3.0
           SOURCE=${MODULE}-${VERSION}-source.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/mozilla
-   SOURCE_URL[0]=ftp://mozilla.isc.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://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$VERSION/source/
-      SOURCE_VFY=sha1:de263675a137a8e2b25757c4d292e7a3e2434f74
+   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/
+      SOURCE_VFY=sha1:2e21652b9cad2a6ac8f048f50e9e053c19760d4b
         WEB_SITE=http://www.mozilla.org/projects/firefox
          ENTERED=20030810
-         UPDATED=20080417
+         UPDATED=20080620
       MAINTAINER="tchan at lunar-linux.org"
            SHORT="a speedy, full-featured web browser."
 cat << EOF
diff --git a/web/firefox2/BUILD b/web/firefox2/BUILD
new file mode 100644
index 0000000..6d98685
--- /dev/null
+++ b/web/firefox2/BUILD
@@ -0,0 +1,97 @@
+(
+  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 &&
+
+  MOZILLA_HOME=/usr/lib/$MODULE-$VERSION
+
+  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"
+  else
+        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
+  export MOZ_PHOENIX=1
+  export MOZILLA_OFFICIAL=1
+  export BUILD_OFFICIAL=1
+
+  ./configure           \
+    --prefix=/usr       \
+    --with-x            \
+    --with-pthreads     \
+    --with-default-mozilla-five-home=$MOZILLA_HOME \
+    --with-user-appdir=".firefox"       \
+    --with-system-zlib  \
+    --with-system-png   \
+    --with-system-jpeg  \
+    --enable-extensions=${MOZ_EXTENSIONS}       \
+    --enable-single-profile        \
+    --enable-application=browser   \
+    --enable-default-toolkit=gtk2  \
+    --enable-optimize="$CFLAGS"    \
+    --enable-xft        \
+    --enable-reorder    \
+    --enable-cpp-rtti   \
+    --enable-cpp-exceptions \
+    --enable-crypto     \
+    --enable-strip      \
+    --enable-strip-libs \
+    --enable-canvas     \
+    --enable-svg        \
+    --enable-svg-renderer=cairo  \
+    --enable-system-cairo        \
+    --enable-xterm-updates       \
+    --enable-official-branding   \
+    --disable-debug     \
+    --disable-tests     \
+    --disable-installer \
+    --disable-pedantic  \
+    --disable-mailnews  \
+    --disable-logging   \
+    --disable-accessibility     \
+    --disable-ldap      \
+    --disable-profilesharing    \
+    --disable-mathml    \
+    $OPTS               &&
+
+  default_make        &&
+
+  # Put some important headers in place
+  mkdir -p /usr/include/firefox-$VERSION/nss &&
+  cp -Lf dist/private/nss/*.h dist/public/nss/*.h /usr/include/firefox-$VERSION/nss &&
+
+  # 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  &&
+
+  rm -rf /usr/lib/firefox-$VERSION/plugins &&
+  ln -snf /opt/lunar/plugins /usr/lib/firefox-$VERSION/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/default.xpm /usr/share/pixmaps/firefox.xpm &&
+
+  # 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 `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/firefox2/DEPENDS b/web/firefox2/DEPENDS
new file mode 100644
index 0000000..2f0ea9e
--- /dev/null
+++ b/web/firefox2/DEPENDS
@@ -0,0 +1,14 @@
+depends  ORBit2  &&
+depends  zip     &&
+depends  unzip   &&
+depends  expat   &&
+depends  gtk+-2  &&
+
+optional_depends  "flash-plugin-9"  ""  ""                    \
+                  "to enable Shockwave Flash 9"               &&
+optional_depends  "gnome-vfs2"    ""  "--disable-gnomevfs"  \
+                  "for Gnome VFS support"                   &&
+optional_depends  "heimdal"                                 \
+                  "--with-gssapi=/usr/include/heimdal"      \
+                  "--without-gssapi"                        \
+                  "Heimdal GSSAPI Support"
diff --git a/web/firefox2/DETAILS b/web/firefox2/DETAILS
new file mode 100644
index 0000000..bf7d444
--- /dev/null
+++ b/web/firefox2/DETAILS
@@ -0,0 +1,17 @@
+          MODULE=firefox
+         VERSION=2.0.0.14
+          SOURCE=${MODULE}-${VERSION}-source.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/mozilla
+   SOURCE_URL[0]=ftp://mozilla.isc.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://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$VERSION/source/
+      SOURCE_VFY=sha1:de263675a137a8e2b25757c4d292e7a3e2434f74
+        WEB_SITE=http://www.mozilla.org/projects/firefox
+         ENTERED=20030810
+         UPDATED=20080417
+      MAINTAINER="tchan at lunar-linux.org"
+           SHORT="a speedy, full-featured web browser. (version 2)"
+cat << EOF
+This module provides the version 2 of the Mozilla Firefox browser.
+For Firefox 3 please install the firefox module.
+EOF
diff --git a/web/firefox2/POST_INSTALL b/web/firefox2/POST_INSTALL
new file mode 100644
index 0000000..27043e5
--- /dev/null
+++ b/web/firefox2/POST_INSTALL
@@ -0,0 +1,16 @@
+OLD_VER="`get_module_config OLD_VER`"
+FIREFOX_HOME=/usr
+FFOX_LIBDIR=firefox-$VERSION
+
+if [ ! -z $OLD_VER ]; then
+  rm -rf /usr/lib/firefox-$OLD_VER
+fi
+
+unset_module_config OLD_VER
+
+export LD_LIBRARY_PATH="$FIREFOX_HOME/lib/$FFOX_LIBDIR:$FIREFOX_HOME/lib/$FFOX_LIBDIR/plugins:$FIREFOX_HOME/lib/$FFOX_LIBDIR/components"
+export MOZILLA_FIVE_HOME="$FIREFOX_HOME/lib/$FFOX_LIBDIR"
+ldconfig
+
+cd $FIREFOX_HOME/lib/$FFOX_LIBDIR
+./regxpcom
diff --git a/web/firefox2/POST_REMOVE b/web/firefox2/POST_REMOVE
new file mode 100644
index 0000000..a9328ff
--- /dev/null
+++ b/web/firefox2/POST_REMOVE
@@ -0,0 +1,3 @@
+rm -f  /usr/share/pixmaps/firefox.xpm
+rm -rf /usr/include/firefox-$VERSION
+rm -rf /usr/lib/firefox-$VERSION
diff --git a/web/firefox2/firefox.desktop b/web/firefox2/firefox.desktop
new file mode 100644
index 0000000..6212500
--- /dev/null
+++ b/web/firefox2/firefox.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Firefox
+Comment=Firefox Web Browser
+Exec=firefox
+Icon=/usr/share/pixmaps/firefox.xpm
+Terminal=false
+Type=Application
+Categories=Application;Network;


More information about the Lunar-commits mailing list