hopefully fixed firefox & thunderbird package

[hdw-linux/hdw-linux.git] / packages / x11 / firefox / firefox

diff --git a/packages/x11/firefox/firefox b/packages/x11/firefox/firefox
index 8967f08..cd2e143 100644 (file)
--- a/packages/x11/firefox/firefox
+++ b/packages/x11/firefox/firefox
@@ -2,14 +2,18 @@
 #
 # author: hackbard@hackdaworld.dyndns.org
 #
-# [V] 1.0.6
+# [V] 1.6a1
 # [S] 3-8
-# [D] firefox-1.0.6-source.tar.bz2 http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/1.0.6/source/
+# [D] mozilla-cvs-20050905_1800.tar.bz2 http://hdwlinux.org/download/hdw-linux/hdw-linux-1.0/sources/x11/firefox/
 # [D] install_flash_player_7_linux.tar.gz http://fpdownload.macromedia.com/get/shockwave/flash/english/linux/7.0r25/
 
 srcdir=mozilla
 optimize="`echo $hdw_cflags | awk '{ print $1 }'`"
+extensions="cookie,xml-rpc,xmlextras,pref,transformiix"
+extensions="$extensions,universalchardet,webservices,inspector"
 export PKG_CONFIG_PATH="$prefix/X11R6/lib/pkgconfig"
+# firefox doesn't like optimization
+unset CFLAGS CPPFLAGS CXXFLAGS
 
 pre_install()  {
        export MOZILLA_OFFICIAL=1 BUILD_OFFICIAL=1 MOZ_PHOENIX=1
@@ -17,16 +21,21 @@ pre_install()       {
        sed "s,0000000000,hdw-linux -- ${hdw_version}," \
                xpfe/global/build.dtd.in > xpfe/global/build.dtd.in.new
        mv xpfe/global/build.dtd.in.new xpfe/global/build.dtd.in
+       sed -i 's|    dist_bin="$moz_libdir"|\
+                       &\n    run_moz="$dist_bin/run-mozilla.sh"|' \
+                       browser/app/mozilla.in
                }
 
 confopt="$confopt --enable-default-toolkit=gtk2 --with-x --with-system-zlib"
-confopt="$confopt --with-system-jpeg --with-system-png --with-extensions"
+confopt="$confopt --with-system-jpeg --with-system-png"
 confopt="$confopt --with-default-mozilla-five-home=$MOZILLA_FIVE_HOME"
 confopt="$confopt --with-user-appdir=.firefox"
 confopt="$confopt --enable-xft --enable-crypto --enable-xinerama"
-confopt="$confopt --enable-strip --enable-strip-libs --enable-extensions=all"
+confopt="$confopt --enable-strip --enable-strip-libs"
+confopt="$confopt --enable-extensions=$extensions" # 'all' or '$extensions'
 confopt="$confopt --enable-application=browser"
-confopt="$confopt --enable-optimize='$optimize' --enable-cpp-rtti"
+confopt="$confopt --enable-cpp-rtti"
+#confopt="$confopt --enable-optimize='$optimize' --enable-cpp-rtti"
 confopt="$confopt --enable-single-profile --disable-profilesharing "
 confopt="$confopt --disable-mailnews --disable-ldap --disable-freetype2"
 confopt="$confopt --disable-tests --disable-debug --disable-composer"
@@ -42,9 +51,9 @@ post_install()        {
        ln -sfv firefox-$ver $prefix/include/firefox
 
        cd $prefix/lib/firefox-$ver
-       LD_LIBRARY_PATH=. ./regxpcom
-       LD_LIBRARY_PATH=. ./regchrome
-       touch `find $PWD -name *.rdf`
+       [ -f ./regxpcom ] && LD_LIBRARY_PATH=. ./regxpcom
+       [ -f ./regchrome ] && LD_LIBRARY_PATH=. ./regchrome
+       #touch `find $PWD -name *.rdf`
 
        # plugins
        cd $root/src.$package