From fd0e989dc428cc9ab3f1e9db47502b40fbc683a3 Mon Sep 17 00:00:00 2001
From: Manuel <manutortosa@chakra-project.org>
Date: Wed, 1 May 2013 21:12:47 +0000
Subject: [PATCH] Make opera find flashplugin in /extra

---
 opera/PKGBUILD              | 82 ++++++++++---------------------------
 opera/extra-pluginpath.diff | 10 +++++
 2 files changed, 32 insertions(+), 60 deletions(-)
 create mode 100644 opera/extra-pluginpath.diff

diff --git a/opera/PKGBUILD b/opera/PKGBUILD
index 30eb17671..d27b18a4c 100644
--- a/opera/PKGBUILD
+++ b/opera/PKGBUILD
@@ -1,71 +1,33 @@
 #
-# Chakra Packages for Chakra, part of chakra-project.org
+# Apps Packages for Chakra, part of chakra-project.org
 #
-# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
-# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
 
 pkgname=opera
-pkgver=11.00
-_buildver=1156
-pkgrel=1
+pkgver=12.15
+_buildver=1748
+pkgrel=2
 pkgdesc="A fast and secure web browser and Internet suite."
+arch=('x86_64')
 url="http://www.opera.com/browser/"
-depends=('gcc-libs' 'gstreamer0.10-good' 'libxt' 'freetype2' 'libxext')
+license=('custom:opera')
+depends=('gcc-libs' 'libxt' 'freetype2' 'libxext')
 optdepends=('gtk2: GTK integration' \
-	    'kdebase-runtime: KDE4 integration' \
-	    'gstreamer0.10-ffmpeg: HTML5 H.264 support' \
-	    'gstreamer0.10-bad-plugins: HTML5 H.264 support')
-categories=('network')
+	    'kde-runtime: KDE4 integration' \
+	    'gstreamer0.10-base-plugins: HTML5 open codecs support'
+	    'gstreamer0.10-good: HTML5 open codecs support'
+	    'gstreamer0.10-ffmpeg: HTML5 not so open codecs support'
+	    'gstreamer0.10-bad-plugins: HTML5 not so open codecs support')
 install=${pkgname}.install
 options=(!strip)
-license=('custom:opera')
-arch=('i686' 'x86_64')
-_barch=i386
-[ "$CARCH" = "x86_64" ] && _barch=x86_64
-source=(http://ftp.opera.com/pub/opera/linux/${pkgver/./}/opera-${pkgver}-${_buildver}.${_barch}.linux.tar.bz2)
-md5sums=('5a52a8fad55eb281975dfacee25221e6')
-[ "$CARCH" = "x86_64" ] && md5sums=('a91579341ae8eb66bd0b6a60947a0fab')
+categories=('network')
+source=(http://ftp.opera.com/pub/opera/linux/${pkgver/./}/opera-${pkgver}-${_buildver}.${arch}.linux.tar.xz
+        extra-pluginpath.diff)
+md5sums=('59e1bb087e5861126a296ef0a68df8a4')
 
-build() {
-cd opera-${pkgver}-${_buildver}.${_barch}.linux
-
-# Create initial directory structure
-
-mkdir -p ${pkgdir}/usr/bin
-
-# Create 'opera' and 'opera-widget-manager' wrapper scripts and make them executable
-
-cat <<EOF > ${pkgdir}/usr/bin/opera
-#!/bin/sh 
-export OPERA_DIR=\${OPERA_DIR:-/usr/share/opera} 
-exec /usr/lib/opera/opera "\$@"
-EOF
-
-cat <<EOF > ${pkgdir}/usr/bin/opera-widget-manager
-#!/bin/sh 
-exec /usr/bin/opera --widgetmanager "\$@"
-EOF
-
-chmod 755 ${pkgdir}/usr/bin/opera*
-
-# Copy over 'lib/' and 'share/'
-
-cp -R lib ${pkgdir}/usr/
-cp -R share ${pkgdir}/usr/
-
-# Patch variables in the *.desktop, MIME and man files to reflect the final install location.
-
-sed -i ${pkgdir}/usr/share/applications/opera-browser.desktop -e "s|@@{PREFIX}|/usr|" -e "s|@@{[U_]*SUFFIX}||"
-sed -i ${pkgdir}/usr/share/applications/opera-widget-manager.desktop -e "s|@@{PREFIX}|/usr|" -e "s|@@{[U_]*SUFFIX}||"
-sed -i ${pkgdir}/usr/share/applications/opera-widget-installer.desktop -e "s|@@{PREFIX}|/usr|" -e "s|@@{[U_]*SUFFIX}||"
-sed -i ${pkgdir}/usr/share/mime/packages/opera-widget.xml -e "s|@@{[U_]*SUFFIX}||"
-sed -i ${pkgdir}/usr/share/mime/packages/opera-unite-application.xml -e "s|@@{[U_]*SUFFIX}||"
-gzip -d ${pkgdir}/usr/share/man/man1/opera.1.gz
-sed -i ${pkgdir}/usr/share/man/man1/opera.1 -e "s|@@{PREFIX}|/usr|" -e "s|@@{[U_]*SUFFIX}||"
-gzip -d ${pkgdir}/usr/share/man/man1/opera-widget-manager.1.gz
-sed -i ${pkgdir}/usr/share/man/man1/opera-widget-manager.1 -e "s|@@{PREFIX}|/usr|" -e "s|@@{[U_]*SUFFIX}||"
-
-# Place the license in the standard Chakra location.
-
-install -D -m 644 ${pkgdir}/usr/share/opera/defaults/license.txt ${pkgdir}/usr/share/licenses/${pkgname}/license.txt
+package() {
+        opera-${pkgver}-${_buildver}.${arch}.linux/install --prefix /usr --repackage "${pkgdir}/usr"
+        install -D -m 644 "${pkgdir}/usr/share/${pkgname}/defaults/license.txt" "${pkgdir}/usr/share/licenses/${pkgname}/license.txt"
+ 
+        cd ${pkgdir}/usr/share/opera/defaults
+        patch -p0 -i ${srcdir}/extra-pluginpath.diff
 }
diff --git a/opera/extra-pluginpath.diff b/opera/extra-pluginpath.diff
new file mode 100644
index 000000000..dad5520e5
--- /dev/null
+++ b/opera/extra-pluginpath.diff
@@ -0,0 +1,10 @@
+--- pluginpath.ini	2013-05-01 22:44:17.047669379 +0200
++++ pluginpath.ini2	2013-05-01 22:56:01.535284058 +0200
+@@ -86,6 +86,7 @@
+ ; Since Mozilla supports NS plugins, there might
+ ; be some in the Mozilla plugin directory.
+ /usr/lib/mozilla/plugins=1
++/extra/usr/lib/mozilla/plugins=1
+ /usr/lib32/mozilla/plugins=1
+ /usr/lib64/mozilla/plugins=1
+ /usr/X11R6/lib/mozilla/plugins=1