testing/chromium: multiple changes/fixes

add desktop support with icons
switch to chromium-launcher.sh take from gentoo
chromium-launcher.sh will read /etc/chromium
disable sanboxing from /etc/chromium (doesnt currently work)
add widevine support (netflix)
really disable hotwording
added some additional patches from gentoo

1 files changed, 67 insertions, 15 deletions

diff --git a/testing/chromium/APKBUILD b/testing/chromium/APKBUILD
index 9bb12af6b0..e0282bb159 100644
--- a/testing/chromium/APKBUILD
+++ b/testing/chromium/APKBUILD
@@ -2,12 +2,12 @@
 # Maintainer:
 pkgname=chromium
 pkgver=43.0.2357.130
-pkgrel=2
+pkgrel=3
 pkgdesc="chromium web browser"
 url="http://www.chromium.org/"
 arch="x86_64"
 license="BSD"
-depends=
+depends="bash"
 depends_dev="alsa-lib-dev libevent-dev libpng-dev jpeg-dev cairo-dev cups-dev 
 	mesa-dev libcap-dev dbus-glib-dev gtk+-dev libxml2-dev freetype-dev
 	jpeg-dev libxslt-dev libxtst-dev icu-dev flac-dev speex-dev 
@@ -17,18 +17,26 @@ depends_dev="alsa-lib-dev libevent-dev libpng-dev jpeg-dev cairo-dev cups-dev
 	libxrandr-dev libxscrnsaver-dev pciutils-dev udev-dev libexif-dev 
 	hwdata-usb ninja libbsd-dev harfbuzz-dev snappy-dev
 	bsd-compat-headers openssl-dev libre2-dev jsoncpp-dev minizip-dev"
-# disabled deps libusb-dev libgnome-keyring-dev
 makedepends="$depends_dev xdg-utils yasm gperf bison flex perl python bash paxmark findutils"
 install=""
 options=suid
 subpackages="$pkgname-doc"
 source="https://commondatastorage.googleapis.com/chromium-browser-official/$pkgname-$pkgver.tar.xz
+	chromium-launcher.sh
+	chromium.default
+	chromium.desktop
+
 	gcc5-fixes.patch
 	musl-fixes.patch
 	no-execinfo.patch
 	resolver.patch
 	no-mallinfo.patch
 	no-getcontext.patch
+
+	chromium-hotwording-2403.patch
+	chromium-system-libvpx-r0.patch
+	chromium-system-jinja-r7.patch
+	chromium-widevine.patch
 	"
 
 ##############################################################
