wok-4.x diff firefox/receipt @ rev 11324

Up: firefox to 8.0.1. Moved /usr/lib/firefox-$VERSION to /usr/lib/firefox. Same for /usr/lib/firefox-devel-$VERSION. Its patch to work this way.
author Christopher Rogers <slaxemulator@gmail.com>
date Thu Nov 17 13:37:18 2011 +0000 (2011-11-17)
parents 3d98b947aef3
children b7319995b37e
line diff
     1.1 --- a/firefox/receipt	Wed Nov 09 18:58:18 2011 +0000
     1.2 +++ b/firefox/receipt	Thu Nov 17 13:37:18 2011 +0000
     1.3 @@ -1,20 +1,21 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="firefox"
     1.7 -VERSION="8.0"
     1.8 +VERSION="8.0.1"
     1.9  CATEGORY="network"
    1.10  SHORT_DESC="User friendly, secure and fast web browser."
    1.11  MAINTAINER="pankso@slitaz.org"
    1.12  TARBALL="$PACKAGE-$VERSION.source.tar.bz2"
    1.13  WEB_SITE="http://www.mozilla.org/"
    1.14 -WGET_URL="http://releases.mozilla.org/pub/mozilla.org/firefox/releases/$VERSION/source/$TARBALL"
    1.15 +#WGET_URL="http://releases.mozilla.org/pub/mozilla.org/firefox/releases/$VERSION/source/$TARBALL"
    1.16 +WGET_URL="ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$VERSION/source/$TARBALL"
    1.17  CONFIG_FILES="/etc/firefox"
    1.18  TAGS="browser"
    1.19  
    1.20  DEPENDS="gtk+ sqlite dbus dbus-glib glib jpeg xorg-libX11 xorg-libXdamage \
    1.21 -alsa-lib xorg-libXt libfirefox libnotify"
    1.22 -BUILD_DEPENDS="zip libIDL coreutils findutils libnotify-dev wireless_tools-dev \
    1.23 -perl python yasm alsa-lib-dev mesa-dev"
    1.24 +alsa-lib xorg-libXt libfirefox libevent libvpx"
    1.25 +BUILD_DEPENDS="zip libIDL coreutils findutils wireless_tools-dev \
    1.26 +perl python yasm alsa-lib-dev mesa-dev libevent-dev libvpx-dev dbus-dev dbus-glib-dev"
    1.27  
    1.28  # Rules to configure and make the package.
    1.29  #
    1.30 @@ -25,9 +26,18 @@
    1.31  {
    1.32  	cp -a $stuff/firefox.mozconfig $src/.mozconfig
    1.33  	cd $src
    1.34 -	sed -i 's/xtype/type/' toolkit/mozapps/installer/packager.mk
    1.35 +	patch -Np1 -i $stuff/mozilla-firefox-1.0-lang.patch
    1.36 +	patch -Np1 -i $stuff/firefox-install-dir.patch
    1.37 +
    1.38 +	# Fix PRE_RELEASE_SUFFIX
    1.39 +	sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' \
    1.40 +		browser/base/Makefile.in
    1.41 +
    1.42 +	# Don't generate startup cache. Unbreaks build
    1.43 +	sed -i 's/^GENERATE_CACHE ?=.*/GENERATE_CACHE = true/' \
    1.44 +		toolkit/mozapps/installer/packager.mk
    1.45  	./configure $CONFIGURE_ARGS &&
    1.46 -	make $MAKEFLAGS &&
    1.47 +	make -j 4 &&
    1.48  	make DESTDIR=$DESTDIR install &&
    1.49  	cp -a xpcom/typelib $DESTDIR
    1.50  }
    1.51 @@ -35,51 +45,52 @@
    1.52  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.53  genpkg_rules()
    1.54  {
    1.55 -	mkdir -p $fs/usr/lib/$PACKAGE-$VERSION/defaults/profile/chrome \
    1.56 -		$fs/usr/share $fs/etc 
    1.57 +	mkdir -p $fs/usr/lib/$PACKAGE \
    1.58 +		$fs/usr/share $fs/etc/$PACKAGE/profile/chrome
    1.59  	cp -a $_pkg/usr/bin $fs/usr
    1.60 -	cp -a $_pkg/usr/lib/$PACKAGE-$VERSION $fs/usr/lib
    1.61 +	cp -a $_pkg/usr/lib/$PACKAGE $fs/usr/lib
    1.62  
    1.63  	# Home page, bookmarks file and branding.
    1.64 -	cp -a $stuff/browserconfig.properties $fs/usr/lib/$PACKAGE-$VERSION
    1.65 +	cp -a $stuff/browserconfig.properties $fs/etc/$PACKAGE
    1.66  	cp -a $stuff/bookmarks.html \
    1.67 -		$fs/usr/lib/$PACKAGE-$VERSION/defaults/profile
    1.68 +		$fs/etc/$PACKAGE/profile
    1.69 +	mkdir -p $fs/etc/$PACKAGE/pref
    1.70  	cp -a $stuff/firefox-branding.js \
    1.71 -		$fs/usr/lib/$PACKAGE-$VERSION/defaults/pref/firefox.js
    1.72 +		$fs/etc/$PACKAGE/pref/firefox.js
    1.73  
    1.74  	# User preference.
    1.75 -	cp -a $stuff/prefs.js $fs/usr/lib/$PACKAGE-$VERSION/defaults/profile
    1.76 +	cp -a $stuff/prefs.js $fs/etc/$PACKAGE/profile
    1.77  	cp -a $stuff/userChrome.css \
    1.78 -		$fs/usr/lib/$PACKAGE-$VERSION/defaults/profile/chrome
    1.79 -
    1.80 -	# Move default config to /etc/firefox (/usr maybe read-only)
    1.81 -	for i in defaults browserconfig.properties ; do
    1.82 -		mv -f $fs/usr/lib/$PACKAGE-$VERSION/$i $fs/etc/$PACKAGE
    1.83 -	done
    1.84 +		$fs/etc/$PACKAGE/profile/chrome
    1.85  
    1.86  	# added firefox-l10n.js to stuff to make sure its copyed for langpacks
    1.87  	cp -a $stuff/firefox-l10n.js \
    1.88 -		$fs/etc/firefox/pref/firefox-l10n.js
    1.89 +		$fs/etc/$PACKAGE/pref/firefox-l10n.js
    1.90  
    1.91 -	ln -s /etc/$PACKAGE/browserconfig.properties $fs/usr/lib/$PACKAGE-$VERSION
    1.92 -	ln -s /etc/$PACKAGE $fs/usr/lib/$PACKAGE-$VERSION/defaults
    1.93 +	rm -rf $fs/usr/lib/$PACKAGE/defaults
    1.94 +
    1.95 +	ln -sf /etc/$PACKAGE/browserconfig.properties $fs/usr/lib/$PACKAGE
    1.96 +	ln -sf /etc/$PACKAGE $fs/usr/lib/$PACKAGE/defaults
    1.97  
    1.98  	# EULA is accepted by SliTaz project.
    1.99  	sed -i s:'pref("browser.EULA.3.accepted", false);':'pref("browser.EULA.3.accepted", true);': \
   1.100  		$fs/etc/firefox/pref/firefox.js
   1.101  
   1.102  	# Search Plugin (by: oddball)
   1.103 -	cp -a $stuff/searchplugins $fs/usr/lib/firefox-$VERSION/
   1.104 +	cp -a $stuff/searchplugins $fs/usr/lib/firefox/
   1.105  	chown -R root.root $fs
   1.106  
   1.107  	# Remove unnecessary files.
   1.108 -	rm -rf $fs/usr/lib/$PACKAGE-$VERSION/dictionaries/*
   1.109 -	rm -rf $fs/usr/lib/$PACKAGE-$VERSION/icons
   1.110 +	rm -rf $fs/usr/lib/$PACKAGE/dictionaries/*
   1.111 +	rm -rf $fs/usr/lib/$PACKAGE/icons
   1.112  	# split firefox libs
   1.113 -	rm -rf $fs/usr/lib/$PACKAGE-$VERSION/*.so
   1.114 +	rm -rf $fs/usr/lib/$PACKAGE/*.so
   1.115  	#retain big firefox libs
   1.116 -	cp $_pkg/usr/lib/$PACKAGE-$VERSION/libxul.so \
   1.117 -		$fs/usr/lib/$PACKAGE-$VERSION
   1.118 +	cp -a $_pkg/usr/lib/$PACKAGE/libxul.so \
   1.119 +		$fs/usr/lib/$PACKAGE
   1.120 +	#workaround for now
   1.121 +	#https://bugzilla.mozilla.org/show_bug.cgi?id=658850
   1.122 +	ln -sf firefox $fs/usr/lib/$PACKAGE/firefox-bin
   1.123  }
   1.124  
   1.125  # Pre - Post install command to set default locale.
   1.126 @@ -89,10 +100,10 @@
   1.127  	root=$1
   1.128  	# Get old plugins
   1.129  	mkdir /tmp/firefox-plugins-$$
   1.130 -	cp -a $root/usr/lib/firefox-*/plugins/* /tmp/firefox-plugins-$$ 2> /dev/null
   1.131 +	cp -a $root/usr/lib/firefox/plugins/* /tmp/firefox-plugins-$$ 2> /dev/null
   1.132  	# Remove old libs and configs
   1.133 -	rm -rf $root/usr/lib/firefox-*/plugins
   1.134 -	rm -rf $root/usr/lib/firefox-*/dictionaries
   1.135 +	rm -rf $root/usr/lib/firefox/plugins
   1.136 +	rm -rf $root/usr/lib/firefox/dictionaries
   1.137  	rm -rf $root/etc/firefox
   1.138  }
   1.139  post_install()
   1.140 @@ -105,8 +116,8 @@
   1.141  	fi
   1.142  	for i in /tmp/firefox-plugins-$$/* ; do
   1.143  		[ -e $i ] || continue
   1.144 -		[ -e /usr/lib/firefox-*/plugins/$(basename $i) ] && continue
   1.145 -		cp -a $i /usr/lib/firefox-*/plugins/
   1.146 +		[ -e /usr/lib/firefox/plugins/$(basename $i) ] && continue
   1.147 +		cp -a $i /usr/lib/firefox/plugins/
   1.148  	done
   1.149  	rm -rf /tmp/firefox-plugins-$$
   1.150  }