[Lunar-commits] <moonbase> firefox: updated to 6.0.1 firefox6 module removed
Zbigniew Luszpinski
zbiggy at lunar-linux.org
Thu Sep 1 01:38:56 CEST 2011
commit 8321c0e32a289bed95c3dfd5600f59190f81bc37
Author: Zbigniew Luszpinski <zbiggy at lunar-linux.org>
Date: Thu Sep 1 01:38:56 2011 +0200
firefox: updated to 6.0.1 firefox6 module removed
---
web/firefox/BUILD | 113 +++++++++++++++++++++---------------------
web/firefox/BUILD.x86_64 | 95 -----------------------------------
web/firefox/CONFLICTS | 3 +-
web/firefox/DEPENDS | 11 ++--
web/firefox/DETAILS | 13 ++---
web/firefox/POST_INSTALL | 15 +++++-
web/firefox/POST_REMOVE | 12 +++-
web/firefox/PRE_BUILD | 10 ++--
web/firefox/firefox.desktop | 2 +-
web/firefox/mozconfig | 7 +++
web/firefox6/BUILD | 95 -----------------------------------
web/firefox6/CONFIGURE | 2 -
web/firefox6/CONFLICTS | 2 -
web/firefox6/DEPENDS | 26 ----------
web/firefox6/DETAILS | 39 --------------
web/firefox6/POST_INSTALL | 31 -----------
web/firefox6/POST_REMOVE | 10 ----
web/firefox6/PRE_BUILD | 7 ---
web/firefox6/firefox.desktop | 11 ----
web/firefox6/mozconfig | 37 --------------
20 files changed, 105 insertions(+), 436 deletions(-)
diff --git a/web/firefox/BUILD b/web/firefox/BUILD
index f5bd91a..8f3f26c 100644
--- a/web/firefox/BUILD
+++ b/web/firefox/BUILD
@@ -1,96 +1,95 @@
(
- MOZILLA_DIR=mozilla-1.9.2 &&
+ sedit 's/^GENERATE_CACHE .*/GENERATE_CACHE = true/' toolkit/mozapps/installer/packager.mk &&
+ sedit 's/@PRE_RELEASE_SUFFIX@//g' browser/base/content/browser.xul &&
if module_is_expired $MODULE && [ "$VERSION" != "`installed_version $MODULE`" ]; then
- set_module_config OLD_VER "`installed_version $MODULE`"
- fi &&
+ set_module_config OLD_VER "`installed_version $MODULE`"
+ fi &&
- export MOZILLA_HOME=/usr/lib/$MODULE-$VERSION &&
- export MOZ_CO_PROJECT=browser &&
- export MOZILLA_OFFICIAL=1 &&
- export BUILD_OFFICIAL=1 &&
+ export MOZ_CO_PROJECT=browser &&
+ export MOZILLA_OFFICIAL=1 &&
+ export BUILD_OFFICIAL=1 &&
- # This should always be just a link
- rm -rf $MOZILLA_HOME/plugins &&
+ cp $SCRIPT_DIRECTORY/mozconfig . &&
- cp $SCRIPT_DIRECTORY/mozconfig $MOZILLA_DIR/ &&
+ export MOZ_OBJDIR="${SOURCE_DIRECTORY}/build-mozilla" &&
+ mkdir -p ${MOZ_OBJDIR} &&
- export MOZ_OBJDIR="${SOURCE_DIRECTORY}/build-mozilla" &&
- mkdir -p ${MOZ_OBJDIR} &&
-
- cd $MOZILLA_DIR &&
-
- echo "ac_add_options --disable-necko-wifi" >> mozconfig &&
- echo "ac_add_options --disable-system-sqlite" >> mozconfig &&
+ echo "ac_add_options --disable-necko-wifi" >> mozconfig &&
+ echo "ac_add_options --disable-system-sqlite" >> mozconfig &&
#Add DEPENDS options
-
if in_depends $MODULE "xulrunner" ; then
- XUL=`module_version xulrunner` &&
+ XUL=`module_version xulrunner` &&
echo "ac_add_options --with-libxul-sdk=/usr/lib/xulrunner-devel-$XUL" >> mozconfig
- fi &&
+ fi &&
if in_depends $MODULE gnome-vfs ; then
echo "ac_add_options --enable-gnomevfs" >> mozconfig
else
echo "ac_add_options --disable-gnomevfs" >> mozconfig
- fi &&
+ fi &&
+
+ if in_depends $MODULE libevent ; then
+ echo "ac_add_options --with-system-libevent" >> mozconfig
+ else
+ echo "ac_add_options --without-system-libevent" >> mozconfig
+ fi &&
+
+ if in_depends $MODULE dbus-glib ; then
+ echo "ac_add_options --enable-dbus" >> mozconfig
+ else
+ echo "ac_add_options --disable-dbus" >> 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 --with-java-include-path=/usr/java/default/include" >> mozconfig &&
+ echo "ac_add_options --with-java-bin-path=/usr/java/default/bin" >> mozconfig &&
echo "ac_add_options --enable-javaxpcom" >> mozconfig
- fi &&
+ fi &&
#Add CONFIGURE options
if [ "$SAFE" == "y" ] ; then
echo "ac_add_options --enable-safe-browsing" >> mozconfig
- fi &&
+ fi &&
setterm -bfreq -blength &&
#Finally, the build!
if [ "$PGO" == "y" ] ; then
#CCache breaks the pgo build
- export CCACHE_DISABLE=1 &&
- echo "ac_add_options --enable-profile-guided-optimization" >> mozconfig &&
- echo "mk_add_options PROFILE_GEN_SCRIPT='python $MOZ_OBJDIR/_profile/pgo/profileserver.py'" >> mozconfig &&
+ export CCACHE_DISABLE=1 &&
+ echo "ac_add_options --enable-profile-guided-optimization" >> mozconfig &&
+ echo "mk_add_options PROFILE_GEN_SCRIPT='python $MOZ_OBJDIR/_profile/pgo/profileserver.py'" >> mozconfig &&
make -f client.mk build &&
make -f client.mk profiledbuild
else
make -f client.mk build
- fi &&
+ fi &&
- cd ${MOZ_OBJDIR} &&
- prepare_install &&
+ cd ${MOZ_OBJDIR} &&
+ prepare_install &&
make install || exit 1
- # Using "exit 1" above, because the "for" loop below will break the error-handling chain
-
- # 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 $MOZILLA_HOME/plugins`; do
- `install -m755 $MOZILLA_HOME/plugins/$plugin /opt/lunar/plugins`; done &&
-
- 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/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 || exit 1
-
- # Make firefox use its own icon
- for icon in `ls $MOZILLA_HOME/icons`; do
- ln -sf $MOZILLA_HOME/icons/$icon \
- $MOZILLA_HOME/chrome/icons/default/$icon
- done
+
+ MOZILLA_HOME=$(egrep ^moz_libdir= browser/app/firefox | cut -d= -f2) &&
+ LIB_VER=$(echo $MOZILLA_HOME | cut -d\- -f2) &&
+ # Sanity check
+ if [[ $MOZILLA_HOME != "/usr/lib"*"firefox"* ]] || [[ $LIB_VER != [1-9]* ]] ; then
+ message "${PROBLEM_COLOR}Sanity check on variables failed!${DEFAULT_COLOR}"
+ exit 1
+ fi &&
+ set_module_config NEW_VER "$LIB_VER" &&
+
+ # Now the .desktop file and icons
+ install -Dm 644 {"$SCRIPT_DIRECTORY",/usr/share/applications}/firefox.desktop &&
+
+ for s in 16 22 24 32 48 256 ; do
+ install -Dm 644 $SOURCE_DIRECTORY/browser/branding/official/default${s}.png /usr/share/icons/hicolor/${s}x${s}/apps/firefox.png
+ done &&
+ if [ -x /usr/bin/gtk-update-icon-cache -a -f /usr/share/icons/hicolor/index.theme ]; then
+ gtk-update-icon-cache -f /usr/share/icons/hicolor
+ fi
) > $C_FIFO 2>&1
diff --git a/web/firefox/BUILD.x86_64 b/web/firefox/BUILD.x86_64
deleted file mode 100644
index 9f207f7..0000000
--- a/web/firefox/BUILD.x86_64
+++ /dev/null
@@ -1,95 +0,0 @@
-(
-
- MOZILLA_DIR=mozilla-1.9.2
-
- if module_is_expired $MODULE && [ "$VERSION" != "`installed_version $MODULE`" ]; then
- set_module_config OLD_VER "`installed_version $MODULE`"
- fi &&
-
- export MOZILLA_HOME=/usr/lib/$MODULE-$VERSION
- export MOZ_CO_PROJECT=browser
- export MOZILLA_OFFICIAL=1
- export BUILD_OFFICIAL=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_DIR &&
-
- echo "ac_add_options --disable-necko-wifi" >> mozconfig
- echo "ac_add_options --disable-system-sqlite" >> mozconfig
-
- #Add DEPENDS options
-
- 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 &&
-
- setterm -bfreq -blength &&
-
- #Finally, the build!
- if [ "$PGO" == "y" ] ; then
- #CCache breaks the pgo build
- export CCACHE_DISABLE=1
- echo "ac_add_options --enable-profile-guided-optimization" >> mozconfig &&
- echo "mk_add_options PROFILE_GEN_SCRIPT='python $MOZ_OBJDIR/_profile/pgo/profileserver.py'" >> mozconfig &&
- make -f client.mk build &&
- make -f client.mk profiledbuild
- else
- make -f client.mk build
- fi &&
-
- cd ${MOZ_OBJDIR} &&
- prepare_install &&
- make install &&
-
- # 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 $MOZILLA_HOME/plugins`; do
- `install -m755 $MOZILLA_HOME/plugins/$plugin /opt/lunar/plugins`; done &&
-
- 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/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
- 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/CONFLICTS b/web/firefox/CONFLICTS
index 1fa4b6f..597434a 100644
--- a/web/firefox/CONFLICTS
+++ b/web/firefox/CONFLICTS
@@ -1,2 +1 @@
-conflicts firefox5
-conflicts firefox6
+conflicts firefox3
diff --git a/web/firefox/DEPENDS b/web/firefox/DEPENDS
index 65e2c11..f338c90 100644
--- a/web/firefox/DEPENDS
+++ b/web/firefox/DEPENDS
@@ -6,6 +6,7 @@ depends nss
depends curl
depends libnotify
depends alsa-lib
+depends libvpx
# Firefox crashes with sqlite 3.6.18 when adding new bookmarks:
# https://bugzilla.mozilla.org/show_bug.cgi?id=512940
@@ -15,11 +16,11 @@ depends alsa-lib
# "Use system sqlite"
optional_depends "Python" "" "" "Needed to do a Profile Guided Optimization build"
-optional_depends "flash-plugin-10" "" "" "To enable Flash plugin"
+optional_depends "flash-plugin-10" "" "" "To enable Flash plugin (If yes here say no to version 11"
+optional_depends "flash-plugin-11" "" "" "To enable Flash plugin"
optional_depends "gnome-vfs" "" "" "For Gnome VFS support"
optional_depends "hunspell" "" "" "For spelling support"
-optional_depends "dbus-glib" \
- "--enable-dbus" \
- "--disable-dbus" \
- "for dbus support"
+# $OPTS is ignored in this BUILD
+optional_depends "libevent" "" "" "For event detection"
+optional_depends "dbus-glib" "" "" "For dbus support"
diff --git a/web/firefox/DETAILS b/web/firefox/DETAILS
index 6591254..a318aa7 100644
--- a/web/firefox/DETAILS
+++ b/web/firefox/DETAILS
@@ -1,15 +1,14 @@
MODULE=firefox
- VERSION=3.6.20
- SOURCE=${MODULE}-${VERSION}.source.tar.bz2
+ VERSION=6.0.1
+ SOURCE=firefox-$VERSION.source.tar.bz2
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.mozilla.org/pub/firefox/releases/$VERSION/source
- SOURCE_VFY=sha1:d25d892b3214f92f0799ecdaf6ea6414a8950eb2
+ SOURCE_VFY=sha1:68d08c13ae24f0c3b9c4b0c3eeb83a02c56e4229
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/mozilla-release
WEB_SITE=http://www.mozilla.org/projects/firefox
- ENTERED=20030810
- UPDATED=20110820
- MAINTAINER="tchan at lunar-linux.org"
- PSAFE=no
+ ENTERED=20110814
+ UPDATED=20110831
SHORT="A speedy, full-featured web browser"
cat << EOF
diff --git a/web/firefox/POST_INSTALL b/web/firefox/POST_INSTALL
index 5ca5b8a..c54c5f8 100644
--- a/web/firefox/POST_INSTALL
+++ b/web/firefox/POST_INSTALL
@@ -1,8 +1,9 @@
OLD_VER="`get_module_config OLD_VER`"
+NEW_VER="`get_module_config NEW_VER`"
FIREFOX_HOME=/usr
-FFOX_LIBDIR=firefox-$VERSION
+FFOX_LIBDIR=firefox-$NEW_VER
-if [ ! -z "$OLD_VER" ]; then
+if [ ! -z "$OLD_VER" ] && [ "$OLD_VER" != "$NEW_VER" ] ; then
for old_version in $OLD_VER
do
rm -rf /usr/lib/firefox-$old_version
@@ -15,6 +16,16 @@ fi
unset_module_config OLD_VER
+# Clean up old firefox junk
+rm -rf /usr/include/firefox-3*
+rm -rf /usr/include/firefox-4*
+rm -rf /usr/share/idl/firefox-3*
+rm -rf /usr/share/idl/firefox-4*
+rm -rf /usr/lib/gcc/i686-pc-linux-gnu/4.5.2/include-fixed/firefox-3*
+rm -rf /usr/lib/gcc/i686-pc-linux-gnu/4.5.2/include-fixed/firefox-4*
+
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"
+# Add plugins
+ln -snf /opt/lunar/plugins "$MOZILLA_FIVE_HOME/plugins"
ldconfig
diff --git a/web/firefox/POST_REMOVE b/web/firefox/POST_REMOVE
index a46a092..ecb70e2 100644
--- a/web/firefox/POST_REMOVE
+++ b/web/firefox/POST_REMOVE
@@ -1,4 +1,10 @@
+NEW_VER="`get_module_config NEW_VER`"
+if [ -z "$NEW_VER" ] ; then
+ NEW_VER=$VERSION
+fi
+
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
+rm -rf /usr/include/firefox*
+rm -rf /usr/share/idl/firefox*
+rm -rf /usr/lib/firefox*
+rm -rf /usr/lib/gcc/i686-pc-linux-gnu/4.5.2/include-fixed/firefox*
diff --git a/web/firefox/PRE_BUILD b/web/firefox/PRE_BUILD
index cc901d0..cda417a 100644
--- a/web/firefox/PRE_BUILD
+++ b/web/firefox/PRE_BUILD
@@ -1,5 +1,7 @@
-validate_source_dir &&
-mk_source_dir &&
+if [ ! -e /usr/include/cairo/cairo-tee.h ] ; then
+ message "${PROBLEM_COLOR}Run: ${MODULE_COLOR}lin -c cairo"
+ message "${MESSAGE_COLOR}To recompile cairo with tee support, which is required by firefox6.${DEFAULT_COLOR}"
+ exit 1
+fi
-cd $SOURCE_DIRECTORY &&
-unpack $SOURCE
+default_pre_build
diff --git a/web/firefox/firefox.desktop b/web/firefox/firefox.desktop
index d750023..064444f 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/firefox48.png
+Icon=firefox
Terminal=false
Type=Application
Categories=Application;Network;
diff --git a/web/firefox/mozconfig b/web/firefox/mozconfig
index 409bc24..94ed726 100644
--- a/web/firefox/mozconfig
+++ b/web/firefox/mozconfig
@@ -28,3 +28,10 @@ ac_add_options --disable-logging
ac_add_options --disable-accessibility
ac_add_options --enable-mathml
ac_add_options --disable-os2-high-mem
+ac_add_options --enable-gio
+ac_add_options --enable-raw
+ac_add_options --with-system-libvpx
+ac_add_options --enable-splashscreen
+ac_add_options --enable-url-classifier
+ac_add_options --enable-shared-js
+ac_add_options --enable-system-pixman
diff --git a/web/firefox6/BUILD b/web/firefox6/BUILD
deleted file mode 100644
index 8f3f26c..0000000
--- a/web/firefox6/BUILD
+++ /dev/null
@@ -1,95 +0,0 @@
-(
-
- sedit 's/^GENERATE_CACHE .*/GENERATE_CACHE = true/' toolkit/mozapps/installer/packager.mk &&
- sedit 's/@PRE_RELEASE_SUFFIX@//g' browser/base/content/browser.xul &&
-
- if module_is_expired $MODULE && [ "$VERSION" != "`installed_version $MODULE`" ]; then
- set_module_config OLD_VER "`installed_version $MODULE`"
- fi &&
-
- export MOZ_CO_PROJECT=browser &&
- export MOZILLA_OFFICIAL=1 &&
- export BUILD_OFFICIAL=1 &&
-
- cp $SCRIPT_DIRECTORY/mozconfig . &&
-
- export MOZ_OBJDIR="${SOURCE_DIRECTORY}/build-mozilla" &&
- mkdir -p ${MOZ_OBJDIR} &&
-
- echo "ac_add_options --disable-necko-wifi" >> mozconfig &&
- echo "ac_add_options --disable-system-sqlite" >> mozconfig &&
-
- #Add DEPENDS options
- 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 libevent ; then
- echo "ac_add_options --with-system-libevent" >> mozconfig
- else
- echo "ac_add_options --without-system-libevent" >> mozconfig
- fi &&
-
- if in_depends $MODULE dbus-glib ; then
- echo "ac_add_options --enable-dbus" >> mozconfig
- else
- echo "ac_add_options --disable-dbus" >> mozconfig
- fi &&
-
- if in_depends $MODULE sun-jdk ; then
- echo "ac_add_options --with-java-include-path=/usr/java/default/include" >> mozconfig &&
- echo "ac_add_options --with-java-bin-path=/usr/java/default/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 &&
-
- setterm -bfreq -blength &&
-
- #Finally, the build!
- if [ "$PGO" == "y" ] ; then
- #CCache breaks the pgo build
- export CCACHE_DISABLE=1 &&
- echo "ac_add_options --enable-profile-guided-optimization" >> mozconfig &&
- echo "mk_add_options PROFILE_GEN_SCRIPT='python $MOZ_OBJDIR/_profile/pgo/profileserver.py'" >> mozconfig &&
- make -f client.mk build &&
- make -f client.mk profiledbuild
- else
- make -f client.mk build
- fi &&
-
- cd ${MOZ_OBJDIR} &&
- prepare_install &&
- make install || exit 1
-
- MOZILLA_HOME=$(egrep ^moz_libdir= browser/app/firefox | cut -d= -f2) &&
- LIB_VER=$(echo $MOZILLA_HOME | cut -d\- -f2) &&
- # Sanity check
- if [[ $MOZILLA_HOME != "/usr/lib"*"firefox"* ]] || [[ $LIB_VER != [1-9]* ]] ; then
- message "${PROBLEM_COLOR}Sanity check on variables failed!${DEFAULT_COLOR}"
- exit 1
- fi &&
- set_module_config NEW_VER "$LIB_VER" &&
-
- # Now the .desktop file and icons
- install -Dm 644 {"$SCRIPT_DIRECTORY",/usr/share/applications}/firefox.desktop &&
-
- for s in 16 22 24 32 48 256 ; do
- install -Dm 644 $SOURCE_DIRECTORY/browser/branding/official/default${s}.png /usr/share/icons/hicolor/${s}x${s}/apps/firefox.png
- done &&
- if [ -x /usr/bin/gtk-update-icon-cache -a -f /usr/share/icons/hicolor/index.theme ]; then
- gtk-update-icon-cache -f /usr/share/icons/hicolor
- fi
-
-) > $C_FIFO 2>&1
diff --git a/web/firefox6/CONFIGURE b/web/firefox6/CONFIGURE
deleted file mode 100644
index c8311d9..0000000
--- a/web/firefox6/CONFIGURE
+++ /dev/null
@@ -1,2 +0,0 @@
-mquery PGO "Build with Profile Guided Optimization?" y "--enable-profile-guided-optimization" ""
-mquery SAFE "Enable safe browsing (anti-phishing)?" y "--enable-safe-browsing" ""
diff --git a/web/firefox6/CONFLICTS b/web/firefox6/CONFLICTS
deleted file mode 100644
index a5bc12e..0000000
--- a/web/firefox6/CONFLICTS
+++ /dev/null
@@ -1,2 +0,0 @@
-conflicts firefox
-conflicts firefox5
diff --git a/web/firefox6/DEPENDS b/web/firefox6/DEPENDS
deleted file mode 100644
index f338c90..0000000
--- a/web/firefox6/DEPENDS
+++ /dev/null
@@ -1,26 +0,0 @@
-depends ORBit2
-depends zip
-depends unzip
-depends gtk+-2
-depends nss
-depends curl
-depends libnotify
-depends alsa-lib
-depends libvpx
-
-# Firefox crashes with sqlite 3.6.18 when adding new bookmarks:
-# https://bugzilla.mozilla.org/show_bug.cgi?id=512940
-# Comment 9: "System SQLite isn't supported by Mozilla (in fact we discourage its use)"
-# So, disable the option to use system sqlite - instead, use Mozilla's version
-#optional_depends "sqlite" "" "" \
-# "Use system sqlite"
-
-optional_depends "Python" "" "" "Needed to do a Profile Guided Optimization build"
-optional_depends "flash-plugin-10" "" "" "To enable Flash plugin (If yes here say no to version 11"
-optional_depends "flash-plugin-11" "" "" "To enable Flash plugin"
-optional_depends "gnome-vfs" "" "" "For Gnome VFS support"
-optional_depends "hunspell" "" "" "For spelling support"
-
-# $OPTS is ignored in this BUILD
-optional_depends "libevent" "" "" "For event detection"
-optional_depends "dbus-glib" "" "" "For dbus support"
diff --git a/web/firefox6/DETAILS b/web/firefox6/DETAILS
deleted file mode 100644
index 8f45519..0000000
--- a/web/firefox6/DETAILS
+++ /dev/null
@@ -1,39 +0,0 @@
- MODULE=firefox6
- VERSION=6.0
- SOURCE=firefox-$VERSION.source.tar.bz2
- 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.mozilla.org/pub/firefox/releases/$VERSION/source
- SOURCE_VFY=sha1:abcb3cc3907d5217726f457085d00b3995fb469b
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/mozilla-release
- WEB_SITE=http://www.mozilla.org/projects/firefox
- ENTERED=20110814
- UPDATED=20110814
- SHORT="A speedy, full-featured web browser"
-
-cat << EOF
-Mozilla Firefox is the successor of Mozilla Firebird.
-
-Firefox includes:
- * comprehensive popup controls to keep unwanted advertising off
- your desktop
- * a tab browsing mode that lets you open several pages in a single
- window, allowing you to load links in the background without
- leaving the page you're on
- * integrated Google search
- * industry leading accessibility with Find As You Type - find links
- and page text by simply typing
- * simplified privacy controls that let you cover your tracks more
- effectively
- * a streamlined browser window that lets you see more of the page
- than any other browser while at the same time being more
- configurable
- * a large variety of free downloadable extensions and themes that
- add specific functionality and visual changes to the browser
-
-------- NOTE -------
-The Lunar version of Firefox has crypto enabled and uses only gtk+-2.
-NOTHING ELSE IS CONFIGURED IN! No mail, irc, composer, gpg, calendar,
-MathML, Javascript debugger, html code inspector, LDAP, help support.
-If you want any of that use the regular seamonkey module.
-EOF
diff --git a/web/firefox6/POST_INSTALL b/web/firefox6/POST_INSTALL
deleted file mode 100644
index c54c5f8..0000000
--- a/web/firefox6/POST_INSTALL
+++ /dev/null
@@ -1,31 +0,0 @@
-OLD_VER="`get_module_config OLD_VER`"
-NEW_VER="`get_module_config NEW_VER`"
-FIREFOX_HOME=/usr
-FFOX_LIBDIR=firefox-$NEW_VER
-
-if [ ! -z "$OLD_VER" ] && [ "$OLD_VER" != "$NEW_VER" ] ; then
- for old_version in $OLD_VER
- do
- rm -rf /usr/lib/firefox-$old_version
- rm -rf /usr/lib/firefox-devel-$old_version
- rm -rf /usr/include/firefox-$old_version
- rm -rf /usr/share/idl/firefox-$old_version
- rm -rf /usr/lib/gcc/i686-pc-linux-gnu/4.5.2/include-fixed/firefox-$old_version
- done
-fi
-
-unset_module_config OLD_VER
-
-# Clean up old firefox junk
-rm -rf /usr/include/firefox-3*
-rm -rf /usr/include/firefox-4*
-rm -rf /usr/share/idl/firefox-3*
-rm -rf /usr/share/idl/firefox-4*
-rm -rf /usr/lib/gcc/i686-pc-linux-gnu/4.5.2/include-fixed/firefox-3*
-rm -rf /usr/lib/gcc/i686-pc-linux-gnu/4.5.2/include-fixed/firefox-4*
-
-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"
-# Add plugins
-ln -snf /opt/lunar/plugins "$MOZILLA_FIVE_HOME/plugins"
-ldconfig
diff --git a/web/firefox6/POST_REMOVE b/web/firefox6/POST_REMOVE
deleted file mode 100644
index ecb70e2..0000000
--- a/web/firefox6/POST_REMOVE
+++ /dev/null
@@ -1,10 +0,0 @@
-NEW_VER="`get_module_config NEW_VER`"
-if [ -z "$NEW_VER" ] ; then
- NEW_VER=$VERSION
-fi
-
-rm -f /usr/share/pixmaps/firefox48.png
-rm -rf /usr/include/firefox*
-rm -rf /usr/share/idl/firefox*
-rm -rf /usr/lib/firefox*
-rm -rf /usr/lib/gcc/i686-pc-linux-gnu/4.5.2/include-fixed/firefox*
diff --git a/web/firefox6/PRE_BUILD b/web/firefox6/PRE_BUILD
deleted file mode 100644
index cda417a..0000000
--- a/web/firefox6/PRE_BUILD
+++ /dev/null
@@ -1,7 +0,0 @@
-if [ ! -e /usr/include/cairo/cairo-tee.h ] ; then
- message "${PROBLEM_COLOR}Run: ${MODULE_COLOR}lin -c cairo"
- message "${MESSAGE_COLOR}To recompile cairo with tee support, which is required by firefox6.${DEFAULT_COLOR}"
- exit 1
-fi
-
-default_pre_build
diff --git a/web/firefox6/firefox.desktop b/web/firefox6/firefox.desktop
deleted file mode 100644
index 064444f..0000000
--- a/web/firefox6/firefox.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Firefox
-Comment=Firefox Web Browser
-Exec=firefox
-Icon=firefox
-Terminal=false
-Type=Application
-Categories=Application;Network;
-Comment[pl]=Firefox - przeglÄ…darka WWW
-X-KDE-StartupNotify=true
diff --git a/web/firefox6/mozconfig b/web/firefox6/mozconfig
deleted file mode 100644
index 94ed726..0000000
--- a/web/firefox6/mozconfig
+++ /dev/null
@@ -1,37 +0,0 @@
-ac_add_options --prefix=/usr
-ac_add_options --with-x
-ac_add_options --with-pthreads
-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 --with-system-bz2
-ac_add_options --enable-storage
-ac_add_options --enable-places
-ac_add_options --enable-application=browser
-ac_add_options --enable-default-toolkit=cairo-gtk2
-ac_add_options --enable-optimize="$CFLAGS"
-ac_add_options --enable-crypto
-ac_add_options --enable-strip
-ac_add_options --enable-canvas
-ac_add_options --enable-svg
-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-installer
-ac_add_options --disable-pedantic
-ac_add_options --disable-logging
-ac_add_options --disable-accessibility
-ac_add_options --enable-mathml
-ac_add_options --disable-os2-high-mem
-ac_add_options --enable-gio
-ac_add_options --enable-raw
-ac_add_options --with-system-libvpx
-ac_add_options --enable-splashscreen
-ac_add_options --enable-url-classifier
-ac_add_options --enable-shared-js
-ac_add_options --enable-system-pixman
More information about the Lunar-commits
mailing list