[gentoo-commits] repo/gentoo:master commit in: gui-libs/xdg-desktop-portal-wlr/files/, gui-libs/xdg-desktop-portal-wlr/

[gentoo-commits] repo/gentoo:master commit in: gui-libs/xdg-desktop-portal-wlr/files/, gui-libs/xdg-desktop-portal-wlr/

[Sam James]

commit:     9bd2a1aad27a3fc93543ae37a2bb2f1a7dc8867e
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 20 10:02:48 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Dec 20 10:03:28 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bd2a1aa

gui-libs/xdg-desktop-portal-wlr: add portal config file to 0.7.0-r1

Not just live.

Bug: https://bugs.gentoo.org/915702
Signed-off-by: Sam James <sam <AT> gentoo.org>

 ...dg-desktop-portal-wlr-0.7.0-portal-config.patch | 32 ++++++++++++++++++++++
 ...uild => xdg-desktop-portal-wlr-0.7.0-r1.ebuild} |  5 ++++
 .../xdg-desktop-portal-wlr-9999.ebuild             |  1 +
 3 files changed, 38 insertions(+)

diff --git a/gui-libs/xdg-desktop-portal-wlr/files/xdg-desktop-portal-wlr-0.7.0-portal-config.patch b/gui-libs/xdg-desktop-portal-wlr/files/xdg-desktop-portal-wlr-0.7.0-portal-config.patch
new file mode 100644
index 000000000000..7302ca33d064
--- /dev/null
+++ b/gui-libs/xdg-desktop-portal-wlr/files/xdg-desktop-portal-wlr-0.7.0-portal-config.patch
@@ -0,0 +1,32 @@
+https://bugs.gentoo.org/915702
+https://github.com/emersion/xdg-desktop-portal-wlr/commit/e88e00ca9bc1b2e0e91bc297ff95c882dd1829ff
+
+From e88e00ca9bc1b2e0e91bc297ff95c882dd1829ff Mon Sep 17 00:00:00 2001
+From: columbarius <co1umbarius@protonmail.com>
+Date: Wed, 10 May 2023 01:36:21 +0200
+Subject: [PATCH] contrib: Add portals config example
+
+This is an example configuration for choosing the portal implementations
+which should be used [1]. Compositors and distributions are expected to ship
+their modified version according to their choice of components.
+
+[1] https://github.com/flatpak/xdg-desktop-portal/pull/955
+---
+ contrib/wlroots-portals.conf | 7 +++++++
+ 1 file changed, 7 insertions(+)
+ create mode 100644 contrib/wlroots-portals.conf
+
+diff --git a/contrib/wlroots-portals.conf b/contrib/wlroots-portals.conf
+new file mode 100644
+index 00000000..0baa2ca4
+--- /dev/null
++++ b/contrib/wlroots-portals.conf
+@@ -0,0 +1,7 @@
++[preferred]
++# Use xdg-desktop-portal-gtk for every portal interface...
++default=gtk
++# ... except for the Screencast, Screenshot and Settings (dark/light mode) interface
++org.freedesktop.impl.portal.Screencast=wlr
++org.freedesktop.impl.portal.Screenshot=wlr
++org.freedesktop.impl.portal.Settings=darkman
+

