commit 0dd575c1484055a9500b8accad941d853704e273 Author: Tim Biermann <tbier@posteo.de> Date: Sat Mar 19 13:31:24 2022 +0100 xdg-desktop-portal: 1.14.0 -> 1.14.1 diff --git a/xdg-desktop-portal/.signature b/xdg-desktop-portal/.signature index eabf7e3dc..5c66b1c23 100644 --- a/xdg-desktop-portal/.signature +++ b/xdg-desktop-portal/.signature @@ -1,6 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF33Zn8Gqj+lp73mR3KzitIeHqDsqeaNc0+Ou1FY/UWDw0V1b5Mj8UOE4UVxmh6RXdDEfz/jvU+QxGb8GRr0qBqQ0= -SHA256 (Pkgfile) = 9f2e0d1f97ad0f7dcb5faab6fa6a34662581b5dfd1443b71652c8e5103f99308 +RWSagIOpLGJF33NyKMBrIJfFV/ZeG2euSLRXwg7v0SL62zu6uKN5JjPoQshZpTb5KjMjMmarY7PsXyfJqOwu87pSCV2amp+1tQg= +SHA256 (Pkgfile) = ab4c106488aed8052fa0048a3c551556dd533031c5bc08afce1c399b83cf32e2 SHA256 (.footprint) = 43b629814da450243ca56fa70094f65c823a3256a5092715d740964469b117c3 -SHA256 (xdg-desktop-portal-1.14.0.tar.gz) = 864483be2ff0c8ff0eac04d6c4b9d6e8a6c711e5d1469e2baed9e4f17f11e68e -SHA256 (fix-build-without-systemd.patch) = ae0fa67a1a6f37f0b764f41684cfa6474d84a2be6fbae3033b4eaed55ab6bdbd +SHA256 (xdg-desktop-portal-1.14.1.tar.gz) = e7db0cfab023ccc6087cdc479dd1ffe29405feeca68d991c2c69c3bcc4893b32 diff --git a/xdg-desktop-portal/Pkgfile b/xdg-desktop-portal/Pkgfile index f98fc90b9..e20132d55 100644 --- a/xdg-desktop-portal/Pkgfile +++ b/xdg-desktop-portal/Pkgfile @@ -5,10 +5,9 @@ # Optional: geoclue pipewire name=xdg-desktop-portal -version=1.14.0 +version=1.14.1 release=1 -source=(https://github.com/flatpak/xdg-desktop-portal/archive/$version/$name-$versio... - fix-build-without-systemd.patch) +source=(https://github.com/flatpak/xdg-desktop-portal/archive/$version/$name-$versio...) build() { cd $name-$version @@ -16,8 +15,6 @@ build() { 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 \ diff --git a/xdg-desktop-portal/REPO b/xdg-desktop-portal/REPO deleted file mode 100644 index ae8a6a91d..000000000 --- a/xdg-desktop-portal/REPO +++ /dev/null @@ -1,3 +0,0 @@ -f:1b102c0ca6f2473406d087fb6d3a3cf8:.signature -f:e77bc0dab76408d219ed364e0e7f2308:.footprint -f:6b9c1cb79cc73b025c187999a3290a4f:Pkgfile diff --git a/xdg-desktop-portal/fix-build-without-systemd.patch b/xdg-desktop-portal/fix-build-without-systemd.patch deleted file mode 100644 index e073aeadb..000000000 --- a/xdg-desktop-portal/fix-build-without-systemd.patch +++ /dev/null @@ -1,65 +0,0 @@ -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) - {