[packages/vivaldi] detect pld pepperflash location

[glen]

commit 5c8c7a6eaee09f7ad26c76fa4ba822e4f8fcba4f
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sun Sep 6 01:02:20 2015 +0300

    detect pld pepperflash location

 bin.patch    | 17 +++++++++++++++--
 vivaldi.spec |  1 +
 2 files changed, 16 insertions(+), 2 deletions(-)
---
diff --git a/vivaldi.spec b/vivaldi.spec
index 931713f..dcb4ef2 100644
--- a/vivaldi.spec
+++ b/vivaldi.spec
@@ -17,6 +17,7 @@ BuildRequires:	hicolor-icon-theme
 BuildRequires:	tar >= 1:1.22
 BuildRequires:	xz
 Requires:	desktop-file-utils
+Requires:	grep
 Requires:	gtk-update-icon-cache
 Requires:	hicolor-icon-theme
 ExclusiveArch:	%{ix86} %{x8664}
diff --git a/bin.patch b/bin.patch
index f388485..fe24986 100644
--- a/bin.patch
+++ b/bin.patch
@@ -1,4 +1,4 @@
---- vivaldi-1.0.252.3/vivaldi~	2015-08-21 05:26:28.000000000 +0300
+--- vivaldi-1.0.252.3/vivaldi	2015-09-06 01:01:12.612961576 +0300
 +++ vivaldi-1.0.252.3/vivaldi	2015-09-06 00:56:58.047117862 +0300
 @@ -60,9 +60,9 @@
  
@@ -13,7 +13,20 @@
        --enable-logging=stderr --log-level=0
    fi
  fi
-@@ -94,12 +94,12 @@
+@@ -73,7 +73,11 @@
+ exec > >(exec cat)
+ exec 2> >(exec cat >&2)
+ 
+-if [ -f "/opt/google/chrome/PepperFlash/libpepflashplayer.so" ]; then
++if [ -f "/usr/lib/browser-plugins/PepperFlash/libpepflashplayer.so" ]; then
++  FLASH_PATH="/usr/lib/browser-plugins/PepperFlash/libpepflashplayer.so" # pld 32-bit
++elif [ -f "/usr/lib64/browser-plugins/PepperFlash/libpepflashplayer.so" ]; then
++  FLASH_PATH="/usr/lib64/browser-plugins/PepperFlash/libpepflashplayer.so" # pld 64-bit
++elif [ -f "/opt/google/chrome/PepperFlash/libpepflashplayer.so" ]; then
+   FLASH_PATH="/opt/google/chrome/PepperFlash/libpepflashplayer.so" # google
+ elif [ -f "/usr/lib/pepperflashplugin-nonfree/libpepflashplayer.so" ]; then
+   FLASH_PATH="/usr/lib/pepperflashplugin-nonfree/libpepflashplayer.so" # debian/ubuntu
+@@ -90,12 +94,12 @@
  # overrides the default.
  if [[ -n "$CHROME_USER_DATA_DIR" ]]; then
    # Note: exec -a below is a bashism.
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/vivaldi.git/commitdiff/a0a6d2fb1a6adabd9aa3f35bf28b398a9016d6d4