diff --git a/gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-9999.ebuild b/gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-0.7.0-r1.ebuild
similarity index 95%
copy from gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-9999.ebuild
copy to gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-0.7.0-r1.ebuild
index 7720a78b05d2..ee4c1b0f3797 100644
--- a/gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-9999.ebuild
+++ b/gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-0.7.0-r1.ebuild
@@ -43,6 +43,10 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-portal-config.patch
+)
+
 src_configure() {
 	local emesonargs=()
 
@@ -59,6 +63,7 @@ src_configure() {
 src_install() {
 	meson_src_install
 
+	# bug #915702
 	insinto /usr/share/xdg-desktop-portal/portals
 	doins "${WORKDIR}/${P}/contrib/wlroots-portals.conf"
 }

diff --git a/gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-9999.ebuild b/gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-9999.ebuild
index 7720a78b05d2..f874a75b8fbd 100644
--- a/gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-9999.ebuild
+++ b/gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-9999.ebuild
@@ -59,6 +59,7 @@ src_configure() {
 src_install() {
 	meson_src_install
 
+	# bug #915702
 	insinto /usr/share/xdg-desktop-portal/portals
 	doins "${WORKDIR}/${P}/contrib/wlroots-portals.conf"
 }

[gentoo-commits] repo/gentoo:master commit in: gui-libs/xdg-desktop-portal-wlr/files/, gui-libs/xdg-desktop-portal-wlr/

[Sam James]

commit:     172f821ab225ba943592eb0e3745ea4fdf493902
Author:     Anna (navi) Figueiredo Gomes <navi <AT> vlhl <DOT> dev>
AuthorDate: Thu Feb 27 10:24:53 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Feb 28 12:07:10 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=172f821a

gui-libs/xdg-desktop-portal-wlr: add user initd

Signed-off-by: Anna (navi) Figueiredo Gomes <navi <AT> vlhl.dev>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../xdg-desktop-portal-wlr/files/xdg-desktop-portal-wlr.initd | 11 +++++++++++
 .../xdg-desktop-portal-wlr-0.7.1-r1.ebuild                    |  2 +-
 ...wlr-9999.ebuild => xdg-desktop-portal-wlr-0.7.1-r2.ebuild} |  4 +++-
 .../xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-9999.ebuild |  4 +++-
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/gui-libs/xdg-desktop-portal-wlr/files/xdg-desktop-portal-wlr.initd b/gui-libs/xdg-desktop-portal-wlr/files/xdg-desktop-portal-wlr.initd
new file mode 100644
index 000000000000..2b677bcc4a2e
--- /dev/null
+++ b/gui-libs/xdg-desktop-portal-wlr/files/xdg-desktop-portal-wlr.initd
@@ -0,0 +1,11 @@
+#!/sbin/openrc-run
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License, v2 or later
+
+depend() {
+	need dbus xdg-desktop-portal
+}
+
+export DBUS_SESSION_BUS_ADDRESS="unix:path=${XDG_RUNTIME_DIR}/bus"
+supervisor=supervise-daemon
+command="/usr/libexec/xdg-desktop-portal-wlr"

diff --git a/gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-0.7.1-r1.ebuild b/gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-0.7.1-r1.ebuild
index 34fb91940d89..477bfe0002ac 100644
--- a/gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-0.7.1-r1.ebuild
+++ b/gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-0.7.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8

diff --git a/gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-9999.ebuild b/gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-0.7.1-r2.ebuild
similarity index 90%
copy from gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-9999.ebuild
copy to gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-0.7.1-r2.ebuild
index 755c9937371a..a974ee84c315 100644
--- a/gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-9999.ebuild
+++ b/gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-0.7.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -62,4 +62,6 @@ src_install() {
 	# bug #915702
 	insinto /usr/share/xdg-desktop-portal
 	doins "${WORKDIR}/${P}/contrib/wlroots-portals.conf"
+	exeinto /etc/user/init.d
+	newexe "${FILESDIR}"/xdg-desktop-portal-wlr.initd xdg-desktop-portal-wlr
 }

diff --git a/gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-9999.ebuild b/gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-9999.ebuild
index 755c9937371a..a974ee84c315 100644
--- a/gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-9999.ebuild
+++ b/gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -62,4 +62,6 @@ src_install() {
 	# bug #915702
 	insinto /usr/share/xdg-desktop-portal
 	doins "${WORKDIR}/${P}/contrib/wlroots-portals.conf"
+	exeinto /etc/user/init.d
+	newexe "${FILESDIR}"/xdg-desktop-portal-wlr.initd xdg-desktop-portal-wlr
 }