git: 689ee986fad8 - main - deskutils/xdg-desktop-portal: Update to 1.20.0

From: Gleb Popov <arrowd_at_FreeBSD.org>
Date: Mon, 10 Mar 2025 08:43:49 UTC
The branch main has been updated by arrowd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=689ee986fad8b7232960e3804fb09da2f6822d06

commit 689ee986fad8b7232960e3804fb09da2f6822d06
Author:     Gleb Popov <arrowd@FreeBSD.org>
AuthorDate: 2025-03-10 08:43:25 +0000
Commit:     Gleb Popov <arrowd@FreeBSD.org>
CommitDate: 2025-03-10 08:43:46 +0000

    deskutils/xdg-desktop-portal: Update to 1.20.0
    
    Reported by:    portscout!
---
 deskutils/xdg-desktop-portal/Makefile              | 16 +++++++----
 deskutils/xdg-desktop-portal/distinfo              |  6 ++--
 .../files/patch-src_xdp-app-info-flatpak.c         | 10 +++++++
 .../xdg-desktop-portal/files/patch-src_xdp-utils.c | 32 ----------------------
 deskutils/xdg-desktop-portal/pkg-plist             |  8 +++++-
 5 files changed, 31 insertions(+), 41 deletions(-)

diff --git a/deskutils/xdg-desktop-portal/Makefile b/deskutils/xdg-desktop-portal/Makefile
index 0f005c804faf..932d2a024cf3 100644
--- a/deskutils/xdg-desktop-portal/Makefile
+++ b/deskutils/xdg-desktop-portal/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	xdg-desktop-portal
-PORTVERSION=	1.18.4
+PORTVERSION=	1.20.0
 CATEGORIES=	deskutils
 
 MAINTAINER=	arrowd@FreeBSD.org
@@ -11,18 +11,24 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libfuse3.so:filesystems/fusefs-libs3 \
 		libgeoclue-2.so:net/geoclue \
+		libgudev-1.0.so.0:devel/libgudev \
 		libjson-glib-1.0.so:devel/json-glib \
 		libpipewire-0.3.so:multimedia/pipewire \
 		libportal.so:deskutils/libportal
 
-USES=		gettext-tools gmake gnome meson pkgconfig
+USES=		gettext-tools gmake gnome meson pkgconfig python:build shebangfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	flatpak
 USE_GNOME=	gdkpixbuf2 glib20
 
-MESON_ARGS=	-Ddocbook-docs=disabled -Dpytest=disabled \
-		-Dflatpak-interfaces=disabled -Dsandboxed-image-validation=false \
-		-Dsystemd=disabled
+MESON_ARGS=	-Ddocumentation=disabled \
+		-Dflatpak-interfaces=disabled \
+		-Dsandboxed-image-validation=disabled \
+		-Dsandboxed-sound-validation=disabled \
+		-Dsystemd=disabled \
+		-Dtests=disabled
+
+SHEBANG_FILES=	src/generate-method-info.py
 
 OPTIONS_DEFINE=	MANPAGES
 
