# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1240702555 -7200
# Node ID 03099f36f38be4b545b522a5496a1b37f0887664
# Parent  9dff014b671822bd2aaeb9330cf7f816a3bbf892
Up: Firefox (3.0.9) - Clean up mozconfig and --enable-jsd

diff -r 9dff014b6718 -r 03099f36f38b firefox/receipt
--- a/firefox/receipt	Sun Apr 26 00:43:36 2009 +0200
+++ b/firefox/receipt	Sun Apr 26 01:35:55 2009 +0200
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="firefox"
-VERSION="3.0.8"
+VERSION="3.0.9"
 CATEGORY="network"
 SHORT_DESC="User friendly, secure and fast web browser."
 MAINTAINER="pankso@slitaz.org"
@@ -21,8 +21,7 @@
 {
 	# Move the mozilla source tree to $PACKAGE-$VERSION to keep variables
 	# and to have a nice clean.
-	#
-	mv mozilla $PACKAGE-$VERSION
+	mv mozilla $PACKAGE-$VERSION 2>/dev/null
 	cp -a stuff/firefox.mozconfig $src/.mozconfig
 	cd $src
 	./configure $CONFIGURE_ARGS &&
@@ -37,9 +36,10 @@
 	cp -a $_pkg/usr/bin $fs/usr
 	cp -a $_pkg/usr/lib/$PACKAGE-$VERSION $fs/usr/lib
 
-	# SliTaz Web site for the home page, bookmarks file and branding.
+	# Home page, bookmarks file and branding.
 	cp -a stuff/browserconfig.properties $fs/usr/lib/$PACKAGE-$VERSION
-	cp -a stuff/bookmarks.html $fs/usr/lib/$PACKAGE-$VERSION/defaults/profile
+	cp -a stuff/bookmarks.html \
+		$fs/usr/lib/$PACKAGE-$VERSION/defaults/profile
 	cp -a stuff/firefox-branding.js \
 		$fs/usr/lib/$PACKAGE-$VERSION/defaults/pref/
 
@@ -64,8 +64,7 @@
 		-C $fs/usr/lib/$PACKAGE-$VERSION/extensions
 	sed -i "s/maxVersion>3.0../maxVersion>$VERSION/" \
 		$fs/usr/lib/$PACKAGE-$VERSION/extensions/langpack*/install.rdf
-		
-
+	
 	# Search Plugin (by: oddball)
 	cp -a stuff/searchplugins $fs/usr/lib/firefox-$VERSION/
 	chown -R root.root $fs
@@ -84,8 +83,9 @@
 	# Get old plugins
 	mkdir /tmp/firefox-plugins-$$
 	cp -a $root/usr/lib/firefox-*/plugins/* /tmp/firefox-plugins-$$ 2> /dev/null
-	# Remove old libs
+	# Remove old libs and configs
 	rm -rf $root/usr/lib/firefox-*
+	rm -rf $root/etc/firefox
 }
 post_install()
 {
diff -r 9dff014b6718 -r 03099f36f38b firefox/stuff/firefox.mozconfig
--- a/firefox/stuff/firefox.mozconfig	Sun Apr 26 00:43:36 2009 +0200
+++ b/firefox/stuff/firefox.mozconfig	Sun Apr 26 01:35:55 2009 +0200
@@ -3,50 +3,50 @@
 export MOZ_PHOENIX=1
 mk_add_options MOZ_PHOENIX=1
 
+ac_add_options --prefix=/usr
+
+ac_add_options --with-system-zlib
+ac_add_options --with-system-jpeg
+#ac_add_options --with-system-png
+ac_add_options --with-pthreads
+
+ac_add_options --enable-application=browser
+ac_add_options --enable-extensions="cookie,xml-rpc,xmlextras,pref,universalchardet,webservices"
+ac_add_options --enable-crypto
+ac_add_options --enable-single-profile
+ac_add_options --enable-xft
+ac_add_options --enable-strip
+ac_add_options --enable-optimize
+ac_add_options --enable-system-cairo
+ac_add_options --enable-jsd
+#ac_add_options --enable-svg
+#ac_add_options --enable-svg-renderer=cairo
+#ac_add_options --enable-postscript
+
+ac_add_options --disable-toolkit-qt
+ac_add_options --disable-printing
+ac_add_options --disable-xprint
+ac_add_options --disable-xinerama
+ac_add_options --disable-logging
+ac_add_options --disable-profilesharing
+ac_add_options --disable-mathml
+ac_add_options --disable-crashreporter
 ac_add_options --disable-ldap
 ac_add_options --disable-calendar
 ac_add_options --disable-mailnews
 ac_add_options --disable-chatzilla
-ac_add_options --enable-extensions="cookie,xml-rpc,xmlextras,pref,universalchardet,webservices"
-ac_add_options --enable-crypto
 ac_add_options --disable-composer
-ac_add_options --enable-single-profile
-ac_add_options --disable-profilesharing
-#ac_add_options --disable-shared
-#ac_add_options --enable-static
+ac_add_options --disable-negotiateauth
 ac_add_options --disable-debug
-#ac_add_options --disable-toolkit-gtk
-#ac_add_options --enable-toolkit-gtk2
-#ac_add_options --enable-default-toolkit=gtk2
-ac_add_options --enable-xft
 ac_add_options --disable-freetype2
 ac_add_options --disable-tests
 ac_add_options --disable-accessibility
 ac_add_options --disable-installer
 ac_add_options --disable-updater
-ac_add_options --enable-strip
-ac_add_options --disable-toolkit-qt
-ac_add_options --prefix=/usr
+#ac_add_options --disable-jsd
+#ac_add_options --disable-libxul
 #ac_add_options --disable-pango
-#ac_add_options --with-default-mozilla-five-home=/usr/lib
-#ac_add_options --enable-postscript
-ac_add_options --disable-xprint
-ac_add_options --disable-xinerama
-ac_add_options --with-system-zlib
-ac_add_options --with-system-jpeg
-#ac_add_options --with-system-png
-ac_add_options --with-pthreads
-#ac_add_options --enable-svg
-#ac_add_options --enable-svg-renderer=cairo
-ac_add_options --enable-application=browser
-ac_add_options --disable-negotiateauth
-ac_add_options --disable-jsd
-#ac_add_options --disable-printing
-ac_add_options --disable-logging
-#ac_add_options --disable-libxul
-ac_add_options --disable-mathml
-ac_add_options --enable-optimize
-ac_add_options --disable-crashreporter
-ac_add_options --enable-system-cairo
+
+#ac_add_options --with-default-mozilla-five-home=/usr/lib/firefox
+#ac_add_options --enable-official-branding
 ac_add_options --with-distribution-id=slitaz
-#ac_add_options --enable-official-branding
diff -r 9dff014b6718 -r 03099f36f38b firefox/stuff/prefs.js
--- a/firefox/stuff/prefs.js	Sun Apr 26 00:43:36 2009 +0200
+++ b/firefox/stuff/prefs.js	Sun Apr 26 01:35:55 2009 +0200
@@ -11,3 +11,4 @@
 
 user_pref("general.useragent.extra.firefox", "Firefox/3.0 (SliTaz GNU/Linux)");
 user_pref("intl.charsetmenu.browser.cache", "ISO-8859-1, UTF-8");
+user_pref("font.name.serif.x-western", "DejaVu Sans");