--- a/3a40129e865f2a7d8aece360f525579b314a7a7c.patch 2020-12-06 15:42:28.000000000 +0000 +++ b/3a40129e865f2a7d8aece360f525579b314a7a7c.patch 2020-12-06 15:42:28.000000000 +0000 @@ -17,27 +17,29 @@ index 25bb984..fe99c64 100644 --- a/torbrowser_launcher/common.py +++ b/torbrowser_launcher/common.py -@@ -113,11 +113,7 @@ def build_paths(self, tbb_version=None): +@@ -150,13 +150,7 @@ def build_paths(self, tbb_version=None): else: - arch = 'linux32' + arch = "linux32" -- if hasattr(self, 'settings') and self.settings['force_en-US']: -- language = 'en-US' +- if hasattr(self, "settings") and self.settings["force_en-US"]: +- language = "en-US" - else: - language = self.language -- tarball_filename = 'tor-browser-' + arch + '-' + tbb_version + '_' + language + '.tar.xz' -+ tarball_filename = 'tor-browser-' + arch + '-' + tbb_version + '_' + self.language + '.tar.xz' +- tarball_filename = ( +- "tor-browser-" + arch + "-" + tbb_version + "_" + language + ".tar.xz" +- ) ++ tarball_filename = "tor-browser-" + arch + "-" + tbb_version + "_" + self.language + ".tar.xz" # tarball - self.paths['tarball_url'] = '{0}torbrowser/' + tbb_version + '/' + tarball_filename -@@ -300,6 +296,11 @@ def load_settings(self): - if settings['tbl_version'] != self.tbl_version: - settings['tbl_version'] = self.tbl_version + self.paths["tarball_url"] = ( +@@ -378,6 +218,11 @@ def load_settings(self): + if settings["tbl_version"] != self.tbl_version: + settings["tbl_version"] = self.tbl_version resave = True + + # we need to update paths if force english is set -+ if settings['force_en-US']: -+ self.language = 'en-US' ++ if settings["force_en-US"]: ++ self.language = "en-US" + self.build_paths() self.settings = settings --- a/66781d299d9dfd812c7aca9a04de7ea37f4d57e2.patch 2020-12-06 15:34:25.000000000 +0000 +++ b/66781d299d9dfd812c7aca9a04de7ea37f4d57e2.patch 2020-12-06 15:34:25.000000000 +0000 @@ -15,7 +15,7 @@ @@ -33,9 +33,13 @@ from distutils.core import setup - SHARE = 'share' + SHARE = "share" - -# detect linux distribution -distro = platform.dist()[0] --- a/PKGBUILD 2020-12-06 15:44:01.000000000 +0000 +++ b/PKGBUILD 2020-12-06 15:44:01.000000000 +0000 @@ -1,8 +1,8 @@ # Maintainer: kpcyrd pkgname=torbrowser-launcher -pkgver=0.3.2 -pkgrel=7 +pkgver=0.3.3 +pkgrel=1 pkgdesc="Securely and easily download, verify, install, and launch Tor Browser in Linux" url="https://github.com/micahflee/torbrowser-launcher" depends=('python' 'python-pyqt5' 'python-requests' 'python-pysocks' 'python-gpgme' 'gnupg' 'tor') @@ -13,29 +13,19 @@ source=("${pkgname}-${pkgver}.tar.gz::https://github.com/micahflee/torbrowser-launcher/archive/v${pkgver}.tar.gz" # fix for python >= 3.8 "https://github.com/micahflee/torbrowser-launcher/pull/444/commits/66781d299d9dfd812c7aca9a04de7ea37f4d57e2.patch" - # fix for tor browser version 10 - "https://github.com/micahflee/torbrowser-launcher/pull/499/commits/070a5f40af7c93d39bddfc5aa382469ce97dfd5b.patch" # fix for "force english version" on non-english system - "https://github.com/micahflee/torbrowser-launcher/pull/416/commits/3a40129e865f2a7d8aece360f525579b314a7a7c.patch" - # replace expired signing key: https://github.com/micahflee/torbrowser-launcher/pull/482 - "tor-browser-developers.pub::https://sources.archlinux.org/other/community/torbrowser-launcher/tor-browser-developers-2020-12-19.asc") -sha512sums=('26c5517723c730591ea5c4b81e30728e9db7323afcafc99d17a178d4300bad3df8731ffb063cc53fe189a3b5e2872395c913b9eea6595acac7f31ff4a1c5f105' - 'af8110da76a2d5763a158c436e712e1929b7524de129b4b3d09d7175df3ba45731a3924480415902cb5b27d1885bbc64c09fb4416367e2aa461e7c0ba3443b3e' - '46d5e2f7daa21957939628682c605c0951845934d3a0cdaa561e27cfd6e458866a6e820ff0f84316607c570d0708d373ab93ab0983c30754226ba1609fbdd166' - 'bfdd23f4b7d60d6dd8ce6f8ab6738a3ad10230e96ba8a6a112435aeec5cbc2058a2b773e6713bc4371d8f0ec87e3e9ba1a0a69078c1805e68e763b1007fdb7dd' - '5ca6c3f2ecc7e48f3b79f7c2ad329b086f2e9b7b3835620123fe48cb6323dac76ad7b1ece673e87de952102c183f024deec19fcfb0325b1a89d9ea2a875ebc68') -b2sums=('b3e35f546ef84aec02a3b75068b08a6d60f9f41f6194d1bf25862c48780f77d72e4443e594add04c5a0d44cf01bcfc8c04d6d7d67c767c2cc75cc8b4a9c42f9c' - '198da65696d6586f8fe279c8161f18e335ee8677c3a1026fda47933046313955648567d24fdfb01cbf533bab31a6526da0adb8861782079e151705011d9afd94' - '27077bee9802966e6dace5b41d063e1edcc82fc60348b19bd3ebbd00b64f146038b421d44146340fce530d04856ed47e75d69c5c497414bfa1a504014de7fec4' - '7508cc8d8579dc7854e7f88e5cedb8b6c4e4d282dad96a0ff5dbb44c019f82e947890c97376442459984cb8b2593d92ab9404f4a4631e9aee74fb589c121ff3b' - '2e0d6a1afbaed0b6860415a7f75f89392caa2c5bcf276b3f66f7f30ca669dd5cb7e78e9632a401c838b39e401a65df40e4c39bf9790cb0ca39dcc21460b2441d') + "https://github.com/micahflee/torbrowser-launcher/pull/416/commits/3a40129e865f2a7d8aece360f525579b314a7a7c.patch") +sha512sums=('129bcc3006d1cda92ab521c5106cacccf934b964b737f28bd89de6872f061b9e039678ca34b8ed30f348a0a47c3d87661b103f48e19a7edfae72a69512220fe6' + '279ec7de3e78fbfa4f7d0f1ac6987683af3fa09556c7a18a27ce56be993d8df589f25eac9cc4f9b865b197bba5cf20684c4a1f4f7aae17fec80016e0d7fb2c98' + '0f7caf6403b0b00d85f867bfe30a9d9c35c265082b4ca322d88cffcf4b599f917e4b9edf60cafe612b7b132060617d132446c0e7707dcb56718ec8b8c1167c2a') +b2sums=('8792e5474efe32124b401287bfbe01caef40381a35bb09062903da09c51f246b6092da2a3ffb84531c8f2be1bb45079263b8e46c98c5efa370abc6200289ac99' + 'a994362cdc97a03e8fdd6731c5eb658e2d031fb56727b35ed11c50069371736fcffd86c145afba6ce3a6154918fbea46358a23b1c59462af9ad572189e9229e6' + 'e68880a36c793309bb3c429f2335141f6fea6d168a66ce2d2f6a370a182245b7b7b81693b9320aec36cc64b8b841536ce6f519e212fc77de9037cf81f1f30ffc') prepare() { cd "${pkgname}-${pkgver}" patch --forward --strip=1 --input="${srcdir}/66781d299d9dfd812c7aca9a04de7ea37f4d57e2.patch" - patch --forward --strip=1 --input="${srcdir}/070a5f40af7c93d39bddfc5aa382469ce97dfd5b.patch" patch --forward --strip=1 --input="${srcdir}/3a40129e865f2a7d8aece360f525579b314a7a7c.patch" - cp "${srcdir}/tor-browser-developers.pub" share/torbrowser-launcher/tor-browser-developers.asc } build() {