From c89ce140016d19927e28ad7fce5447c0cb979139 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9s=20Rodr=C3=ADguez?= <hello@andres.codes>
Date: Fri, 29 Jan 2021 17:25:54 -0300
Subject: [PATCH] Remove support for the upstream-disabled pepper-flash package

---
 .SRCINFO     | 5 ++---
 PKGBUILD     | 5 ++---
 brave-bin.sh | 9 +--------
 3 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index 6078247..f2db3e0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = brave-bin
 	pkgdesc = Web browser that blocks ads and trackers by default (binary release).
 	pkgver = 1.19.88
-	pkgrel = 1
+	pkgrel = 2
 	epoch = 1
 	url = https://brave.com/download
 	arch = x86_64
@@ -14,7 +14,6 @@ pkgbase = brave-bin
 	depends = libxss
 	depends = ttf-font
 	optdepends = cups: Printer support
-	optdepends = pepper-flash: Adobe Flash support
 	optdepends = libgnome-keyring: Enable GNOME keyring support
 	optdepends = libnotify: Native notification support
 	provides = brave
@@ -27,7 +26,7 @@ pkgbase = brave-bin
 	source = brave-browser.desktop
 	source = logo.png
 	sha512sums = 1cf1b9783bc998566a033d434c93499914870ea52715dc447f30ce790f519d6101c856187b5770439b8c9263c4a5ab259dbcb937d612e7d579a29eddf646489f
-	sha512sums = ff99db6b5673846f4ec0daf0ec60535921166f6185131d8d966452452393580f655c421e7ad5889f5a6f6cb3f1e76e7908d711aa003ee37a1ae50774371a8b53
+	sha512sums = e8f542e7bee31c1f3a24ca2ce76f1687c450b8f55ad7b750829e4736da1c5724ecefca8a498d6e987a17405307402727c83594dbc6075dd5e1985dc0adc4172b
 	sha512sums = 137e14b6ff8faf19fcbfc2adcde73a3fb8f6529e9662c8eed04fc4a891073775c20b79c7149fb617465f53b980a8e46114c1c8eb704be7755da8d22a974761dd
 	sha512sums = d7bef52e336bd908d24bf3a084a1fc480831d27a3c80af4c31872465b6a0ce39bdf298e620ae9865526c974465807559cc75610b835e60b4358f65a8a8ff159e
 
diff --git a/PKGBUILD b/PKGBUILD
index 66a3aba..37c9816 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@
 
 pkgname=brave-bin
 pkgver=1.19.88
-pkgrel=1
+pkgrel=2
 epoch=1
 pkgdesc="Web browser that blocks ads and trackers by default (binary release)."
 arch=("x86_64")
@@ -17,7 +17,6 @@ url="https://brave.com/download"
 license=("MPL2" "BSD" "custom:chromium")
 depends=("gtk3" "nss" "alsa-lib" "libxss" "ttf-font")
 optdepends=("cups: Printer support"
-            "pepper-flash: Adobe Flash support"
             "libgnome-keyring: Enable GNOME keyring support"
             "libnotify: Native notification support")
 provides=("${pkgname%-bin}" "brave-browser")
@@ -28,7 +27,7 @@ source=("$pkgname-$pkgver.zip::https://github.com/brave/brave-browser/releases/d
         "logo.png")
 options=(!strip)
 sha512sums=("1cf1b9783bc998566a033d434c93499914870ea52715dc447f30ce790f519d6101c856187b5770439b8c9263c4a5ab259dbcb937d612e7d579a29eddf646489f"
-            "ff99db6b5673846f4ec0daf0ec60535921166f6185131d8d966452452393580f655c421e7ad5889f5a6f6cb3f1e76e7908d711aa003ee37a1ae50774371a8b53"
+            "e8f542e7bee31c1f3a24ca2ce76f1687c450b8f55ad7b750829e4736da1c5724ecefca8a498d6e987a17405307402727c83594dbc6075dd5e1985dc0adc4172b"
             "137e14b6ff8faf19fcbfc2adcde73a3fb8f6529e9662c8eed04fc4a891073775c20b79c7149fb617465f53b980a8e46114c1c8eb704be7755da8d22a974761dd"
             "d7bef52e336bd908d24bf3a084a1fc480831d27a3c80af4c31872465b6a0ce39bdf298e620ae9865526c974465807559cc75610b835e60b4358f65a8a8ff159e")
 noextract=("$pkgname-$pkgver.zip")
diff --git a/brave-bin.sh b/brave-bin.sh
index 398934a..1374b3a 100644
--- a/brave-bin.sh
+++ b/brave-bin.sh
@@ -1,6 +1,5 @@
 #!/usr/bin/env bash
 XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}"
-BRAVE_USE_FLASH_IF_AVAILABLE="${BRAVE_USE_FLASH_IF_AVAILABLE:-true}"
 
 # Allow users to override command-line options
 USER_FLAGS_FILE="$XDG_CONFIG_HOME/brave-flags.conf"
@@ -13,10 +12,4 @@ if [[ -f /proc/sys/kernel/unprivileged_userns_clone && $(< /proc/sys/kernel/unpr
     SANDBOX_FLAG="--no-sandbox"
 fi
 
-BRAVE_PEPPER_FLASH_SO=${BRAVE_PEPPER_FLASH_SO:-/usr/lib/PepperFlash/libpepflashplayer.so}
-if [[ -f $BRAVE_PEPPER_FLASH_SO && $BRAVE_USE_FLASH_IF_AVAILABLE == "true" ]]; then
-   BRAVE_PEPPER_FLASH_VERSION=${BRAVE_PEPPER_FLASH_VERSION:-$(LANG=C pacman -Qi pepper-flash | grep Version | sed 's/.*: //; s/\-[^-]*$//')}
-   PEPPER_FLASH_FLAG="--ppapi-flash-path=$BRAVE_PEPPER_FLASH_SO --ppapi-flash-version=$BRAVE_PEPPER_FLASH_VERSION"
-fi
-
-exec /usr/lib/brave-bin/brave "$@" $SANDBOX_FLAG $PEPPER_FLASH_FLAG $USER_FLAGS
+exec /usr/lib/brave-bin/brave "$@" $SANDBOX_FLAG $USER_FLAGS