Use ALPM hooks

This package depends on flashplugin from [extra] and does not need any
updates anymore. It patches the file via hooks automatically on every
update of flashplugin.

7 files changed, 46 insertions, 94 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a1f6bc48f819..d8cedd079232 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,35 +1,18 @@
 # Generated by mksrcinfo v8
-# Sun Apr 10 16:25:10 UTC 2016
+# Sun Apr 17 11:03:09 UTC 2016
 pkgbase = flashplugin-focusfix
-	pkgdesc = Adobe Flash Player with multi-monitor full-screen fix
-	pkgver = 11.2.202.616
+	pkgdesc = Multi-monitor full-screen fix for Adobe Flash Player
+	pkgver = 1.0
 	pkgrel = 1
-	url = http://get.adobe.com/flashplayer
-	install = flashplugin.install
+	epoch = 1
 	arch = i686
 	arch = x86_64
-	license = custom
-	depends = mozilla-common
-	depends = libxt
-	depends = libxpm
-	depends = gtk2
-	depends = nss
-	depends = curl
-	depends = hicolor-icon-theme
-	optdepends = libvdpau: GPU acceleration on Nvidia card
-	provides = flashplugin
-	provides = flashplayer
-	conflicts = flashplugin
-	options = !strip
-	backup = etc/adobe/mms.cfg
-	source = http://www.adobe.com/products/eulas/pdfs/PlatformClients_PC_WWEULA_Combined_20100108_1657.pdf
-	source = mms.cfg
-	md5sums = 94ca2aecb409abfe36494d1a7ec7591d
-	md5sums = f34aae6279b40e0bd2abfb0d9963d7b8
-	source_i686 = flashplugin_11.2.202.616.i386.tar.gz::http://fpdownload.macromedia.com/get/flashplayer/pdc/11.2.202.616/install_flash_player_11_linux.i386.tar.gz
-	md5sums_i686 = 489771efdee853e534d1025fba036f51
-	source_x86_64 = flashplugin_11.2.202.616.x86_64.tar.gz::http://fpdownload.macromedia.com/get/flashplayer/pdc/11.2.202.616/install_flash_player_11_linux.x86_64.tar.gz
-	md5sums_x86_64 = 18271ef4389464f5236e415a8f140872
+	license = GPLv3
+	depends = flashplugin
+	source = hook.install
+	source = hook.remove
+	md5sums = aea76c93d5045e39191cdc3b5cb4e719
+	md5sums = 0283b277ac11a8ddcf5d0140883840b3
 
 pkgname = flashplugin-focusfix
 
diff --git a/.gitignore b/.gitignore
index c0abefbea13c..f52b2f5a9940 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,3 @@ pkg/
 src/
 *.tar.xz
 *.tar.gz
-*.pdf
diff --git a/PKGBUILD b/PKGBUILD
index 493d36cb2ac6..bddf1b9556ee 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,59 +1,23 @@
 # Maintainer : Sven Karsten Greiner <sven@sammyshp.de>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>, Ionut Biru <ibiru@archlinux.org>
 
-# This is a copy of extra/flashplugin that includes the patch from [1] which
-# replaces the string _NET_ACTIVE_WINDOW with _XET_ACTIVE_WINDOW.
-#
-# With this patch Flash won't automatically exit full-screen mode anymore when
-# another window gets the focus (this situation is only possible when using
-# multiple physical or virtual screens).
+# With this patch Adobe Flash Player won't automatically exit full-screen mode
+# anymore when another window gets the focus (this situation is only possible
+# when using multiple physical or virtual screens).
 
 pkgname=flashplugin-focusfix
-_licensefile='PlatformClients_PC_WWEULA_Combined_20100108_1657.pdf'
-pkgver=11.2.202.616
+pkgver=1.0
 pkgrel=1
-pkgdesc='Adobe Flash Player with multi-monitor full-screen fix'
-url='http://get.adobe.com/flashplayer'
+epoch=1
+pkgdesc='Multi-monitor full-screen fix for Adobe Flash Player'
 arch=('i686' 'x86_64')
