From 565de6758576ae9407eb382784d8e52d28894573 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 26 Oct 2015 14:19:11 +0100 Subject: [PATCH] Revert "chromium-pepper-flash: update to 19.0.0.226 (bot)" This reverts commit ce7f33936210588d5411ac7cfc338da511c20488. GOTTOX FIX YOUR BOT --- srcpkgs/chromium-pepper-flash/template | 46 +++++++++----------------- 1 file changed, 16 insertions(+), 30 deletions(-) diff --git a/srcpkgs/chromium-pepper-flash/template b/srcpkgs/chromium-pepper-flash/template index 260f59ccf5b..d5e91af7fb9 100644 --- a/srcpkgs/chromium-pepper-flash/template +++ b/srcpkgs/chromium-pepper-flash/template @@ -1,27 +1,28 @@ # Template file for 'chromium-pepper-flash' -pkgname=chromium-pepper-flash -version=19.0.0.226 -_chromeVersion=46.0.2490.80-1 +_chromeVersion=46.0.2490.80 +_chromeRevision=1 _channel='stable' _baseUrl='http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable' -revision=1 + +pkgname=chromium-pepper-flash +version=${_chromeVersion} +revision=2 short_desc="Pepper Flash plugin for Chromium" maintainer="Enno Boland " homepage="http://www.google.com/chrome" license="chrome" -lib32disabled=yes -repository=nonfree only_for_archs="i686 x86_64" depends="chromium binutils xz" +repository=nonfree create_wrksrc=yes case "${XBPS_TARGET_MACHINE}" in x86_64) - _filename=google-chrome-${_channel}_${_chromeVersion}_amd64.deb + _filename=google-chrome-${_channel}_${_chromeVersion}-${_chromeRevision}_amd64.deb _chromeChecksum="307fac6999f68092c5aa65524e17f5bc9e9f7cbb7d0e09e601bb6f62eda15c85" ;; i686) - _filename=google-chrome-${_channel}_${_chromeVersion}_i386.deb + _filename=google-chrome-${_channel}_${_chromeVersion}-${_chromeRevision}_i386.deb _chromeChecksum="6d3fcd532b1483d961edc4bd65aef79980b41587e736857ff2869ad34732e6b1" ;; esac @@ -29,33 +30,18 @@ _chromeUrl="${_baseUrl}/${_filename}" distfiles="${_chromeUrl}" checksum="$_chromeChecksum" -skip_extraction="$_filename" - -do_fetch() { - mkdir -p $wrksrc - cd $wrksrc - xbps-uhelper fetch $distfiles - echo "$checksum $_filename" | sha256sum -c || { sha256sum "$_filename"; return 1; } -} do_extract() { : } -do_build() { +do_install() { + sed -e "s|%VERSION%|${version}|" \ + ${FILESDIR}/chromium-pepper-flash.sh.in > chromium-pepper-flash.sh sed \ -e "s|%VERSION%|${version}|" \ - ${FILESDIR}/chromium-pepper-flash.sh.in > chromium-pepper-flash.sh - sed \ -e "s|%CHROME_URL%|${_chromeUrl}|" \ -e "s|%CHROME_CHECKSUM%|${_chromeChecksum}|" \ - ${FILESDIR}/chromium-pepper-vars.sh.in > chromium-pepper-vars.sh -} - -do_install() { - vmkdir "usr/lib/chromium-pepper-flash" - vcopy chromium-pepper-vars.sh "usr/lib/chromium-pepper-flash" - - vinstall "${FILESDIR}/LICENSE" 644 "usr/share/licenses/chromium-pepper-flash" - - vmkdir "etc/profile.d" - vinstall "chromium-pepper-flash.sh" 644 "etc/profile.d" + ${FILESDIR}/chromium-pepper-vars.sh.in > chromium-pepper-vars.sh + vinstall chromium-pepper-vars.sh 644 usr/lib/$pkgname + vinstall chromium-pepper-flash.sh 644 etc/profile.d + vlicense ${FILESDIR}/LICENSE }