ports/contrib (3.7): xdg-desktop-portal: 1.12.1 -> 1.14.0

19 Mar 2022

commit 9fe0cd2f1ec195623c0a80a5e4a947b81795dd5c
Author: Tim Biermann <tbier@posteo.de>
Date:   Fri Mar 18 18:14:53 2022 +0100

    xdg-desktop-portal: 1.12.1 -> 1.14.0

diff --git a/xdg-desktop-portal/.footprint b/xdg-desktop-portal/.footprint
index 553931e11..0b714e8e7 100644
--- a/xdg-desktop-portal/.footprint
+++ b/xdg-desktop-portal/.footprint
@@ -1,6 +1,7 @@
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/lib/
 -rwxr-xr-x	root/root	usr/lib/xdg-desktop-portal
+-rwxr-xr-x	root/root	usr/lib/xdg-desktop-portal-validate-icon
 -rwxr-xr-x	root/root	usr/lib/xdg-document-portal
 -rwxr-xr-x	root/root	usr/lib/xdg-permission-store
 drwxr-xr-x	root/root	usr/share/
@@ -10,6 +11,7 @@ drwxr-xr-x	root/root	usr/share/dbus-1/interfaces/
 -rw-r--r--	root/root	usr/share/dbus-1/interfaces/org.freedesktop.impl.portal.Account.xml
 -rw-r--r--	root/root	usr/share/dbus-1/interfaces/org.freedesktop.impl.portal.AppChooser.xml
 -rw-r--r--	root/root	usr/share/dbus-1/interfaces/org.freedesktop.impl.portal.Background.xml
+-rw-r--r--	root/root	usr/share/dbus-1/interfaces/org.freedesktop.impl.portal.DynamicLauncher.xml
 -rw-r--r--	root/root	usr/share/dbus-1/interfaces/org.freedesktop.impl.portal.Email.xml
 -rw-r--r--	root/root	usr/share/dbus-1/interfaces/org.freedesktop.impl.portal.FileChooser.xml
 -rw-r--r--	root/root	usr/share/dbus-1/interfaces/org.freedesktop.impl.portal.Inhibit.xml
@@ -30,6 +32,7 @@ drwxr-xr-x	root/root	usr/share/dbus-1/interfaces/
 -rw-r--r--	root/root	usr/share/dbus-1/interfaces/org.freedesktop.portal.Camera.xml
 -rw-r--r--	root/root	usr/share/dbus-1/interfaces/org.freedesktop.portal.Device.xml
 -rw-r--r--	root/root	usr/share/dbus-1/interfaces/org.freedesktop.portal.Documents.xml
+-rw-r--r--	root/root	usr/share/dbus-1/interfaces/org.freedesktop.portal.DynamicLauncher.xml
 -rw-r--r--	root/root	usr/share/dbus-1/interfaces/org.freedesktop.portal.Email.xml
 -rw-r--r--	root/root	usr/share/dbus-1/interfaces/org.freedesktop.portal.FileChooser.xml
 -rw-r--r--	root/root	usr/share/dbus-1/interfaces/org.freedesktop.portal.FileTransfer.xml
diff --git a/xdg-desktop-portal/.signature b/xdg-desktop-portal/.signature
index b20c24b18..eabf7e3dc 100644
--- a/xdg-desktop-portal/.signature
+++ b/xdg-desktop-portal/.signature
@@ -1,5 +1,6 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF3ztknDotPuzCVFNDjHstrz4yf8TFKzB+9D4PVtaMg7Nsij8pDqjy/69UIZKgpyE2K/wyb/udCBrsF9G6xpHEFws=
-SHA256 (Pkgfile) = 485c688ce61a385acd3b6eb30f046af92616511ce23be8cb7c8e402ae691b0c6
-SHA256 (.footprint) = 004fb02940e4eb44bb3b4f8cc137fbafa4615e851d9b9f044a7316f09f63fb64
-SHA256 (xdg-desktop-portal-1.12.1.tar.gz) = bb3111dc7280a82b9ec9cf6a2cdcf5e6de99405c2769ebc5eb525f05ff31626d
+RWSagIOpLGJF33Zn8Gqj+lp73mR3KzitIeHqDsqeaNc0+Ou1FY/UWDw0V1b5Mj8UOE4UVxmh6RXdDEfz/jvU+QxGb8GRr0qBqQ0=
+SHA256 (Pkgfile) = 9f2e0d1f97ad0f7dcb5faab6fa6a34662581b5dfd1443b71652c8e5103f99308
+SHA256 (.footprint) = 43b629814da450243ca56fa70094f65c823a3256a5092715d740964469b117c3
+SHA256 (xdg-desktop-portal-1.14.0.tar.gz) = 864483be2ff0c8ff0eac04d6c4b9d6e8a6c711e5d1469e2baed9e4f17f11e68e
+SHA256 (fix-build-without-systemd.patch) = ae0fa67a1a6f37f0b764f41684cfa6474d84a2be6fbae3033b4eaed55ab6bdbd
diff --git a/xdg-desktop-portal/Pkgfile b/xdg-desktop-portal/Pkgfile
index 3eb02f208..f98fc90b9 100644
--- a/xdg-desktop-portal/Pkgfile
+++ b/xdg-desktop-portal/Pkgfile
@@ -1,24 +1,29 @@
 # Description: Desktop integration portals for sandboxed apps
 # URL: https://github.com/flatpak/xdg-desktop-portal
 # Maintainer: Tim Biermann, tbier at posteo dot de
