[PR PATCH] torbrowser-launcher: update to 0.3.5.

[PR PATCH] torbrowser-launcher: update to 0.3.5.

[travankor]

[-- Attachment #1: Type: text/plain, Size: 342 bytes --]

There is a new pull request by travankor against master on the void-packages repository

https://github.com/travankor/void-packages torbrowser-launcher
https://github.com/void-linux/void-packages/pull/31887

torbrowser-launcher: update to 0.3.5.
None

A patch file from https://github.com/void-linux/void-packages/pull/31887.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-torbrowser-launcher-31887.patch --]
[-- Type: text/x-diff, Size: 3169 bytes --]

From 0925f178f22fe221402cc229d6121095c56aaf92 Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
Date: Sat, 10 Jul 2021 06:31:27 -0700
Subject: [PATCH] torbrowser-launcher: update to 0.3.5.

---
 .../torbrowser-launcher/patches/python-3.8.patch   | 11 -----------
 srcpkgs/torbrowser-launcher/patches/wayland.diff   | 14 ++++++++++++++
 srcpkgs/torbrowser-launcher/template               |  8 ++++----
 3 files changed, 18 insertions(+), 15 deletions(-)
 delete mode 100644 srcpkgs/torbrowser-launcher/patches/python-3.8.patch
 create mode 100644 srcpkgs/torbrowser-launcher/patches/wayland.diff

diff --git a/srcpkgs/torbrowser-launcher/patches/python-3.8.patch b/srcpkgs/torbrowser-launcher/patches/python-3.8.patch
deleted file mode 100644
index 6462b81dd21c..000000000000
--- a/srcpkgs/torbrowser-launcher/patches/python-3.8.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/setup.py
-+++ b/setup.py
-@@ -35,7 +35,7 @@
- SHARE = 'share'
- 
- # detect linux distribution
--distro = platform.dist()[0]
-+distro = 'Void'
- 
- 
- def file_list(path):
diff --git a/srcpkgs/torbrowser-launcher/patches/wayland.diff b/srcpkgs/torbrowser-launcher/patches/wayland.diff
new file mode 100644
index 000000000000..3553d5d53017
--- /dev/null
+++ b/srcpkgs/torbrowser-launcher/patches/wayland.diff
@@ -0,0 +1,14 @@
+diff --git a/apparmor/torbrowser.Browser.firefox b/apparmor/torbrowser.Browser.firefox
+index 6882f9d..365b073 100644
+--- a/apparmor/torbrowser.Browser.firefox
++++ b/apparmor/torbrowser.Browser.firefox
+@@ -115,6 +115,9 @@ profile torbrowser_firefox @{torbrowser_firefox_executable} {
+   owner /{dev,run}/shm/org.chromium.* rw,
+   owner /dev/shm/org.mozilla.ipc.[0-9]*.[0-9]* rw, # for Chromium IPC
+ 
++  # Required for Wayland display protocol support
++  owner /dev/shm/wayland.mozilla.ipc.[0-9]* rw,
++
+   # Deny access to DRM nodes, that's granted by the X abstraction, which is
+   # sourced by the gnome abstraction, that we include.
+   deny /dev/dri/** rwklx,
diff --git a/srcpkgs/torbrowser-launcher/template b/srcpkgs/torbrowser-launcher/template
index 2d8ce5bf282e..dbc5a5ca66ad 100644
--- a/srcpkgs/torbrowser-launcher/template
+++ b/srcpkgs/torbrowser-launcher/template
@@ -1,10 +1,10 @@
 # Template file for 'torbrowser-launcher'
 pkgname=torbrowser-launcher
-version=0.3.3
-revision=2
+version=0.3.5
+revision=1
 archs="i686 x86_64" # limited by Tor Browser itself
 build_style=python3-module
-hostmakedepends="gettext python3-setuptools"
+hostmakedepends="gettext python3-distro python3-setuptools"
 depends="python3-PyQt5 python3-gpg python3-requests python3-pysocks gnupg2 tor dbus-glib
  python3-packaging"
 short_desc="Securely download, verify and run Tor Browser"
@@ -13,7 +13,7 @@ license="MIT"
 homepage="https://github.com/micahflee/torbrowser-launcher"
 changelog="https://raw.githubusercontent.com/micahflee/torbrowser-launcher/master/CHANGELOG.md"
 distfiles="https://github.com/micahflee/torbrowser-launcher/archive/v${version}.tar.gz"
-checksum=58b17bd5a9a6f35fe78d83e69fdf77919ffa8c2492b1add1d47aed6237794f93
+checksum=623cd77c6095711f371fee5b5cc521ecd8dd89d964b75fad6449633d10925089
 
 post_install() {
 	vlicense LICENSE

Re: [PR REVIEW] torbrowser-launcher: update to 0.3.5.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 217 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/31887#discussion_r667640503

Comment:
`abstractions/wayland` exists, I think we could include that directly.

Re: [PR REVIEW] torbrowser-launcher: update to 0.3.5.

[travankor]

[-- Attachment #1: Type: text/plain, Size: 285 bytes --]

New review comment by travankor on void-packages repository

https://github.com/void-linux/void-packages/pull/31887#discussion_r667897993

Comment:
Doesn't [seem](https://gitlab.com/apparmor/apparmor/-/blob/master/profiles/apparmor.d/abstractions/wayland) to include the right socket?

Re: [PR REVIEW] torbrowser-launcher: update to 0.3.5.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 226 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/31887#discussion_r667938556

Comment:
You're right, thanks. It seems `abstractions/gnome` pulls in `wayland` already.

Re: [PR PATCH] [Merged]: torbrowser-launcher: update to 0.3.5.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 175 bytes --]

There's a merged pull request on the void-packages repository

torbrowser-launcher: update to 0.3.5.
https://github.com/void-linux/void-packages/pull/31887

Description:
None