wok-next diff firefox/receipt @ rev 21020

Cleaning is almost finished... I should proceed to upgrades.
author Aleksej Bobylev <al.bobylev@gmail.com>
date Fri Nov 02 14:15:08 2018 +0200 (2018-11-02)
parents f48456621a9d
children 5669e8b3be70
line diff
     1.1 --- a/firefox/receipt	Tue Oct 16 16:46:05 2018 +0300
     1.2 +++ b/firefox/receipt	Fri Nov 02 14:15:08 2018 +0200
     1.3 @@ -3,23 +3,20 @@
     1.4  PACKAGE="firefox"
     1.5  VERSION="17.0.11esr"
     1.6  CATEGORY="network"
     1.7 -SHORT_DESC="User friendly, secure and fast web browser."
     1.8 -MAINTAINER="pankso@slitaz.org"
     1.9 +SHORT_DESC="User friendly, secure and fast web browser"
    1.10 +MAINTAINER="devel@slitaz.org"
    1.11  LICENSE="MPL2"
    1.12 +WEB_SITE="https://www.mozilla.org/en-US/firefox/"
    1.13 +
    1.14  TARBALL="$PACKAGE-$VERSION.source.tar.bz2"
    1.15 -WEB_SITE="http://www.mozilla.org/firefox"
    1.16  WGET_URL="ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$VERSION/source/$TARBALL"
    1.17 -TAGS="web-browser"
    1.18  
    1.19 -DEPENDS="gtk2 sqlite3 dbus dbus-glib glib jpeg xorg-libX11 xorg-libXdamage \
    1.20 -alsa-lib xorg-libXt libevent libvpx pango nss libfirefox"
    1.21  BUILD_DEPENDS="zip libidl coreutils findutils wireless_tools-dev \
    1.22  perl python yasm alsa-lib-dev mesa-dev libevent-dev libvpx-dev dbus-dev \
    1.23 -dbus-glib-dev gtk2-dev glib-dev pango-dev nss-dev sqlite3-dev tar gzip"
    1.24 -SPLIT="firefox firefox-dev libfirefox"
    1.25 +dbus-glib-dev gtk2-dev glib-dev pango-dev nss-dev sqlite3-dev tar gzip \
    1.26 +libjpeg-turbo-dev"
    1.27 +SPLIT="$PACKAGE-dev libfirefox"
    1.28  
    1.29 -# Rules to configure and make the package.
    1.30 -#
    1.31  # A long compile time... dont forget to build libidl before and check the
    1.32  # .mozconfig file from the stuff and the stuff/README document.
    1.33  #
    1.34 @@ -27,8 +24,7 @@
    1.35  # build time.
    1.36  # At least 2.5 GB free disk space
    1.37  
    1.38 -compile_rules()
    1.39 -{
    1.40 +compile_rules() {
    1.41  	# load mozconfig
    1.42  	cp -a $stuff/mozconfig $src
    1.43  
    1.44 @@ -46,7 +42,7 @@
    1.45  	fn2="$tarpath/firefox-${VERSION%esr}.en-US.linux-$(uname -m).tar.bz2"
    1.46  	[ -e "$fn1" ] && tarball="$fn1" && echo "$ARCH tarball found"
    1.47  	[ -e "$fn2" ] && tarball="$fn2" && echo "$(uname -m) tarball found"
    1.48 -	[ -z "$tarball" ] && echo "ERROR: tarball not found" && exit 1
    1.49 +	[ -z "$tarball" ] && echo "ERROR: tarball not found" && return 1
    1.50  	# extract tarball
    1.51  	mkdir -p $install/usr/lib/firefox-$VERSION &&
    1.52  	tar -xvf $tarball -C $install/usr/lib/firefox-$VERSION \
    1.53 @@ -61,138 +57,135 @@
    1.54  	ln -sf ../mozilla/plugins $install/usr/lib/firefox-$VERSION
    1.55  }
    1.56  
    1.57 -# Rules to gen a SliTaz package suitable for Tazpkg.
    1.58 -genpkg_rules()
    1.59 -{
    1.60 +genpkg_rules() {
    1.61  	case $PACKAGE in
    1.62 -	firefox)
    1.63 -		# program
    1.64 -		mkdir -p $fs/usr/lib &&
    1.65 -		cp -a $install/usr/lib/$PACKAGE-$VERSION $fs/usr/lib &&
    1.66 -		cp -a $install/usr/lib/mozilla $fs/usr/lib &&
    1.67 -		cp -a $install/usr/bin $fs/usr
    1.68 +		firefox)
    1.69 +			# program
    1.70 +			mkdir -p $fs/usr/lib &&
    1.71 +			cp -a $install/usr/lib/$PACKAGE-$VERSION $fs/usr/lib &&
    1.72 +			cp -a $install/usr/lib/mozilla $fs/usr/lib &&
    1.73 +			cp -a $install/usr/bin $fs/usr
    1.74  
    1.75 -		# search Plugin (by: oddball)
    1.76 -		cp -a $stuff/searchplugins $fs/usr/lib/$PACKAGE-$VERSION
    1.77 +			# search Plugin (by: oddball)
    1.78 +			cp -a $stuff/searchplugins $fs/usr/lib/$PACKAGE-$VERSION
    1.79  
    1.80 -		# prefs
    1.81 -		mkdir -p $fs/usr/lib/$PACKAGE-$VERSION/distribution &&
    1.82 -		cp -a $stuff/distribution.ini $fs/usr/lib/$PACKAGE-$VERSION/distribution
    1.83 +			# prefs
    1.84 +			mkdir -p $fs/usr/lib/$PACKAGE-$VERSION/distribution &&
    1.85 +			cp -a $stuff/distribution.ini $fs/usr/lib/$PACKAGE-$VERSION/distribution
    1.86  
    1.87 -		# mozilla-common files
    1.88 -		# dictionaries
    1.89 -		rm -rf $fs/usr/lib/$PACKAGE-$VERSION/dictionaries &&
    1.90 -		ln -sf ../mozilla-common-$VERSION/dictionaries \
    1.91 -			$fs/usr/lib/$PACKAGE-$VERSION/dictionaries
    1.92 -		# plugin-container
    1.93 -		rm -f $fs/usr/lib/$PACKAGE-$VERSION/plugin-container &&
    1.94 -		ln -sf ../mozilla-common-$VERSION/plugin-container \
    1.95 -			$fs/usr/lib/$PACKAGE-$VERSION/plugin-container
    1.96 -		# mozilla-xremote-client
    1.97 -		rm -f $fs/usr/lib/$PACKAGE-$VERSION/mozilla-xremote-client &&
    1.98 -		ln -sf ../mozilla-common-$VERSION/mozilla-xremote-client \
    1.99 -			$fs/usr/lib/$PACKAGE-$VERSION/mozilla-xremote-client
   1.100 -		# components/libdbusservice.so
   1.101 -		# components/libmozgnome.so
   1.102 -		for file in libdbusservice.so libmozgnome.so; do
   1.103 -			rm -f $fs/usr/lib/$PACKAGE-$VERSION/components/$file &&
   1.104 -			ln -sf ../../mozilla-common-$VERSION/components/$file \
   1.105 -				$fs/usr/lib/$PACKAGE-$VERSION/components/$file
   1.106 -		done
   1.107 -		# chrome.manifest
   1.108 -		rm -f $fs/usr/lib/$PACKAGE-$VERSION/chrome.manifest &&
   1.109 -		ln -sf ../mozilla-common-$VERSION/chrome.manifest \
   1.110 -			$fs/usr/lib/$PACKAGE-$VERSION/chrome.manifest
   1.111 +			# mozilla-common files
   1.112 +			# dictionaries
   1.113 +			rm -rf $fs/usr/lib/$PACKAGE-$VERSION/dictionaries &&
   1.114 +			ln -sf ../mozilla-common-$VERSION/dictionaries \
   1.115 +				$fs/usr/lib/$PACKAGE-$VERSION/dictionaries
   1.116 +			# plugin-container
   1.117 +			rm -f $fs/usr/lib/$PACKAGE-$VERSION/plugin-container &&
   1.118 +			ln -sf ../mozilla-common-$VERSION/plugin-container \
   1.119 +				$fs/usr/lib/$PACKAGE-$VERSION/plugin-container
   1.120 +			# mozilla-xremote-client
   1.121 +			rm -f $fs/usr/lib/$PACKAGE-$VERSION/mozilla-xremote-client &&
   1.122 +			ln -sf ../mozilla-common-$VERSION/mozilla-xremote-client \
   1.123 +				$fs/usr/lib/$PACKAGE-$VERSION/mozilla-xremote-client
   1.124 +			# components/libdbusservice.so
   1.125 +			# components/libmozgnome.so
   1.126 +			for file in libdbusservice.so libmozgnome.so; do
   1.127 +				rm -f $fs/usr/lib/$PACKAGE-$VERSION/components/$file &&
   1.128 +				ln -sf ../../mozilla-common-$VERSION/components/$file \
   1.129 +					$fs/usr/lib/$PACKAGE-$VERSION/components/$file
   1.130 +			done
   1.131 +			# chrome.manifest
   1.132 +			rm -f $fs/usr/lib/$PACKAGE-$VERSION/chrome.manifest &&
   1.133 +			ln -sf ../mozilla-common-$VERSION/chrome.manifest \
   1.134 +				$fs/usr/lib/$PACKAGE-$VERSION/chrome.manifest
   1.135  
   1.136 -		# run-mozilla.sh
   1.137 -		rm -f $fs/usr/lib/$PACKAGE-$VERSION/run-mozilla.sh &&
   1.138 -		ln -sf ../mozilla-common-$VERSION/run-mozilla.sh \
   1.139 -			$fs/usr/lib/$PACKAGE-$VERSION/run-mozilla.sh
   1.140 +			# run-mozilla.sh
   1.141 +			rm -f $fs/usr/lib/$PACKAGE-$VERSION/run-mozilla.sh &&
   1.142 +			ln -sf ../mozilla-common-$VERSION/run-mozilla.sh \
   1.143 +				$fs/usr/lib/$PACKAGE-$VERSION/run-mozilla.sh
   1.144  
   1.145 -		# libmozalloc.so
   1.146 -		rm -f $fs/usr/lib/$PACKAGE-$VERSION/libmozalloc.so &&
   1.147 -		ln -sf ../mozilla-common-$VERSION/libmozalloc.so \
   1.148 -			$fs/usr/lib/$PACKAGE-$VERSION/libmozalloc.so
   1.149 +			# libmozalloc.so
   1.150 +			rm -f $fs/usr/lib/$PACKAGE-$VERSION/libmozalloc.so &&
   1.151 +			ln -sf ../mozilla-common-$VERSION/libmozalloc.so \
   1.152 +				$fs/usr/lib/$PACKAGE-$VERSION/libmozalloc.so
   1.153  
   1.154 -		chown -R root.root $fs
   1.155 -		;;
   1.156 -	firefox-dev)
   1.157 -		CAT="development|firefox devel files"
   1.158 -		DEPENDS="alsa-lib sqlite3 cairo dbus-glib pango atk \
   1.159 -			glib xorg-libXt xorg-libXinerama \
   1.160 -			xorg-libXcursor xorg-libXcomposite xorg-libXext \
   1.161 +			chown -R root.root $fs
   1.162 +			DEPENDS="gtk2 sqlite3 dbus dbus-glib glib jpeg xorg-libX11 \
   1.163 +			xorg-libXdamage alsa-lib xorg-libXt libevent libvpx pango nss \
   1.164 +			libfirefox"
   1.165 +			TAGS="web-browser"
   1.166 +			;;
   1.167 +		*-dev)
   1.168 +			DEPENDS="alsa-lib sqlite3 cairo dbus-glib pango atk glib xorg-libXt \
   1.169 +			xorg-libXinerama xorg-libXcursor xorg-libXcomposite xorg-libXext \
   1.170  			xorg-libXdamage xorg-libxcb xorg-libSM xorg-libICE"
   1.171 -		mkdir -p $fs/usr/include/$WANTED-$VERSION &&
   1.172 -		cp -rL $src/obj-firefox/dist/include/* $fs/usr/include/$WANTED-$VERSION
   1.173 +			mkdir -p $fs/usr/include/$WANTED-$VERSION
   1.174 +			cp -rL $src/obj-firefox/dist/include/* $fs/usr/include/$WANTED-$VERSION
   1.175  
   1.176 -		mkdir -p $fs/usr/lib/$WANTED-devel/sdk/bin/ply &&
   1.177 -		cp -rL $src/obj-firefox/dist/sdk/bin/*.py \
   1.178 -			$fs/usr/lib/$WANTED-devel/sdk/bin &&
   1.179 -		cp -rL $src/obj-firefox/dist/sdk/bin/ply/*.py \
   1.180 -			$fs/usr/lib/$WANTED-devel/sdk/bin/ply &&
   1.181 -		mkdir -p $fs/usr/lib/$WANTED-devel/sdk/lib &&
   1.182 -		cp -rL $src/obj-firefox/dist/sdk/lib/* \
   1.183 -			$fs/usr/lib/$WANTED-devel/sdk/lib
   1.184 +			mkdir -p $fs/usr/lib/$WANTED-devel/sdk/bin/ply
   1.185 +			cp -rL $src/obj-firefox/dist/sdk/bin/*.py \
   1.186 +				$fs/usr/lib/$WANTED-devel/sdk/bin
   1.187 +			cp -rL $src/obj-firefox/dist/sdk/bin/ply/*.py \
   1.188 +				$fs/usr/lib/$WANTED-devel/sdk/bin/ply
   1.189 +			mkdir -p $fs/usr/lib/$WANTED-devel/sdk/lib
   1.190 +			cp -rL $src/obj-firefox/dist/sdk/lib/* \
   1.191 +				$fs/usr/lib/$WANTED-devel/sdk/lib
   1.192  
   1.193 -#		mkdir -v $fs/usr/include/$WANTED-$VERSION/npapi &&
   1.194 -#		cp -a $src/dom/plugins/base/*.h $fs/usr/include/$WANTED-$VERSION/npapi
   1.195 +			# mkdir -v $fs/usr/include/$WANTED-$VERSION/npapi
   1.196 +			# cp -a $src/dom/plugins/base/*.h $fs/usr/include/$WANTED-$VERSION/npapi
   1.197  
   1.198 -		# /usr/share/idl folder should also be in firefox-dev
   1.199 -		mkdir -p $fs/usr/share/$WANTED-$VERSION/idl &&
   1.200 -		cp -rL $src/obj-firefox/dist/idl/* $fs/usr/share/$WANTED-$VERSION/idl
   1.201 +			# /usr/share/idl folder should also be in firefox-dev
   1.202 +			mkdir -p $fs/usr/share/$WANTED-$VERSION/idl
   1.203 +			cp -rL $src/obj-firefox/dist/idl/* $fs/usr/share/$WANTED-$VERSION/idl
   1.204  
   1.205 -		# copy missing *.pc files
   1.206 -		mkdir -p $fs/usr/lib/pkgconfig &&
   1.207 -		cp -a $stuff/*.pc $fs/usr/lib/pkgconfig &&
   1.208 -		# fix version
   1.209 -		sed -i "s/VERSION/$VERSION/" $fs/usr/lib/pkgconfig/*
   1.210 -		;;
   1.211 -	libfirefox)
   1.212 -		CAT="network|firefox/thunderbird common files"
   1.213 -		DEPENDS="gtk2 sqlite3 dbus dbus-glib glib jpeg xorg-libX11 \
   1.214 +			# copy missing *.pc files
   1.215 +			mkdir -p $fs/usr/lib/pkgconfig
   1.216 +			cp -a $stuff/*.pc $fs/usr/lib/pkgconfig
   1.217 +			# fix version
   1.218 +			sed -i "s/VERSION/$VERSION/" $fs/usr/lib/pkgconfig/*
   1.219 +			;;
   1.220 +		libfirefox)
   1.221 +			CAT="network|firefox/thunderbird common files"
   1.222 +			DEPENDS="gtk2 sqlite3 dbus dbus-glib glib jpeg xorg-libX11 \
   1.223  			xorg-libXdamage alsa-lib xorg-libXt"
   1.224 -		# dictionaries/en-US.aff
   1.225 -		# dictionaries/en-US.dic
   1.226 -		mkdir -p $fs/usr/lib/mozilla-common-$VERSION/dictionaries
   1.227 -#		cp -a $install/usr/lib/firefox-$VERSION/dictionaries \
   1.228 -#			$fs/usr/lib/mozilla-common-$VERSION
   1.229 +			# dictionaries/en-US.aff
   1.230 +			# dictionaries/en-US.dic
   1.231 +			mkdir -p $fs/usr/lib/mozilla-common-$VERSION/dictionaries
   1.232 +			# cp -a $install/usr/lib/firefox-$VERSION/dictionaries \
   1.233 +			# $fs/usr/lib/mozilla-common-$VERSION
   1.234  
   1.235 -		# plugin-container
   1.236 -		cp -a $install/usr/lib/firefox-$VERSION/plugin-container \
   1.237 -			$fs/usr/lib/mozilla-common-$VERSION
   1.238 +			# plugin-container
   1.239 +			cp -a $install/usr/lib/firefox-$VERSION/plugin-container \
   1.240 +				$fs/usr/lib/mozilla-common-$VERSION
   1.241  
   1.242 -		# mozilla-xremote-client
   1.243 -		cp -a $install/usr/lib/firefox-$VERSION/mozilla-xremote-client \
   1.244 -			$fs/usr/lib/mozilla-common-$VERSION
   1.245 +			# mozilla-xremote-client
   1.246 +			cp -a $install/usr/lib/firefox-$VERSION/mozilla-xremote-client \
   1.247 +				$fs/usr/lib/mozilla-common-$VERSION
   1.248  
   1.249 -		# components/libdbusservice.so
   1.250 -		# components/libmozgnome.so
   1.251 -		mkdir -p $fs/usr/lib/mozilla-common-$VERSION/components
   1.252 -		for file in libdbusservice.so libmozgnome.so; do
   1.253 -			cp -a $install/usr/lib/firefox-$VERSION/components/$file \
   1.254 -			$fs/usr/lib/mozilla-common-$VERSION/components
   1.255 -		done
   1.256 +			# components/libdbusservice.so
   1.257 +			# components/libmozgnome.so
   1.258 +			mkdir -p $fs/usr/lib/mozilla-common-$VERSION/components
   1.259 +			for file in libdbusservice.so libmozgnome.so; do
   1.260 +				cp -a $install/usr/lib/firefox-$VERSION/components/$file \
   1.261 +				$fs/usr/lib/mozilla-common-$VERSION/components
   1.262 +			done
   1.263  
   1.264 -		# chrome.manifest
   1.265 -		cp -a $install/usr/lib/firefox-$VERSION/chrome.manifest \
   1.266 -			$fs/usr/lib/mozilla-common-$VERSION
   1.267 +			# chrome.manifest
   1.268 +			cp -a $install/usr/lib/firefox-$VERSION/chrome.manifest \
   1.269 +				$fs/usr/lib/mozilla-common-$VERSION
   1.270  
   1.271 -		# run-mozilla.sh
   1.272 -		cp -a $install/usr/lib/firefox-$VERSION/run-mozilla.sh \
   1.273 -			$fs/usr/lib/mozilla-common-$VERSION
   1.274 +			# run-mozilla.sh
   1.275 +			cp -a $install/usr/lib/firefox-$VERSION/run-mozilla.sh \
   1.276 +				$fs/usr/lib/mozilla-common-$VERSION
   1.277  
   1.278 -		# libmozalloc.so
   1.279 -		cp -a $install/usr/lib/firefox-$VERSION/libmozalloc.so \
   1.280 -			$fs/usr/lib/mozilla-common-$VERSION
   1.281 -		;;
   1.282 +			# libmozalloc.so
   1.283 +			cp -a $install/usr/lib/firefox-$VERSION/libmozalloc.so \
   1.284 +				$fs/usr/lib/mozilla-common-$VERSION
   1.285 +			;;
   1.286  	esac
   1.287  }
   1.288  
   1.289 -# Pre and post install commands for Tazpkg.
   1.290 -post_install_firefox_dev()
   1.291 -{
   1.292 -	for i in usr/share/idl/firefox- usr/include/firefox- \
   1.293 -		usr/lib/firefox-devel- ; do
   1.294 +post_install_firefox_dev() {
   1.295 +	for i in usr/share/idl/firefox- usr/include/firefox- usr/lib/firefox-devel-; do
   1.296  		for j in $(ls -d "$1"/$i* 2>/dev/null); do
   1.297  			[ "${j##*-}" = "$VERSION" ] && continue
   1.298  			[ ! -d "$j" ] || rm -rf "$j"