@@ -144,10 +152,16 @@ build() {
 
 package() {
 	cd "$_builddir"
-	for bin in chrome chromedriver libffmpegsumo.so natives_blob.bin snapshot_blob.bin; do
+	for bin in chrome chromedriver libffmpegsumo.so natives_blob.bin \
+		snapshot_blob.bin; do
+
 		install -Dm755 out/Release/$bin \
 	 		"$pkgdir"/usr/lib/$pkgname/$bin || return 1
 	done
+
+	#TODO do we really need bash for this simple script?
+	install -Dm755 "$srcdir"/chromium-launcher.sh \
+		"$pkgdir"/usr/lib/$pkgname/chromium-launcher.sh || return 1
 	
 	install -Dm755 chrome/tools/build/linux/chrome-wrapper \
 		"$pkgdir"/usr/lib/$pkgname/chrome-wrapper || return 1
@@ -155,44 +169,82 @@ package() {
 	install -Dm4755 out/Release/chrome_sandbox \
 		"$pkgdir"/usr/lib/$pkgname/chrome_sandbox || return 1
 	
-	install -m644 out/Release/chrome_100_percent.pak \
+	install -Dm644 out/Release/chrome_100_percent.pak \
 		"$pkgdir"/usr/lib/$pkgname/chrome_100_percent.pak || return 1
 	
-	install -m644 out/Release/resources.pak \
+	install -Dm644 out/Release/resources.pak \
 		"$pkgdir"/usr/lib/$pkgname/resources.pak || return 1
 	
 	cp -r out/Release/locales "$pkgdir"/usr/lib/$pkgname/ || return 1
 
         install -Dm644 out/Release/chrome.1 \
-                "$pkgdir"/usr/share/man/man1/chrome.1 || return 1
+                "$pkgdir"/usr/share/man/man1/chromium.1 || return 1
 	
-	#create symlins in usr/bin
+	# It is important that we name the target "chromium-browser",
+	# xdg-utils expect it; bug #355517.
 	mkdir -p "$pkgdir"/usr/bin || return 1
 	cd "$pkgdir"/usr/bin || return 1
-	ln -sf /usr/lib/$pkgname/chrome chrome || return 1
-	ln -sf /usr/lib/$pkgname/chrome chrome-browser || return 1
-	ln -sf /usr/lib/$pkgname/chrome-wrapper chromium || return 1
-	ln -sf /usr/lib/$pkgname/chrome-wrapper chromium-browser || return 1
+	ln -sf /usr/lib/$pkgname/chromium-launcher.sh \
+		chromium-browser || return 1
+	ln -sf /usr/lib/$pkgname/chromedriver || return 1
+	cd "$_builddir"
+
+	install -Dm644 "$srcdir"/chromium.default \
+		"$pkgdir"/etc/chromium/chromium.default || return 1
+
+	install -Dm644 "$srcdir"/chromium.desktop \
+		"$pkgdir"/usr/share/applications/chromium.desktop
+
+	for size in 22 24 48 64 128 256; do
+		install -Dm644 "chrome/app/theme/chromium/product_logo_$size.png" \
+			"$pkgdir/usr/share/icons/hicolor/${size}x${size}/apps/chromium.png"
+	done
+
+	for size in 16 32; do
+		install -Dm644 "chrome/app/theme/default_100_percent/chromium/product_logo_$size.png" \
+			"$pkgdir/usr/share/icons/hicolor/${size}x${size}/apps/chromium.png"
+	done
 }
 
 md5sums="352e936a3fef5e6de87c9a911eb75d94  chromium-43.0.2357.130.tar.xz
+cdd5fd06a4138a7b6bc954f532193817  chromium-launcher.sh
+ecea1c003138f189f491cb06f267cc11  chromium.default
+2962ac6259e39a797d441daf43aa49c9  chromium.desktop
 96277e7ddc26c8bdd50fb63eff2f4ce0  gcc5-fixes.patch
 1b6076a7fac1d056fd6064f5b1b98320  musl-fixes.patch
 00ae59dd9d09c60a116fd0133f9f3a60  no-execinfo.patch
 af047840f31e99aa36be04edc3482afd  resolver.patch
 a11a60155a9faf6ca648aaa06c81f29e  no-mallinfo.patch
-2c8de771a7c0e5e0e9fc68fa978785f7  no-getcontext.patch"
+2c8de771a7c0e5e0e9fc68fa978785f7  no-getcontext.patch
+2b7291195c467f8135473e543c1c7dad  chromium-hotwording-2403.patch
+9a73cf075dc321dfe781f5bed4920d6c  chromium-system-libvpx-r0.patch
+97b1578585ab600ed9adef4f341ccd80  chromium-system-jinja-r7.patch
+de717d6430532f34fe161035dfdafcdf  chromium-widevine.patch"
 sha256sums="62fb55439396a5d49ba53d4377e8d2554c14c2e8a6255f07909ccee8f248002e  chromium-43.0.2357.130.tar.xz
+9bceb14a6c171754b77bcc7e6095285fcb58a9ca10e2e4a9c9e13dc561fc0c01  chromium-launcher.sh
+1d5f198b3fe347dd03e2a44335ce354aee0e4d3f82dcd039db785368c4c5e698  chromium.default
+3ae90cea7503d0039de53448ed112b9bc0cb5a09f6b0045506eb777fc23517e5  chromium.desktop
 ee32d8a89cc51cb71a8d4aa82b196b145f43a2fc3ba9687f9c06c053601d5fe7  gcc5-fixes.patch
 ac38e2d1238b7062ee8c99ff7772477fa2d5328a750eab47553687e3782dc7a9  musl-fixes.patch
 505a55c28e971e067f189e3a1ce697d711cec82a765d81f78eb49ec1f6df56cf  no-execinfo.patch
 f16c63d4188fe56732dc6760307795ba4059452c4cf3de1460cbcb2616011511  resolver.patch
 3e732ba5bbe324932a06a782bae655003089f5dc52a7bb2b790aa4837e20be8e  no-mallinfo.patch
-ea79f9a46116c8b56bbc69d226abd9252e4ae4d946ca695203f2298279cc2211  no-getcontext.patch"
+ea79f9a46116c8b56bbc69d226abd9252e4ae4d946ca695203f2298279cc2211  no-getcontext.patch
+7d20f05bbd2b9ba363b28ed591cd0c770b4d7365a7ca9d20b5f6a268f6af2122  chromium-hotwording-2403.patch
+06b26f3459e2f60866eb28803f129c59e064b082eae76126de60463706739f8c  chromium-system-libvpx-r0.patch
+872f5a38d8263b14308bb117828496a4093d0e6ad755d39d2c5e6857314fe071  chromium-system-jinja-r7.patch
+1d1ead77250475228524770e57c17282aff9098c5efc3d7719b0df76229b8874  chromium-widevine.patch"
 sha512sums="b12479ee18c05a1f34f7efeb50d0255e134441ee18923310bbe4cd87b60eb51ce8ea9831350545b88dd803367f84cb5e335f3655707718bbfed09e2d55751f9d  chromium-43.0.2357.130.tar.xz
+f1909314ae74985c85740d26c9bfab694f3202de8ccc392a1c4ec5c8760db21b6cc46146c78a9abebd09e6d24f37e19466f0c4d2d61815400b48d859f8ce154d  chromium-launcher.sh
+272886bfc9e03ca625701f47178c0aa54a037993a01aa961f08750a44c02a2007a0433fa92e218b0aea27ca0d43321660619a54ddca316d422fdf146e3dc6785  chromium.default
+e182c998a43d22d1c76a86c561619afd1fca8c2be668265ad5e2f81a3806f7a154272cc027a2f8b370fb69446892c69e5967a4be76082325c14245ee7915234c  chromium.desktop
 e2390cdeb2a75aad51d5da07819e1375fcf2092535eaa86545b9bc0160eff9e3981f946029ed8fc337df4c56a8b8cc7945821d2636b09e320dea2c8884022a59  gcc5-fixes.patch
 febb6a204bcffda8dc3d80e75563710745e383cb30e460db5d8c5ded3d40f8a872461719283260f573be378e085924ddf3af000b0a50b519fafd9f6fc392920e  musl-fixes.patch
 4f756d3e404033f7a36b38266176b7302f7e2a2e78c9f8b8d362a53a3dbdc675cdaa581393a70c23a29135b34566cf4109513cb13a289dc111bbce65ec065ebd  no-execinfo.patch
 987f18d37824676e5d874a6fde1099bcc558920e7781de5f34e612411013e4fac9ca421a3cce1ed5f82401c4d54212b6f47a0a856892a78543b8e400a4bb0489  resolver.patch
 511a3852d6172c14c651c316f1f874cfd23be0fde1c4285565dfead02e5865a1b240c40e270c940a23c55e2d3f2cfecbf3b5477bf9e6d3cf920d7c60331dc3c3  no-mallinfo.patch
-42d9a6ebea2d95cdc169b921cc1a1b846cf500997059fd3084de09e21f00b63b76e60c6124f4af247d402ff5ca3f4bf8867a6f2c78198c05b4273ca01fb29241  no-getcontext.patch"
+42d9a6ebea2d95cdc169b921cc1a1b846cf500997059fd3084de09e21f00b63b76e60c6124f4af247d402ff5ca3f4bf8867a6f2c78198c05b4273ca01fb29241  no-getcontext.patch
+38dcbae0d9bc63c044d50bd395692007642af705e1bbb9b704f3f349a48e45ca2b7f8495dbafbb4333b8bdb84ac53e5611eba4fe3d4fc7e841b319b4d744c324  chromium-hotwording-2403.patch
+fe5801b63e7cb58c4653e6f4542de070cb5bf88e0d99fdd0bb7b45ba928be065ebda41fb1f5fa32f4a55d321b8765df53a977bf2d1418b030846a9e2b2fd1c1d  chromium-system-libvpx-r0.patch
+10bcc6a467b6766d13b5e41e7b7dcdbd62de7c04daad16c83037e88043032a0c118627029f91ef8a2a57faaaebc8b6f4ee16e8d1fecb5921d0d49efd60a27863  chromium-system-jinja-r7.patch
+4a11b46afa8ce84bd23a8c506301b5848ee4291a764f3aed282b8a98706ece16cf9346dec6cc71b1e17812b15f43a5cbc7bc6d38ed4dcc88c12d6fcb03bd9295  chromium-widevine.patch"