testing/xdg-desktop-portal-wlr: new aport

2 files changed, 81 insertions, 0 deletions

diff --git a/testing/xdg-desktop-portal-wlr/0001-core-fix-error-handling-in-main.patch b/testing/xdg-desktop-portal-wlr/0001-core-fix-error-handling-in-main.patch
new file mode 100644
index 0000000000..804a97dce7
--- /dev/null
+++ b/testing/xdg-desktop-portal-wlr/0001-core-fix-error-handling-in-main.patch
@@ -0,0 +1,51 @@
+https://github.com/emersion/xdg-desktop-portal-wlr/commit/a105e0e36356fe3743975054e07318a93ec9bcb4
+From a105e0e36356fe3743975054e07318a93ec9bcb4 Mon Sep 17 00:00:00 2001
+From: Marian Buschsieweke <maribu@users.noreply.github.com>
+Date: Thu, 21 May 2020 16:44:47 +0200
+Subject: core: fix error handling in main
+
+The error handling at the `error:` label tears down the whole state. Thus, the
+state needs to be fully initialized in order for the tear down to succeed.
+Currently, if e.g. `sd_bus_open_user()` fails, a `segfault` is triggered by
+the tear down. This commit adds individual tear down code that only touches
+stuff that until that point was successfully initialized.
+---
+ src/core/main.c | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/src/core/main.c b/src/core/main.c
+index 6421b17..b86e79a 100644
+--- a/src/core/main.c
++++ b/src/core/main.c
+@@ -70,14 +70,15 @@ int main(int argc, char *argv[]) {
+        ret = sd_bus_open_user(&bus);
+        if (ret < 0) {
+                logprint(ERROR, "dbus: failed to connect to user bus: %s", strerror(-ret));
+-               goto error;
++               return EXIT_FAILURE;
+        }
+        logprint(DEBUG, "dbus: connected");
+ 
+        struct wl_display *wl_display = wl_display_connect(NULL);
+        if (!wl_display) {
+                logprint(ERROR, "wayland: failed to connect to display");
+-               goto error;
++               sd_bus_unref(bus);
++               return EXIT_FAILURE;
+        }
+        logprint(DEBUG, "wlroots: wl_display connected");
+ 
+@@ -85,7 +86,9 @@ int main(int argc, char *argv[]) {
+        struct pw_loop *pw_loop = pw_loop_new(NULL);
+        if (!pw_loop) {
+                logprint(ERROR, "pipewire: failed to create loop");
+-               goto error;
++               wl_display_disconnect(wl_display);
++               sd_bus_unref(bus);
++               return EXIT_FAILURE;
+        }
+        logprint(DEBUG, "pipewire: pw_loop created");
+ 
+-- 
+2.26.2
+
diff --git a/testing/xdg-desktop-portal-wlr/APKBUILD b/testing/xdg-desktop-portal-wlr/APKBUILD
new file mode 100644
index 0000000000..3614f36aed
--- /dev/null
+++ b/testing/xdg-desktop-portal-wlr/APKBUILD
@@ -0,0 +1,30 @@
+# Contributor: Marian Buschsieweke <marian.buschsieweke@ovgu.de>
+# Maintainer: Marian Buschsieweke <marian.buschsieweke@ovgu.de>
+pkgname=xdg-desktop-portal-wlr
+pkgver=0.1.0
+pkgrel=0
+pkgdesc="wlroots implementation of xdg-desktop-portal"
+url="https://github.com/emersion/xdg-desktop-portal-wlr"
+arch="all"
+license="MIT"
+depends="xdg-desktop-portal elogind"
+makedepends="wlroots-dev pipewire-dev meson"
+source="
+        https://github.com/emersion/xdg-desktop-portal-wlr/releases/download/v0.1.0/xdg-desktop-portal-wlr-$pkgver.tar.gz
+        0001-core-fix-error-handling-in-main.patch
+        "
+subpackages="$pkgname-dbg"
+options="!check" # No check yet
+
+build() {
+        abuild-meson build
+        ninja -C build
+}
+
+package() {
+        DESTDIR="$pkgdir" ninja -C build install
+        rm -rf "$pkgdir"/usr/lib/systemd
+}
+
+sha512sums="07ae2ba3583e53f3b0e5b97cb60cb85ae835c403906f3b214f6feedc615e3266f5a0f9dc12997802834fdeb2958f6b22c195eebe420a93b3a697460a2a4e3367  xdg-desktop-portal-wlr-0.1.0.tar.gz
+719d1a8e9f61e95bad9af068221bee0f1383bee424071459cd1a676281f663c33cad8b45604c53ede9bdaeb5bbfe26a0b6100d2349e1cff0ac3ec4e9d96102ba  0001-core-fix-error-handling-in-main.patch"