fix for tor browser version 10

3 files changed, 13 insertions, 42 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3a2ae4b0c9b2..f5fa946945a5 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.r32.275a2b8
-	pkgrel = 2
+	pkgver = 0.3.2.r34.1e95880
+	pkgrel = 1
 	url = https://github.com/micahflee/torbrowser-launcher
 	arch = any
 	license = MIT
@@ -19,10 +19,12 @@ pkgbase = torbrowser-launcher-git
 	provides = torbrowser-launcher
 	conflicts = torbrowser-launcher
 	source = git+https://github.com/micahflee/torbrowser-launcher.git#branch=develop
-	source = 444.patch
+	source = https://github.com/micahflee/torbrowser-launcher/pull/444/commits/66781d299d9dfd812c7aca9a04de7ea37f4d57e2.patch
+	source = https://github.com/micahflee/torbrowser-launcher/pull/499/commits/070a5f40af7c93d39bddfc5aa382469ce97dfd5b.patch
 	source = tor-browser-developers.pub::https://sources.archlinux.org/other/community/torbrowser-launcher/tor-browser-developers-2020-12-19.asc
 	sha256sums = SKIP
 	sha256sums = c94ecaab83ae49943d02772583dcd89e9d6ee1448d56ca8fcb621eeafbc3315b
+	sha256sums = 07dd27c56c83549a52a8ea1c1957129674bed96512bcb3cdb6cc017062139072
 	sha256sums = 1845e038fc7b0b1f861d9ddb29118d40c03596ec6efff82025dd47e74eb865b9
 
 pkgname = torbrowser-launcher-git
diff --git a/444.patch b/444.patch
deleted file mode 100644
index 0f105f70492f..000000000000
--- a/444.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-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 c03edb653ced..f1cb276c24dd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Yardena Cohen <yardenack at gmail dot com>
 # Co-Maintainer: Mark Wagie <mark dot wagie at tutanota dot com>
 pkgname=torbrowser-launcher-git
-pkgver=0.3.2.r32.275a2b8
-pkgrel=2
+pkgver=0.3.2.r34.1e95880
+pkgrel=1
 pkgdesc="Securely and easily download, verify, install and launch Tor Browser"
 arch=('any')
 url="https://github.com/micahflee/torbrowser-launcher"
@@ -14,10 +14,12 @@ optdepends=('apparmor: support for apparmor profiles')
 provides=("${pkgname%-git}")
 conflicts=("${pkgname%-git}")
 source=('git+https://github.com/micahflee/torbrowser-launcher.git#branch=develop'
-        '444.patch'
+        'https://github.com/micahflee/torbrowser-launcher/pull/444/commits/66781d299d9dfd812c7aca9a04de7ea37f4d57e2.patch'
+        'https://github.com/micahflee/torbrowser-launcher/pull/499/commits/070a5f40af7c93d39bddfc5aa382469ce97dfd5b.patch'
         "tor-browser-developers.pub::https://sources.archlinux.org/other/community/torbrowser-launcher/tor-browser-developers-2020-12-19.asc")
 sha256sums=('SKIP'
             'c94ecaab83ae49943d02772583dcd89e9d6ee1448d56ca8fcb621eeafbc3315b'
+            '07dd27c56c83549a52a8ea1c1957129674bed96512bcb3cdb6cc017062139072'
             '1845e038fc7b0b1f861d9ddb29118d40c03596ec6efff82025dd47e74eb865b9')
 
 pkgver() {
@@ -29,12 +31,10 @@ prepare() {
 	cd "$srcdir/${pkgname%-git}"
 
 	# fix for python >= 3.8
-	patch --forward --strip=1 --input="$srcdir/444.patch"
+	patch --forward --strip=1 --input="${srcdir}/66781d299d9dfd812c7aca9a04de7ea37f4d57e2.patch"
 
-	# replace expired signing key:
-	# https://github.com/micahflee/torbrowser-launcher/pull/482
-	cp "$srcdir/tor-browser-developers.pub" \
-		"share/${pkgname%-git}/tor-browser-developers.asc"
+	# fix for tor browser version 10
+	patch --forward --strip=1 --input="${srcdir}/070a5f40af7c93d39bddfc5aa382469ce97dfd5b.patch"
 }
 
 build() {