wok-next rev 9382

Up: firefox to 4.0.
author Christopher Rogers <slaxemulator@gmail.com>
date Fri Mar 25 22:56:16 2011 +0000 (2011-03-25)
parents fb0590550cbf
children 505eee76b73b
files firefox-dev/receipt firefox/receipt firefox/stuff/firefox.mozconfig libfirefox/receipt
line diff
     1.1 --- a/firefox-dev/receipt	Fri Mar 25 22:16:27 2011 +0000
     1.2 +++ b/firefox-dev/receipt	Fri Mar 25 22:56:16 2011 +0000
     1.3 @@ -1,7 +1,7 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="firefox-dev"
     1.7 -VERSION="3.6.15"
     1.8 +VERSION="4.0"
     1.9  CATEGORY="development"
    1.10  SHORT_DESC="firefox devel files"
    1.11  MAINTAINER="jozee@slitaz.org"
     2.1 --- a/firefox/receipt	Fri Mar 25 22:16:27 2011 +0000
     2.2 +++ b/firefox/receipt	Fri Mar 25 22:56:16 2011 +0000
     2.3 @@ -1,14 +1,14 @@
     2.4  # SliTaz package receipt.
     2.5  
     2.6  PACKAGE="firefox"
     2.7 -VERSION="3.6.15"
     2.8 +VERSION="4.0"
     2.9  CATEGORY="network"
    2.10  SHORT_DESC="User friendly, secure and fast web browser."
    2.11  MAINTAINER="pankso@slitaz.org"
    2.12 -DEPENDS="gtk+ sqlite dbus dbus-glib glib jpeg xorg-libX11 xorg-libXdamage alsa-lib xorg-libXt libfirefox libnotify"
    2.13 -BUILD_DEPENDS="xorg-dev gtk+-dev zip libIDL coreutils findutils xorg-libXft-dev \
    2.14 +DEPENDS="gtk+ sqlite dbus mesa libglu-mesa dbus-glib glib jpeg xorg-libX11 xorg-libXdamage alsa-lib xorg-libXt libfirefox libnotify"
    2.15 +BUILD_DEPENDS="gtk+-dev zip libIDL coreutils findutils xorg-libXft-dev \
    2.16  dbus-dev dbus-glib-dev alsa-lib alsa-lib-dev libnotify-dev wireless_tools-dev perl \
    2.17 -python"
    2.18 +python yasm"
    2.19  TARBALL="$PACKAGE-$VERSION.source.tar.bz2"
    2.20  WEB_SITE="http://www.mozilla.org/"
    2.21  WGET_URL="http://releases.mozilla.org/pub/mozilla.org/firefox/releases/$VERSION/source/$TARBALL"
    2.22 @@ -22,10 +22,7 @@
    2.23  #
    2.24  compile_rules()
    2.25  {
    2.26 -	# Move the mozilla source tree to $PACKAGE-$VERSION to keep variables
    2.27 -	# and to have a nice clean.
    2.28 -	mv mozilla-* $PACKAGE-$VERSION 2>/dev/null
    2.29 -	cp -a stuff/firefox.mozconfig $src/.mozconfig
    2.30 +	cp -a $stuff/firefox.mozconfig $src/.mozconfig
    2.31  	cd $src
    2.32  	sed -i 's/xtype/type/' toolkit/mozapps/installer/packager.mk
    2.33  	./configure $CONFIGURE_ARGS &&
    2.34 @@ -37,26 +34,29 @@
    2.35  # Rules to gen a SliTaz package suitable for Tazpkg.
    2.36  genpkg_rules()
    2.37  {
    2.38 -	mkdir -p $fs/usr/lib/$PACKAGE-$VERSION $fs/usr/share $fs/etc 
    2.39 +	i=$src
    2.40 +	mkdir -p $fs/usr/lib/$PACKAGE-$VERSION/defaults/profile/chrome $fs/usr/share $fs/etc 
    2.41  	cp -a $_pkg/usr/bin $fs/usr
    2.42  	cp -a $_pkg/usr/lib/$PACKAGE-$VERSION $fs/usr/lib
    2.43  
    2.44  	# Home page, bookmarks file and branding.
    2.45 -	cp -a stuff/browserconfig.properties $fs/usr/lib/$PACKAGE-$VERSION
    2.46 -	cp -a stuff/bookmarks.html \
    2.47 +	cp -a $stuff/browserconfig.properties $fs/usr/lib/$PACKAGE-$VERSION
    2.48 +	cp -a $stuff/bookmarks.html \
    2.49  		$fs/usr/lib/$PACKAGE-$VERSION/defaults/profile
    2.50 -	cp -a stuff/firefox-branding.js \
    2.51 -		$fs/usr/lib/$PACKAGE-$VERSION/defaults/pref/
    2.52 +	cp -a $stuff/firefox-branding.js \
    2.53 +		$fs/usr/lib/$PACKAGE-$VERSION/defaults/pref/firefox.js
    2.54  
    2.55  	# User preference.
    2.56 -	cp -a stuff/prefs.js $fs/usr/lib/$PACKAGE-$VERSION/defaults/profile
    2.57 -	cp -a stuff/userChrome.css \
    2.58 +	cp -a $stuff/prefs.js $fs/usr/lib/$PACKAGE-$VERSION/defaults/profile
    2.59 +	cp -a $stuff/userChrome.css \
    2.60  		$fs/usr/lib/$PACKAGE-$VERSION/defaults/profile/chrome
    2.61  
    2.62  	# Move default config to /etc/firefox (/usr maybe read-only)
    2.63  	for i in defaults browserconfig.properties ; do
    2.64  		mv -f $fs/usr/lib/$PACKAGE-$VERSION/$i $fs/etc/$PACKAGE
    2.65  	done
    2.66 +
    2.67 +
    2.68  	ln -s /etc/$PACKAGE/browserconfig.properties $fs/usr/lib/$PACKAGE-$VERSION
    2.69  	ln -s /etc/$PACKAGE $fs/usr/lib/$PACKAGE-$VERSION/defaults
    2.70  
    2.71 @@ -71,7 +71,7 @@
    2.72  	#	$fs/usr/lib/$PACKAGE-$VERSION/extensions/langpack*/install.rdf
    2.73  
    2.74  	# Search Plugin (by: oddball)
    2.75 -	cp -a stuff/searchplugins $fs/usr/lib/firefox-$VERSION/
    2.76 +	cp -a $stuff/searchplugins $fs/usr/lib/firefox-$VERSION/
    2.77  	chown -R root.root $fs
    2.78  
    2.79  	# Remove unnecessary files.
    2.80 @@ -80,8 +80,7 @@
    2.81  	# split firefox libs
    2.82  	rm -rf $fs/usr/lib/$PACKAGE-$VERSION/*.so
    2.83  	#retain big firefox libs
    2.84 -	cp 	$_pkg/usr/lib/$PACKAGE-$VERSION/libxul.so \
    2.85 -		$_pkg/usr/lib/$PACKAGE-$VERSION/libmozjs.so \
    2.86 +	cp $_pkg/usr/lib/$PACKAGE-$VERSION/libxul.so \
    2.87  		$fs/usr/lib/$PACKAGE-$VERSION
    2.88  	
    2.89  }
     3.1 --- a/firefox/stuff/firefox.mozconfig	Fri Mar 25 22:16:27 2011 +0000
     3.2 +++ b/firefox/stuff/firefox.mozconfig	Fri Mar 25 22:56:16 2011 +0000
     3.3 @@ -18,9 +18,11 @@
     3.4  ac_add_options --enable-optimize
     3.5  ac_add_options --enable-system-cairo
     3.6  ac_add_options --enable-jsd
     3.7 +ac-add_options --enable-shared-js
     3.8  #ac_add_options --enable-svg
     3.9  #ac_add_options --enable-svg-renderer=cairo
    3.10  #ac_add_options --enable-postscript
    3.11 +ac_add_options --enable-official-branding
    3.12  
    3.13  ac_add_options --disable-toolkit-qt
    3.14  ac_add_options --disable-xinerama
    3.15 @@ -36,6 +38,7 @@
    3.16  ac_add_options --disable-accessibility
    3.17  ac_add_options --disable-installer
    3.18  ac_add_options --disable-updater
    3.19 +ac_add_options --disable-gconf
    3.20  #ac_add_options --disable-printing
    3.21  #ac_add_options --disable-xprint
    3.22  #ac_add_options --disable-jsd
     4.1 --- a/libfirefox/receipt	Fri Mar 25 22:16:27 2011 +0000
     4.2 +++ b/libfirefox/receipt	Fri Mar 25 22:56:16 2011 +0000
     4.3 @@ -1,7 +1,7 @@
     4.4  # SliTaz package receipt.
     4.5  
     4.6  PACKAGE="libfirefox"
     4.7 -VERSION="3.6.15"
     4.8 +VERSION="4.0"
     4.9  CATEGORY="network"
    4.10  SHORT_DESC="firefox lib files"
    4.11  MAINTAINER="jozee@slitaz.org"
    4.12 @@ -18,7 +18,6 @@
    4.13  	
    4.14  	# remove some firefox libs (in firefox receipts)
    4.15  	rm -rf $fs/usr/lib/firefox-$VERSION/libxul.so
    4.16 -	rm -rf $fs/usr/lib/firefox-$VERSION/libmozjs.so
    4.17  	
    4.18  	# Remove unnecessary files (copied from firefox receipt)
    4.19  	rm -rf $fs/usr/lib/firefox-$VERSION/libsqlite3.so