diff --git a/deskutils/xdg-desktop-portal/Makefile b/deskutils/xdg-desktop-portal/Makefile index 7b9cbb6c52f9..5c0d515c51ae 100644 --- a/deskutils/xdg-desktop-portal/Makefile +++ b/deskutils/xdg-desktop-portal/Makefile @@ -1,45 +1,48 @@ PORTNAME= xdg-desktop-portal -DISTVERSION= 1.20.3 +DISTVERSION= 1.22.1 CATEGORIES= deskutils MAINTAINER= arrowd@FreeBSD.org COMMENT= Portal frontend service for Flatpak WWW= https://github.com/flatpak/xdg-desktop-portal/ LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libfuse3.so:filesystems/fusefs-libs3 \ libgeoclue-2.so:net/geoclue \ libgudev-1.0.so:devel/libgudev \ libjson-glib-1.0.so:devel/json-glib \ libpipewire-0.3.so:multimedia/pipewire \ libportal.so:deskutils/libportal USES= cpe gettext-tools gmake gnome gstreamer meson pkgconfig \ python:build shebangfix USE_GITHUB= yes GH_ACCOUNT= flatpak USE_GNOME= gdkpixbuf glib20 +USE_GITLAB= nodefault +GL_TUPLE= https://gitlab.gnome.org:arrowd:libglnx:c210033e145361b5f5125d79dff4f901c01aa3f7:libglnx/subprojects/libglnx \ + https://gitlab.gnome.org:GNOME:gvdb:c6f2359cc1d00f16e0a0e2527fa0bc1882b8b5ab:gvdb/subprojects/gvdb SHEBANG_FILES= src/generate-method-info.py MESON_ARGS= -Ddocumentation=disabled \ -Dflatpak-interfaces=disabled \ -Dsandboxed-image-validation=disabled \ -Dsandboxed-sound-validation=disabled \ -Dsystemd=disabled \ -Dtests=disabled OPTIONS_DEFINE= MANPAGES OPTIONS_SUB= yes MANPAGES_BUILD_DEPENDS= rst2man:textproc/py-docutils MANPAGES_MESON_ENABLED= man-pages CPE_VENDOR= flatpak post-install: @${RM} -r ${STAGEDIR}${PREFIX}/lib/systemd .include diff --git a/deskutils/xdg-desktop-portal/distinfo b/deskutils/xdg-desktop-portal/distinfo index 9f7bf2de7c46..ea5ac4f9f7a7 100644 --- a/deskutils/xdg-desktop-portal/distinfo +++ b/deskutils/xdg-desktop-portal/distinfo @@ -1,3 +1,7 @@ -TIMESTAMP = 1753610488 -SHA256 (flatpak-xdg-desktop-portal-1.20.3_GH0.tar.gz) = 01d2a8ceaab06fa1d0638abe541dbb415a0a19be271d9669a93ec1640f87ea4a -SIZE (flatpak-xdg-desktop-portal-1.20.3_GH0.tar.gz) = 1337615 +TIMESTAMP = 1789110977 +SHA256 (flatpak-xdg-desktop-portal-1.22.1_GH0.tar.gz) = 5afeda953c3743efaa1160e73d62c5bfcac2ceca60e0e134e9b48ed651783625 +SIZE (flatpak-xdg-desktop-portal-1.22.1_GH0.tar.gz) = 1376338 +SHA256 (arrowd-libglnx-c210033e145361b5f5125d79dff4f901c01aa3f7_GL0.tar.gz) = 4fdc4bf83d63ef80e05f2528f7f17f7eb51580da5910bf72bb0e3475c2c0bb61 +SIZE (arrowd-libglnx-c210033e145361b5f5125d79dff4f901c01aa3f7_GL0.tar.gz) = 92078 +SHA256 (GNOME-gvdb-c6f2359cc1d00f16e0a0e2527fa0bc1882b8b5ab_GL0.tar.gz) = 14f082f122eb4e495e2ac96f235efb01525ae5d4a1f0fd98148b4f7c7f95ccd2 +SIZE (GNOME-gvdb-c6f2359cc1d00f16e0a0e2527fa0bc1882b8b5ab_GL0.tar.gz) = 26318 diff --git a/deskutils/xdg-desktop-portal/files/patch-document-portal_document-portal-fuse.c b/deskutils/xdg-desktop-portal/files/patch-document-portal_document-portal-fuse.c deleted file mode 100644 index d5cc842cec19..000000000000 --- a/deskutils/xdg-desktop-portal/files/patch-document-portal_document-portal-fuse.c +++ /dev/null @@ -1,21 +0,0 @@ ---- document-portal/document-portal-fuse.c.orig 2025-05-20 17:07:14 UTC -+++ document-portal/document-portal-fuse.c -@@ -429,14 +429,18 @@ renameat2_flags_to_string (int flags) - #if HAVE_RENAMEAT2 - GString *s = g_string_new (""); - -+#ifdef RENAME_EXCHANGE - if (flags & RENAME_EXCHANGE) - g_string_append (s, "EXCHANGE,"); -+#endif - - if (flags & RENAME_NOREPLACE) - g_string_append (s, "NOREPLACE,"); - -+#ifdef RENAME_WHITEOUT - if (flags & RENAME_WHITEOUT) - g_string_append (s, "WHITEOUT,"); -+#endif - - /* Remove last comma */ - if (s->len > 0) 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 index 87b1b0af66f4..4d36840fad5e 100644 --- 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 @@ -1,21 +1,21 @@ ---- src/xdp-app-info-flatpak.c.orig 2025-02-19 15:48:35 UTC +--- src/xdp-app-info-flatpak.c.orig 2026-06-17 16:46:28 UTC +++ src/xdp-app-info-flatpak.c -@@ -25,6 +25,7 @@ +@@ -27,6 +27,7 @@ #include #include +#include - #ifdef HAVE_SYS_VFS_H - #include - #endif -@@ -643,6 +644,10 @@ open_flatpak_info (int pid, + + #include + +@@ -645,6 +646,10 @@ open_flatpak_info (int pid, open_flatpak_info (int pid, GError **error) { + g_set_error (error, XDP_APP_INFO_ERROR, XDP_APP_INFO_ERROR_WRONG_APP_KIND, + "Certainly not a flatpak"); + return -1; + g_autofree char *root_path = NULL; g_autofd int root_fd = -1; g_autofd int info_fd = -1; diff --git a/deskutils/xdg-desktop-portal/files/patch-src_xdp-app-info-linyaps.c b/deskutils/xdg-desktop-portal/files/patch-src_xdp-app-info-linyaps.c new file mode 100644 index 000000000000..075446bc6a39 --- /dev/null +++ b/deskutils/xdg-desktop-portal/files/patch-src_xdp-app-info-linyaps.c @@ -0,0 +1,21 @@ +--- src/xdp-app-info-linyaps.c.orig 2026-06-17 16:46:28 UTC ++++ src/xdp-app-info-linyaps.c +@@ -26,6 +26,7 @@ + + #include + #include ++#include + + #if HAVE_SYS_VFS_H + #include +@@ -117,6 +118,10 @@ open_linyaps_info (int pid, + g_autofree char *root_path = NULL; + g_autofd int root_fd = -1; + g_autofd int info_fd = -1; ++ ++ g_set_error (error, XDP_APP_INFO_ERROR, XDP_APP_INFO_ERROR_WRONG_APP_KIND, ++ "Certainly not a linyaps"); ++ return -1; + + root_path = g_strdup_printf ("/proc/%u/root", pid); + root_fd = openat (AT_FDCWD, root_path, O_RDONLY | O_NONBLOCK | O_DIRECTORY | O_CLOEXEC | O_NOCTTY); diff --git a/deskutils/xdg-desktop-portal/files/patch-src_xdp-utils.c b/deskutils/xdg-desktop-portal/files/patch-src_xdp-utils.c new file mode 100644 index 000000000000..9a6a88c81d7e --- /dev/null +++ b/deskutils/xdg-desktop-portal/files/patch-src_xdp-utils.c @@ -0,0 +1,11 @@ +--- src/xdp-utils.c.orig 2026-06-17 16:46:28 UTC ++++ src/xdp-utils.c +@@ -54,7 +54,7 @@ pidfd_open (pid_t pid, + pidfd_open (pid_t pid, + unsigned int flags) + { +- return syscall (SYS_pidfd_open, pid, flags); ++ return -1; + } + #endif + diff --git a/deskutils/xdg-desktop-portal/pkg-plist b/deskutils/xdg-desktop-portal/pkg-plist index 27b14c01066c..5b95ca89c166 100644 --- a/deskutils/xdg-desktop-portal/pkg-plist +++ b/deskutils/xdg-desktop-portal/pkg-plist @@ -1,103 +1,106 @@ 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 share/dbus-1/interfaces/org.freedesktop.impl.portal.Background.xml share/dbus-1/interfaces/org.freedesktop.impl.portal.Clipboard.xml share/dbus-1/interfaces/org.freedesktop.impl.portal.DynamicLauncher.xml share/dbus-1/interfaces/org.freedesktop.impl.portal.Email.xml share/dbus-1/interfaces/org.freedesktop.impl.portal.FileChooser.xml share/dbus-1/interfaces/org.freedesktop.impl.portal.GlobalShortcuts.xml share/dbus-1/interfaces/org.freedesktop.impl.portal.Inhibit.xml share/dbus-1/interfaces/org.freedesktop.impl.portal.InputCapture.xml share/dbus-1/interfaces/org.freedesktop.impl.portal.Lockdown.xml share/dbus-1/interfaces/org.freedesktop.impl.portal.Notification.xml share/dbus-1/interfaces/org.freedesktop.impl.portal.PermissionStore.xml share/dbus-1/interfaces/org.freedesktop.impl.portal.Print.xml share/dbus-1/interfaces/org.freedesktop.impl.portal.RemoteDesktop.xml share/dbus-1/interfaces/org.freedesktop.impl.portal.Request.xml share/dbus-1/interfaces/org.freedesktop.impl.portal.ScreenCast.xml 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.Documents.xml share/dbus-1/interfaces/org.freedesktop.portal.DynamicLauncher.xml share/dbus-1/interfaces/org.freedesktop.portal.Email.xml share/dbus-1/interfaces/org.freedesktop.portal.FileChooser.xml share/dbus-1/interfaces/org.freedesktop.portal.FileTransfer.xml share/dbus-1/interfaces/org.freedesktop.portal.GameMode.xml share/dbus-1/interfaces/org.freedesktop.portal.GlobalShortcuts.xml share/dbus-1/interfaces/org.freedesktop.portal.Inhibit.xml share/dbus-1/interfaces/org.freedesktop.portal.InputCapture.xml share/dbus-1/interfaces/org.freedesktop.portal.Location.xml share/dbus-1/interfaces/org.freedesktop.portal.MemoryMonitor.xml share/dbus-1/interfaces/org.freedesktop.portal.NetworkMonitor.xml share/dbus-1/interfaces/org.freedesktop.portal.Notification.xml share/dbus-1/interfaces/org.freedesktop.portal.OpenURI.xml share/dbus-1/interfaces/org.freedesktop.portal.PowerProfileMonitor.xml share/dbus-1/interfaces/org.freedesktop.portal.Print.xml share/dbus-1/interfaces/org.freedesktop.portal.ProxyResolver.xml share/dbus-1/interfaces/org.freedesktop.portal.Realtime.xml share/dbus-1/interfaces/org.freedesktop.portal.RemoteDesktop.xml share/dbus-1/interfaces/org.freedesktop.portal.Request.xml share/dbus-1/interfaces/org.freedesktop.portal.ScreenCast.xml share/dbus-1/interfaces/org.freedesktop.portal.Screenshot.xml 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 share/dbus-1/services/org.freedesktop.portal.Documents.service +share/locale/ar/LC_MESSAGES/xdg-desktop-portal.mo share/locale/be/LC_MESSAGES/xdg-desktop-portal.mo share/locale/bg/LC_MESSAGES/xdg-desktop-portal.mo share/locale/ca/LC_MESSAGES/xdg-desktop-portal.mo share/locale/cs/LC_MESSAGES/xdg-desktop-portal.mo share/locale/da/LC_MESSAGES/xdg-desktop-portal.mo share/locale/de/LC_MESSAGES/xdg-desktop-portal.mo share/locale/en_GB/LC_MESSAGES/xdg-desktop-portal.mo share/locale/es/LC_MESSAGES/xdg-desktop-portal.mo share/locale/fr/LC_MESSAGES/xdg-desktop-portal.mo share/locale/gl/LC_MESSAGES/xdg-desktop-portal.mo share/locale/he/LC_MESSAGES/xdg-desktop-portal.mo 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/kk/LC_MESSAGES/xdg-desktop-portal.mo share/locale/lt/LC_MESSAGES/xdg-desktop-portal.mo share/locale/nl/LC_MESSAGES/xdg-desktop-portal.mo share/locale/oc/LC_MESSAGES/xdg-desktop-portal.mo share/locale/pl/LC_MESSAGES/xdg-desktop-portal.mo share/locale/pt/LC_MESSAGES/xdg-desktop-portal.mo 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/sr@latin/LC_MESSAGES/xdg-desktop-portal.mo share/locale/sv/LC_MESSAGES/xdg-desktop-portal.mo share/locale/tr/LC_MESSAGES/xdg-desktop-portal.mo share/locale/uk/LC_MESSAGES/xdg-desktop-portal.mo share/locale/zh_CN/LC_MESSAGES/xdg-desktop-portal.mo share/locale/zh_TW/LC_MESSAGES/xdg-desktop-portal.mo %%MANPAGES%%share/man/man5/portals.conf.5.gz share/pkgconfig/xdg-desktop-portal.pc