From 6d6e2f4e70a178b0121967a044237c32236a5a52 Mon Sep 17 00:00:00 2001 From: human Date: Tue, 30 Jul 2019 16:51:13 +0300 Subject: [PATCH] adobe-flash-plugin: add adobe-flash-plugin-ppapi subpackage --- srcpkgs/adobe-flash-plugin-ppapi | 1 + .../files/flash-plugin-ppapi.sh | 1 + srcpkgs/adobe-flash-plugin/template | 35 ++++++++++++++----- 3 files changed, 29 insertions(+), 8 deletions(-) create mode 120000 srcpkgs/adobe-flash-plugin-ppapi create mode 100644 srcpkgs/adobe-flash-plugin/files/flash-plugin-ppapi.sh diff --git a/srcpkgs/adobe-flash-plugin-ppapi b/srcpkgs/adobe-flash-plugin-ppapi new file mode 120000 index 00000000000..b1ab0e7015b --- /dev/null +++ b/srcpkgs/adobe-flash-plugin-ppapi @@ -0,0 +1 @@ +adobe-flash-plugin \ No newline at end of file diff --git a/srcpkgs/adobe-flash-plugin/files/flash-plugin-ppapi.sh b/srcpkgs/adobe-flash-plugin/files/flash-plugin-ppapi.sh new file mode 100644 index 00000000000..e4a2566dc31 --- /dev/null +++ b/srcpkgs/adobe-flash-plugin/files/flash-plugin-ppapi.sh @@ -0,0 +1 @@ +export CHROME_FLAGS="${CHROME_FLAGS}${CHROME_FLAGS:+ }--ppapi-flash-path=/usr/lib/chromium/PepperFlash/libpepflashplayer.so --ppapi-flash-version=@VERSION@" diff --git a/srcpkgs/adobe-flash-plugin/template b/srcpkgs/adobe-flash-plugin/template index fa40e434d6a..ee2abbec9b8 100644 --- a/srcpkgs/adobe-flash-plugin/template +++ b/srcpkgs/adobe-flash-plugin/template @@ -1,7 +1,7 @@ # Template file for 'adobe-flash-plugin' pkgname=adobe-flash-plugin version=32.0.0.223 -revision=1 +revision=2 depends="curl hicolor-icon-theme desktop-file-utils" short_desc="Adobe Flash Player plugin for Netscape compatible browsers" maintainer="Juan RP " @@ -19,14 +19,22 @@ _eula="https://www.adobe.com/content/dam/Adobe/en/legal/licenses-terms/pdf/Platf _eulacksum=5a0a95eb4082b6db7182188ce119f3829184b238b0a91293322c2a51a2b41fc1 _url=https://fpdownload.adobe.com/get/flashplayer/pdc/${version} if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then - _disttarball="${_url}/flash_player_npapi_linux.x86_64.tar.gz" - _distcksum=9fed6437ac8903f0b289e84193c39bfca8ada2467c93acc50ee8de77517a0b1e + distfiles=" + ${_url}/flash_player_npapi_linux.x86_64.tar.gz + ${_url}/flash_player_ppapi_linux.x86_64.tar.gz" + checksum=" + 9fed6437ac8903f0b289e84193c39bfca8ada2467c93acc50ee8de77517a0b1e + ac55b89d78bd42d49c86fa2a650ea206047d208d41451351e4d60e2a09cfc2b0" else - _disttarball="${_url}/flash_player_npapi_linux.i386.tar.gz" - _distcksum=c206abb44d2940907c3a93475fa614b8a1b8fb127fbd215b66e36d5eedaf56fc + distfiles=" + ${_url}/flash_player_npapi_linux.i386.tar.gz + ${_url}/flash_player_ppapi_linux.i386.tar.gz" + checksum=" + c206abb44d2940907c3a93475fa614b8a1b8fb127fbd215b66e36d5eedaf56fc + bc7417b8e61091691e694e22dfc44c646e0014040f4a7600defabcc89e3980c8" fi -distfiles="${_eula} ${_disttarball}" -checksum="${_eulacksum} ${_distcksum}" +distfiles+=" ${_eula}" +checksum+=" ${_eulacksum}" skip_extraction="${_eula##*/}" do_install() { @@ -41,5 +49,16 @@ do_install() { usr/share/applications vinstall usr/share/kde4/services/kcm_adobe_flash_player.desktop 644 \ usr/share/kde4/services - vlicense "${XBPS_SRCDISTDIR}/${pkgname}-${version}/$(basename ${_eula})" LICENSE.pdf + vlicense "${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_eula##*/}" LICENSE.pdf +} + +adobe-flash-plugin-ppapi_package() { + short_desc="Adobe Flash Player plugin for Chromium-based browsers" + pkg_install() { + vinstall libpepflashplayer.so 755 usr/lib/chromium/PepperFlash + vinstall manifest.json 644 usr/lib/chromium/PepperFlash + vinstall ${FILESDIR}/flash-plugin-ppapi.sh 644 etc/profile.d + vsed -e "s/@VERSION@/${version}/g" -i ${PKGDESTDIR}/etc/profile.d/flash-plugin-ppapi.sh + vlicense "${XBPS_SRCDISTDIR}/${sourcepkg}-${version}/${_eula##*/}" LICENSE.pdf + } }