From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1661291-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id DCAD6159C9B
for <garchives@archives.gentoo.org>; Tue, 13 Aug 2024 04:24:16 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id E9BDFE2A72;
Tue, 13 Aug 2024 04:24:15 +0000 (UTC)
Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id CECD0E2A72
for <gentoo-commits@lists.gentoo.org>; Tue, 13 Aug 2024 04:24:15 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id BE12E34300C
for <gentoo-commits@lists.gentoo.org>; Tue, 13 Aug 2024 04:24:14 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 2F4B6E6F
for <gentoo-commits@lists.gentoo.org>; Tue, 13 Aug 2024 04:24:13 +0000 (UTC)
From: "Justin" <justin026@protonmail.com>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Justin" <justin026@protonmail.com>
Message-ID: <1723522988.928d9d9bd9cb05deae2f6dbaf5e28be99bcea205.justin026@gentoo>
Subject: [gentoo-commits] repo/proj/guru:dev commit in: www-client/mullvad-browser-bin/
X-VCS-Repository: repo/proj/guru
X-VCS-Files: www-client/mullvad-browser-bin/metadata.xml www-client/mullvad-browser-bin/mullvad-browser-bin-13.5.2.ebuild
X-VCS-Directories: www-client/mullvad-browser-bin/
X-VCS-Committer: justin026
X-VCS-Committer-Name: Justin
X-VCS-Revision: 928d9d9bd9cb05deae2f6dbaf5e28be99bcea205
X-VCS-Branch: dev
Date: Tue, 13 Aug 2024 04:24:13 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 1f42bb32-2b61-4be2-8365-e99edb2c53b2
X-Archives-Hash: 5a967a503d8cc6099a5f5a54f9f3ffad
commit: 928d9d9bd9cb05deae2f6dbaf5e28be99bcea205
Author: Justin Donofrio <justin026 <AT> protonmail <DOT> com>
AuthorDate: Tue Aug 13 04:23:08 2024 +0000
Commit: Justin <justin026 <AT> protonmail <DOT> com>
CommitDate: Tue Aug 13 04:23:08 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=928d9d9b
www-client/mullvad-browser-bin: Use toolchain-funcs, add die, move dep to optfeature
Signed-off-by: Justin Donofrio <justin026 <AT> protonmail.com>
www-client/mullvad-browser-bin/metadata.xml | 1 -
.../mullvad-browser-bin-13.5.2.ebuild | 27 +++++++++++++---------
2 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/www-client/mullvad-browser-bin/metadata.xml b/www-client/mullvad-browser-bin/metadata.xml
index f7b96b1a8..6c1877de5 100644
--- a/www-client/mullvad-browser-bin/metadata.xml
+++ b/www-client/mullvad-browser-bin/metadata.xml
@@ -10,6 +10,5 @@
</upstream>
<use>
<flag name="X">Add support for X11</flag>
- <flag name="wayland">Add support for screensharing on wayland</flag>
</use>
</pkgmetadata>
diff --git a/www-client/mullvad-browser-bin/mullvad-browser-bin-13.5.2.ebuild b/www-client/mullvad-browser-bin/mullvad-browser-bin-13.5.2.ebuild
index bce05f41a..dd733d29a 100644
--- a/www-client/mullvad-browser-bin/mullvad-browser-bin-13.5.2.ebuild
+++ b/www-client/mullvad-browser-bin/mullvad-browser-bin-13.5.2.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit desktop xdg
+inherit desktop optfeature toolchain-funcs xdg
DESCRIPTION="The Mullvad Browser is developed to minimize tracking and fingerprinting."
HOMEPAGE="https://github.com/mullvad/mullvad-browser https://mullvad.net/"
@@ -14,14 +14,13 @@ LICENSE="MPL-2.0"
SLOT="0"
KEYWORDS="-* ~amd64"
-IUSE="wayland +X"
+IUSE="X"
RESTRICT="bindist mirror test strip"
RDEPEND="
app-accessibility/at-spi2-core
app-misc/mime-types
- app-shells/bash
dev-libs/dbus-glib
dev-libs/glib
dev-libs/nspr
@@ -45,20 +44,20 @@ RDEPEND="
x11-libs/libXrender
x11-libs/libXt
x11-libs/libXtst
- wayland? (
- sys-apps/xdg-desktop-portal
- )"
+"
QA_PREBUILT="*"
src_install() {
# Install profiles to home dir
- touch "${S}"/mullvad-browser/Browser/is-packaged-app
+ touch "${S}"/mullvad-browser/Browser/is-packaged-app || die
# Fix desktop file vars
- sed -i "s|Name=.*|Name=Mullvad Browser|g" "${S}"/mullvad-browser/start-mullvad-browser.desktop
- sed -i "s|Exec=.*|Exec=/opt/mullvad-browser/Browser/start-mullvad-browser --detach|g" "${S}"/mullvad-browser/start-mullvad-browser.desktop
- sed -i "s|Icon=.*|Icon=mullvad-browser|g" "${S}"/mullvad-browser/start-mullvad-browser.desktop
+ sed -i \
+ -e "s|Name=.*|Name=Mullvad Browser|g" \
+ -e "s|Exec=.*|Exec=/opt/mullvad-browser/Browser/start-mullvad-browser --detach|g" \
+ -e "s|Icon=.*|Icon=mullvad-browser|g" \
+ "${S}"/mullvad-browser/start-mullvad-browser.desktop || die
# Install shim for X11. Browser doesn't seem to launch without it, see upstream issue:
# https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/issues/40565
@@ -70,7 +69,7 @@ src_install() {
void gdk_wayland_device_get_wl_pointer() { abort(); }
void gdk_wayland_window_get_wl_surface() { abort(); }
void gdk_wayland_display_get_wl_display() { abort(); }" > "${S}"/X11shim.c
- cc -shared -o "${S}"/mullvad-browser/X11shim.so "${S}"/X11shim.c
+ $(tc-getCC) -shared -o "${S}"/mullvad-browser/X11shim.so "${S}"/X11shim.c
sed -i '1iexport LD_PRELOAD=/opt/mullvad-browser/X11shim.so' "${S}"/mullvad-browser/Browser/start-mullvad-browser
fi
@@ -89,3 +88,9 @@ src_install() {
fperms +x "/opt/mullvad-browser/Browser/mullvadbrowser"
fperms +x "/opt/mullvad-browser/Browser/mullvadbrowser.real"
}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+
+ optfeature "wayland screensharing support" sys-apps/xdg-desktop-portal
+}