-# Depends on: fontconfig fuse json-glib libportal
-# Optional: pipewire geoclue
+# Depends on: fontconfig fuse3 json-glib libportal
+# Optional: geoclue pipewire
 
 name=xdg-desktop-portal
-version=1.12.1
+version=1.14.0
 release=1
-source=(https://github.com/flatpak/xdg-desktop-portal/archive/$version/$name-$versio...)
+source=(https://github.com/flatpak/xdg-desktop-portal/archive/$version/$name-$versio...
+  fix-build-without-systemd.patch)
 
 build() {
   cd $name-$version
 
-  prt-get isinst pipewire && PKGMK_XDGDP+=' --enable-pipewire' ||PKGMK_XDGDP+=' --disable-pipewire'
-  prt-get isinst geoclue && PKGMK_XDGDP+=' --enable-geoclue' ||PKGMK_XDGDP+=' --disable-geoclue'
+  prt-get isinst pipewire && PKGMK_XDGDP+=' --enable-pipewire' || PKGMK_XDGDP+=' --disable-pipewire'
+  prt-get isinst geoclue && PKGMK_XDGDP+=' --enable-geoclue' || PKGMK_XDGDP+=' --disable-geoclue'
+
+  patch -Np1 -i $SRC/fix-build-without-systemd.patch
 
   NOCONFIGURE=1 ./autogen.sh
   ./configure --prefix=/usr $PKGMK_XDGDP \
     --libexecdir=/usr/lib \
-    --disable-libportal \
+    --enable-libportal \
+    --without-systemd \
+    --disable-docbook-docs \
     --disable-nls
   make
   make DESTDIR=$PKG install
diff --git a/xdg-desktop-portal/fix-build-without-systemd.patch b/xdg-desktop-portal/fix-build-without-systemd.patch
new file mode 100644
index 000000000..e073aeadb
--- /dev/null
+++ b/xdg-desktop-portal/fix-build-without-systemd.patch
@@ -0,0 +1,65 @@
+From 7deeb2f7f748afd62b7ed23f0ca623136a5c5b78 Mon Sep 17 00:00:00 2001
+From: Phaedrus Leeds <mwleeds@protonmail.com>
+Date: Fri, 18 Mar 2022 09:20:13 -0700
+Subject: [PATCH] Fix building without libsystemd
+
+---
+ src/xdp-utils.c        | 2 ++
+ src/xdp-utils.h        | 2 ++
+ tests/test-xdp-utils.c | 2 ++
+ 3 files changed, 6 insertions(+)
+
+diff --git a/src/xdp-utils.c b/src/xdp-utils.c
+index 5017af92..1de5a4ff 100644
+--- a/src/xdp-utils.c
++++ b/src/xdp-utils.c
+@@ -144,6 +144,7 @@ xdp_app_info_new (XdpAppInfoKind kind)
+   return app_info;
+ }
+ 
++#ifdef HAVE_LIBSYSTEMD
+ char *
+ _xdp_parse_app_id_from_unit_name (const char *unit)
+ {
+@@ -183,6 +184,7 @@ _xdp_parse_app_id_from_unit_name (const char *unit)
+ 
+   return g_steal_pointer (&app_id);
+ }
++#endif /* HAVE_LIBSYSTEMD */
+ 
+ void
+ set_appid_from_pid (XdpAppInfo *app_info, pid_t pid)
+diff --git a/src/xdp-utils.h b/src/xdp-utils.h
+index b0968beb..9861e739 100644
+--- a/src/xdp-utils.h
++++ b/src/xdp-utils.h
+@@ -199,7 +199,9 @@ gboolean  xdp_has_path_prefix (const char *str,
+ /* exposed for the benefit of tests */
+ int _xdp_parse_cgroup_file (FILE     *f,
+                             gboolean *is_snap);
++#ifdef HAVE_LIBSYSTEMD
+ char *_xdp_parse_app_id_from_unit_name (const char *unit);
++#endif
+ 
+ #if !GLIB_CHECK_VERSION (2, 58, 0)
+ static inline gboolean
+diff --git a/tests/test-xdp-utils.c b/tests/test-xdp-utils.c
+index 8a30b515..d0bc363c 100644
+--- a/tests/test-xdp-utils.c
++++ b/tests/test-xdp-utils.c
+@@ -127,6 +127,7 @@ test_alternate_doc_path (void)
+   xdp_set_documents_mountpoint (NULL);
+ }
+ 
++#ifdef HAVE_LIBSYSTEMD
+ static void
+ test_app_id_via_systemd_unit (void)
+ {
+@@ -166,6 +167,7 @@ test_app_id_via_systemd_unit (void)
+   g_assert_cmpstr (app_id, ==, "org.gnome.Terminal");
+   g_clear_pointer (&app_id, g_free);
+ }
++#endif /* HAVE_LIBSYSTEMD */
+ 
+ int main (int argc, char **argv)
+ {

    

crux＠crux.nu

tags

participants (1)