[gentoo-commits] repo/gentoo:master commit in: sys-apps/xdg-desktop-portal-gnome/, sys-apps/xdg-desktop-portal-gnome/files/

[gentoo-commits] repo/gentoo:master commit in: sys-apps/xdg-desktop-portal-gnome/, sys-apps/xdg-desktop-portal-gnome/files/

[David Seifert]

commit:     47a3d74dc5c3f919f857429dbbc95a11c1496fdf
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 28 20:50:16 2023 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Mar 28 20:50:16 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47a3d74d

sys-apps/xdg-desktop-portal-gnome: fix USE="-wayland" build

Closes: https://bugs.gentoo.org/903189
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 .../xdg-desktop-portal-gnome-44.0-x11-only.patch   | 36 ++++++++++++++++++++++
 .../xdg-desktop-portal-gnome-44.0.ebuild           |  6 ++++
 2 files changed, 42 insertions(+)

diff --git a/sys-apps/xdg-desktop-portal-gnome/files/xdg-desktop-portal-gnome-44.0-x11-only.patch b/sys-apps/xdg-desktop-portal-gnome/files/xdg-desktop-portal-gnome-44.0-x11-only.patch
new file mode 100644
index 000000000000..0c7af9253bae
--- /dev/null
+++ b/sys-apps/xdg-desktop-portal-gnome/files/xdg-desktop-portal-gnome-44.0-x11-only.patch
@@ -0,0 +1,36 @@
+From d19e5a66fbba22274a774ac603d2ecb3ff528779 Mon Sep 17 00:00:00 2001
+From: David Seifert <soap@gentoo.org>
+Date: Tue, 28 Mar 2023 20:42:32 +0200
+Subject: [PATCH] Do not reference wayland routines without wayland support
+
+* If GTK4 is built without Wayland support, there will be no
+  `init_external_window_wayland_display` symbol.
+
+Bug: https://bugs.gentoo.org/903189
+---
+ src/externalwindow.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/src/externalwindow.c b/src/externalwindow.c
+index c3ea3d7..f7372bb 100644
+--- a/src/externalwindow.c
++++ b/src/externalwindow.c
+@@ -90,10 +90,14 @@ init_external_window_display (GError **error)
+   const char *session_type;
+ 
+   session_type = getenv ("XDG_SESSION_TYPE");
++#ifdef HAVE_GTK_WAYLAND
+   if (g_strcmp0 (session_type, "wayland") == 0)
+     return init_external_window_wayland_display (error);
+-  else if (g_strcmp0 (session_type, "x11") == 0)
++#endif
++#ifdef HAVE_GTK_X11
++  if (g_strcmp0 (session_type, "x11") == 0)
+     return init_external_window_x11_display (error);
++#endif
+ 
+   g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
+                "Unsupported or missing session type '%s'",
+-- 
+GitLab
+

diff --git a/sys-apps/xdg-desktop-portal-gnome/xdg-desktop-portal-gnome-44.0.ebuild b/sys-apps/xdg-desktop-portal-gnome/xdg-desktop-portal-gnome-44.0.ebuild
index ef62dd2dfcc4..e902e5b3a415 100644
--- a/sys-apps/xdg-desktop-portal-gnome/xdg-desktop-portal-gnome-44.0.ebuild
+++ b/sys-apps/xdg-desktop-portal-gnome/xdg-desktop-portal-gnome-44.0.ebuild
@@ -34,6 +34,12 @@ BDEPEND="
 	wayland? ( dev-util/wayland-scanner )
 "
 
+PATCHES=(
+	# backport
+	# https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/merge_requests/83
+	"${FILESDIR}"/${P}-x11-only.patch
+)
+
 src_configure() {
 	local emesonargs=(
 		-Dsystemduserunitdir="$(systemd_get_userunitdir)"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/xdg-desktop-portal-gnome/, sys-apps/xdg-desktop-portal-gnome/files/

[Sam James]

commit:     b0fdff8c8f3c36cded1c82d80d9d955d6da94bdf
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 12 02:45:35 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Dec 12 02:45:35 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0fdff8c

sys-apps/xdg-desktop-portal-gnome: fix modern C issue

Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../xdg-desktop-portal-gnome/files/45.1-c99.patch  | 25 +++++++++++
 .../xdg-desktop-portal-gnome-45.1-r1.ebuild        | 49 ++++++++++++++++++++++
 2 files changed, 74 insertions(+)

diff --git a/sys-apps/xdg-desktop-portal-gnome/files/45.1-c99.patch b/sys-apps/xdg-desktop-portal-gnome/files/45.1-c99.patch
new file mode 100644
index 000000000000..884b0d9c15a6
--- /dev/null
+++ b/sys-apps/xdg-desktop-portal-gnome/files/45.1-c99.patch
@@ -0,0 +1,25 @@
+https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/issues/112
+https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/merge_requests/134
+
+From 5fb3c0c23ccd76c6f8239bbb66c3fb1230208d5e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Tyrychtr?= <ltyrycht@redhat.com>
+Date: Mon, 11 Dec 2023 11:36:13 +0100
+Subject: [PATCH] input-capture: Pass correct pointer type to
+ gtk_window_add_group
+
+It produced only a warning, but will be an error in the future.
+
+Fixes #112
+--- a/src/inputcapture.c
++++ b/src/inputcapture.c
+@@ -409,7 +409,7 @@ create_input_capture_dialog (GDBusMethodInvocation *invocation,
+   gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
+ 
+   window_group = gtk_window_group_new ();
+-  gtk_window_group_add_window (window_group, dialog);
++  gtk_window_group_add_window (window_group, GTK_WINDOW (dialog));
+ 
+   dialog_handle = g_new0 (InputCaptureDialogHandle, 1);
+   dialog_handle->request = g_object_ref (request);
+-- 
+GitLab

diff --git a/sys-apps/xdg-desktop-portal-gnome/xdg-desktop-portal-gnome-45.1-r1.ebuild b/sys-apps/xdg-desktop-portal-gnome/xdg-desktop-portal-gnome-45.1-r1.ebuild
new file mode 100644
index 000000000000..e4d9f570f008
--- /dev/null
+++ b/sys-apps/xdg-desktop-portal-gnome/xdg-desktop-portal-gnome-45.1-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org meson systemd xdg
+
+DESCRIPTION="Backend implementation for xdg-desktop-portal using GNOME"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+IUSE="wayland X"
+
+# Newer-than-strictly-required xdg-desktop-portal dep for hang/slowness fixes
+# https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/issues/74
+DEPEND="
+	dev-libs/glib:2
+	gnome-base/gnome-desktop:4=
+	>=gui-libs/libadwaita-1.2.0:1
+	media-libs/fontconfig
+	sys-apps/dbus
+	>=sys-apps/xdg-desktop-portal-1.17.0
+	>=sys-apps/xdg-desktop-portal-gtk-1.14.0
+	gui-libs/gtk:4[wayland?,X?]
+	X? ( x11-libs/libX11 )
+	wayland? ( dev-libs/wayland )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	dev-util/gdbus-codegen
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	wayland? ( dev-util/wayland-scanner )
+"
+
+PATCHES=(
+	"${FILESDIR}"/45.1-c99.patch
+)
+
+src_configure() {
+	local emesonargs=(
+		-Dsystemduserunitdir="$(systemd_get_userunitdir)"
+	)
+
+	meson_src_configure
+}