diff --git a/deskutils/xdg-desktop-portal/distinfo b/deskutils/xdg-desktop-portal/distinfo
index 9200ee493e7b..575b86ed19bc 100644
--- a/deskutils/xdg-desktop-portal/distinfo
+++ b/deskutils/xdg-desktop-portal/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1713582987
-SHA256 (flatpak-xdg-desktop-portal-1.18.4_GH0.tar.gz) = 028d5aec19a7f6fdbe76d6c7cf982cbc4e4ee290493ded3a16b67dfff5cad589
-SIZE (flatpak-xdg-desktop-portal-1.18.4_GH0.tar.gz) = 823665
+TIMESTAMP = 1741594646
+SHA256 (flatpak-xdg-desktop-portal-1.20.0_GH0.tar.gz) = b596fa3dcec67e90d5a657395a17e347820095ac5616a28ba319f4d45a999792
+SIZE (flatpak-xdg-desktop-portal-1.20.0_GH0.tar.gz) = 1330779
diff --git a/deskutils/xdg-desktop-portal/files/patch-src_xdp-app-info-flatpak.c b/deskutils/xdg-desktop-portal/files/patch-src_xdp-app-info-flatpak.c
new file mode 100644
index 000000000000..9004dbe7be85
--- /dev/null
+++ b/deskutils/xdg-desktop-portal/files/patch-src_xdp-app-info-flatpak.c
@@ -0,0 +1,10 @@
+--- src/xdp-app-info-flatpak.c.orig	2025-02-19 15:48:35 UTC
++++ src/xdp-app-info-flatpak.c
+@@ -25,6 +25,7 @@
+ 
+ #include <errno.h>
+ #include <fcntl.h>
++#include <sys/mount.h>
+ #ifdef HAVE_SYS_VFS_H
+ #include <sys/vfs.h>
+ #endif
diff --git a/deskutils/xdg-desktop-portal/files/patch-src_xdp-utils.c b/deskutils/xdg-desktop-portal/files/patch-src_xdp-utils.c
deleted file mode 100644
index 30e10ea526a5..000000000000
--- a/deskutils/xdg-desktop-portal/files/patch-src_xdp-utils.c
+++ /dev/null
@@ -1,32 +0,0 @@
-Make it possible to run firefox with KDE filedialogs.
-
-The call for parse_app_info_from_flatpak_info uses the /proc/$PID/root
-file to access the flatpak information file.
-
-We neither have support for /proc/$PID/root nor flatpaks or snaps.
-
-With this fix and deskutils/plasma5-xdg-desktop-portal-kde it is now possible
-to run firefox using the KDE file dialogs.
-
-> GTK_USE_PORTAL=1 firefox
-
---- src/xdp-utils.c.orig	2023-11-22 21:48:20 UTC
-+++ src/xdp-utils.c
-@@ -587,6 +587,7 @@ parse_app_info_from_flatpak_info (int pid, GError **er
- static XdpAppInfo *
- parse_app_info_from_flatpak_info (int pid, GError **error)
- {
-+#ifndef __FreeBSD__
-   g_autofree char *root_path = NULL;
-   int root_fd = -1;
-   int info_fd = -1;
-@@ -689,6 +690,9 @@ parse_app_info_from_flatpak_info (int pid, GError **er
-   app_info->u.flatpak.keyfile = g_steal_pointer (&metadata);
- 
-   return g_steal_pointer (&app_info);
-+#else
-+  return NULL;
-+#endif // __FreeBSD__
- }
- 
- int
diff --git a/deskutils/xdg-desktop-portal/pkg-plist b/deskutils/xdg-desktop-portal/pkg-plist
index 8f3e29632c5d..0401e3748f1a 100644
--- a/deskutils/xdg-desktop-portal/pkg-plist
+++ b/deskutils/xdg-desktop-portal/pkg-plist
@@ -1,8 +1,10 @@
 libexec/xdg-desktop-portal
 libexec/xdg-desktop-portal-rewrite-launchers
 libexec/xdg-desktop-portal-validate-icon
+libexec/xdg-desktop-portal-validate-sound
 libexec/xdg-document-portal
 libexec/xdg-permission-store
+share/dbus-1/interfaces/org.freedesktop.host.portal.Registry.xml
 share/dbus-1/interfaces/org.freedesktop.impl.portal.Access.xml
 share/dbus-1/interfaces/org.freedesktop.impl.portal.Account.xml
 share/dbus-1/interfaces/org.freedesktop.impl.portal.AppChooser.xml
@@ -25,12 +27,12 @@ share/dbus-1/interfaces/org.freedesktop.impl.portal.Screenshot.xml
 share/dbus-1/interfaces/org.freedesktop.impl.portal.Secret.xml
 share/dbus-1/interfaces/org.freedesktop.impl.portal.Session.xml
 share/dbus-1/interfaces/org.freedesktop.impl.portal.Settings.xml
+share/dbus-1/interfaces/org.freedesktop.impl.portal.Usb.xml
 share/dbus-1/interfaces/org.freedesktop.impl.portal.Wallpaper.xml
 share/dbus-1/interfaces/org.freedesktop.portal.Account.xml
 share/dbus-1/interfaces/org.freedesktop.portal.Background.xml
 share/dbus-1/interfaces/org.freedesktop.portal.Camera.xml
 share/dbus-1/interfaces/org.freedesktop.portal.Clipboard.xml
-share/dbus-1/interfaces/org.freedesktop.portal.Device.xml
 share/dbus-1/interfaces/org.freedesktop.portal.Documents.xml
 share/dbus-1/interfaces/org.freedesktop.portal.DynamicLauncher.xml
 share/dbus-1/interfaces/org.freedesktop.portal.Email.xml
@@ -57,6 +59,7 @@ share/dbus-1/interfaces/org.freedesktop.portal.Secret.xml
 share/dbus-1/interfaces/org.freedesktop.portal.Session.xml
 share/dbus-1/interfaces/org.freedesktop.portal.Settings.xml
 share/dbus-1/interfaces/org.freedesktop.portal.Trash.xml
+share/dbus-1/interfaces/org.freedesktop.portal.Usb.xml
 share/dbus-1/interfaces/org.freedesktop.portal.Wallpaper.xml
 share/dbus-1/services/org.freedesktop.impl.portal.PermissionStore.service
 share/dbus-1/services/org.freedesktop.portal.Desktop.service
@@ -75,7 +78,9 @@ share/locale/hi/LC_MESSAGES/xdg-desktop-portal.mo
 share/locale/hr/LC_MESSAGES/xdg-desktop-portal.mo
 share/locale/hu/LC_MESSAGES/xdg-desktop-portal.mo
 share/locale/id/LC_MESSAGES/xdg-desktop-portal.mo
+share/locale/ie/LC_MESSAGES/xdg-desktop-portal.mo
 share/locale/it/LC_MESSAGES/xdg-desktop-portal.mo
+share/locale/ja/LC_MESSAGES/xdg-desktop-portal.mo
 share/locale/ka/LC_MESSAGES/xdg-desktop-portal.mo
 share/locale/lt/LC_MESSAGES/xdg-desktop-portal.mo
 share/locale/nl/LC_MESSAGES/xdg-desktop-portal.mo
@@ -86,6 +91,7 @@ share/locale/pt_BR/LC_MESSAGES/xdg-desktop-portal.mo
 share/locale/ro/LC_MESSAGES/xdg-desktop-portal.mo
 share/locale/ru/LC_MESSAGES/xdg-desktop-portal.mo
 share/locale/sk/LC_MESSAGES/xdg-desktop-portal.mo
+share/locale/sl/LC_MESSAGES/xdg-desktop-portal.mo
 share/locale/sr/LC_MESSAGES/xdg-desktop-portal.mo
 share/locale/sv/LC_MESSAGES/xdg-desktop-portal.mo
 share/locale/tr/LC_MESSAGES/xdg-desktop-portal.mo