use full patch from upstream, add optdepends

5 files changed, 41 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9bdb8672f6f9..4ad9188f1557 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = torbrowser-launcher-git
 	pkgdesc = Securely and easily download, verify, install and launch Tor Browser
 	pkgver = 0.3.2.r24.fc2073d
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/micahflee/torbrowser-launcher
 	arch = any
 	license = MIT
@@ -15,12 +15,13 @@ pkgbase = torbrowser-launcher-git
 	depends = python-pyqt5
 	depends = python-pysocks
 	depends = python-requests
+	optdepends = apparmor: support for apparmor profiles
 	provides = torbrowser-launcher
 	conflicts = torbrowser-launcher
 	source = git+https://github.com/micahflee/torbrowser-launcher.git#branch=develop
-	source = torbrowser-launcher.patch
+	source = 444.patch
 	sha256sums = SKIP
-	sha256sums = 492ef44a6246e2e3d26feeeb317aa629fda9c0c229d0a64a8174f71492ead900
+	sha256sums = c94ecaab83ae49943d02772583dcd89e9d6ee1448d56ca8fcb621eeafbc3315b
 
 pkgname = torbrowser-launcher-git
 
diff --git a/.gitignore b/.gitignore
index 75d9018934c8..1bbc3c9b8618 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,4 @@
 !.gitignore
 !PKGBUILD
 !.SRCINFO
-!torbrowser-launcher.patch
+!444.patch
diff --git a/444.patch b/444.patch
new file mode 100644
index 000000000000..0f105f70492f
--- /dev/null
+++ b/444.patch
@@ -0,0 +1,31 @@
+From 66781d299d9dfd812c7aca9a04de7ea37f4d57e2 Mon Sep 17 00:00:00 2001
+From: Carl Joseph Hirner III <k.j.hirner.wisdom@gmail.com>
+Date: Sat, 16 Nov 2019 02:08:30 -0800
+Subject: [PATCH] Update setup.py
+
+modified to enable getting distro for python3.8 while maintaining ability to use python3.7 and below
+---
+ setup.py | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 37452ba..2ff7dc4 100644
+--- a/setup.py
++++ b/setup.py
+@@ -33,9 +33,13 @@
+ from distutils.core import setup
+ 
+ SHARE = 'share'
+-
+-# detect linux distribution
+-distro = platform.dist()[0]
++try:
++    #for distributions that use python3.8
++    import distro as d
++    distro=d.LinuxDistribution()._os_release_info['name']
++except:
++    # detect linux distribution on python >=3.7
++    distro = platform.dist()[0]
+ 
+ 
+ def file_list(path):
diff --git a/PKGBUILD b/PKGBUILD
index f30b1235dca0..af2a48327568 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Co-Maintainer: Mark Wagie <mark dot wagie at tutanota dot com>
 pkgname=torbrowser-launcher-git
 pkgver=0.3.2.r24.fc2073d
-pkgrel=2
+pkgrel=3
 pkgdesc="Securely and easily download, verify, install and launch Tor Browser"
 arch=('any')
 url="https://github.com/micahflee/torbrowser-launcher"
@@ -10,12 +10,13 @@ license=('MIT')
 depends=('tor' 'gnupg' 'python-gnupg' 'python-gpgme' 'python-pyqt5' 'python-pysocks'
          'python-requests')
 makedepends=('git' 'python-setuptools' 'python-distro')
+optdepends=('apparmor: support for apparmor profiles')
 provides=("${pkgname%-git}")
 conflicts=("${pkgname%-git}")
 source=('git+https://github.com/micahflee/torbrowser-launcher.git#branch=develop'
-        "${pkgname%-git}.patch")
+        "444.patch")
 sha256sums=('SKIP'
-            '492ef44a6246e2e3d26feeeb317aa629fda9c0c229d0a64a8174f71492ead900')
+            'c94ecaab83ae49943d02772583dcd89e9d6ee1448d56ca8fcb621eeafbc3315b')
 
 pkgver() {
 	cd "$srcdir/${pkgname%-git}"
@@ -24,7 +25,7 @@ pkgver() {
 
 prepare() {
 	cd "$srcdir/${pkgname%-git}"
-	patch -p1 -i "$srcdir/${pkgname%-git}.patch"
+	patch --forward --strip=1 --input="$srcdir/444.patch"
 }
 
 build() {
diff --git a/torbrowser-launcher.patch b/torbrowser-launcher.patch
deleted file mode 100644
index 7cb117f44be7..000000000000
--- a/torbrowser-launcher.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Only in torbrowser-launcher: .git
-diff '--color=auto' --unified --recursive --text torbrowser-launcher/setup.py torbrowser-launcher.b/setup.py
---- torbrowser-launcher/setup.py	2020-01-03 10:35:52.041695115 -0700
-+++ torbrowser-launcher.b/setup.py	2020-01-03 10:36:33.168415722 -0700
-@@ -35,7 +35,8 @@
- SHARE = 'share'
- 
- # detect linux distribution
--distro = platform.dist()[0]
-+import distro as d
-+distro=d.LinuxDistribution()._os_release_info['name']
- 
- 
- def file_list(path):