-depends=('mozilla-common' 'libxt' 'libxpm' 'gtk2' 'nss' 'curl' 'hicolor-icon-theme')
-optdepends=('libvdpau: GPU acceleration on Nvidia card')
-provides=('flashplugin' 'flashplayer')
-conflicts=('flashplugin')
-license=('custom')
-options=(!strip)
-install=flashplugin.install
-backup=(etc/adobe/mms.cfg)
-
-_patchorig='\x4E\x45\x54\x5F\x41\x43\x54\x49\x56\x45\x5F\x57\x49\x4E\x44\x4F\x57'
-_patchrepl='\x58\x45\x54\x5F\x41\x43\x54\x49\x56\x45\x5F\x57\x49\x4E\x44\x4F\x57'
-
-source=(http://www.adobe.com/products/eulas/pdfs/${_licensefile}
-        mms.cfg)
-source_i686=(flashplugin_$pkgver.i386.tar.gz::http://fpdownload.macromedia.com/get/flashplayer/pdc/$pkgver/install_flash_player_11_linux.i386.tar.gz)
-source_x86_64=(flashplugin_$pkgver.x86_64.tar.gz::http://fpdownload.macromedia.com/get/flashplayer/pdc/$pkgver/install_flash_player_11_linux.x86_64.tar.gz)
-md5sums=('94ca2aecb409abfe36494d1a7ec7591d'
-         'f34aae6279b40e0bd2abfb0d9963d7b8')
-md5sums_i686=('489771efdee853e534d1025fba036f51')
-md5sums_x86_64=('18271ef4389464f5236e415a8f140872')
-
-build () {
-    sed -i "s/$_patchorig/$_patchrepl/" libflashplayer.so
-}
+license=('GPLv3')
+depends=('flashplugin')
+source=('hook.install'
+        'hook.remove')
+md5sums=('aea76c93d5045e39191cdc3b5cb4e719'
+         '0283b277ac11a8ddcf5d0140883840b3')
 
 package () {
-    install -Dm755 libflashplayer.so "$pkgdir/usr/lib/mozilla/plugins/libflashplayer.so"
-    if [ "$CARCH" = x86_64 ]; then
-        install -Dm755 usr/lib64/kde4/kcm_adobe_flash_player.so "$pkgdir/usr/lib/kde4/kcm_adobe_flash_player.so"
-    else
-        install -Dm755 usr/lib/kde4/kcm_adobe_flash_player.so "$pkgdir/usr/lib/kde4/kcm_adobe_flash_player.so"
-    fi
-    install -Dm755 usr/bin/flash-player-properties "$pkgdir/usr/bin/flash-player-properties"
-    for i in 16x16 22x22 24x24 32x32 48x48; do
-        install -Dm644 usr/share/icons/hicolor/$i/apps/flash-player-properties.png \
-            "$pkgdir/usr/share/icons/hicolor/$i/apps/flash-player-properties.png"
-    done
-    install -Dm644 usr/share/applications/flash-player-properties.desktop "$pkgdir/usr/share/applications/flash-player-properties.desktop"
-    install -Dm644 usr/share/kde4/services/kcm_adobe_flash_player.desktop "$pkgdir/usr/share/kde4/services/kcm_adobe_flash_player.desktop"
-    install -Dm644 "${_licensefile}" "$pkgdir/usr/share/licenses/$pkgname/LICENSE.pdf"
-    install -Dm644 mms.cfg "$pkgdir/etc/adobe/mms.cfg"
+    install -D -m 644 hook.install "$pkgdir/usr/share/libalpm/hooks/70-flashplugin-focusfix-install.hook"
+    install -D -m 644 hook.remove "$pkgdir/usr/share/libalpm/hooks/70-flashplugin-focusfix-remove.hook"
 }
diff --git a/flashplugin.install b/flashplugin.install
deleted file mode 100644
index 8018fcba216e..000000000000
--- a/flashplugin.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-    echo " >> "
-    echo " >> If you have an NVIDIA card that supports libvdpau or Broadcom Crystal HD chips,"
-    echo " >> uncomment EnableLinuxHWVideoDecode=1 from /etc/adobe/mms.cfg."
-    echo " >> If you run into problems, please contact nVidia or Broadcom along with your system config info / driver version."
-    echo " >> "
-}
-
-post_upgrade() {
-    if  [ "$(vercmp $2 10.2.152.27-2)" -lt 0 ]; then
-        post_install $1
-    fi
-}
diff --git a/hook.install b/hook.install
new file mode 100644
index 000000000000..e7520ec852ec
--- /dev/null
+++ b/hook.install
@@ -0,0 +1,12 @@
+[Trigger]
+Operation = Install
+Operation = Upgrade
+Type = Package
+Target = flashplugin
+Target = flashplugin-focusfix
+
+[Action]
+Description = Apply flashplugin focusfix
+Depends = sed
+When = PostTransaction
+Exec = /usr/bin/sed -i -e 's/_NET_ACTIVE_WINDOW/XNET_ACTIVE_WINDOW/' /usr/lib/mozilla/plugins/libflashplayer.so
diff --git a/hook.remove b/hook.remove
new file mode 100644
index 000000000000..4b9b9351702b
--- /dev/null
+++ b/hook.remove
@@ -0,0 +1,10 @@
+[Trigger]
+Operation = Remove
+Type = Package
+Target = flashplugin-focusfix
+
+[Action]
+Description = Remove flashplugin focusfix
+Depends = sed
+When = PreTransaction
+Exec = /usr/bin/sed -i -e 's/XNET_ACTIVE_WINDOW/_NET_ACTIVE_WINDOW/' /usr/lib/mozilla/plugins/libflashplayer.so
diff --git a/mms.cfg b/mms.cfg
deleted file mode 100644
index 716525dd08ad..000000000000
--- a/mms.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-#Hardware video decoding
-#EnableLinuxHWVideoDecode=1