diff options
author | omni <omni+alpine@hack.org> | 2021-03-11 13:10:55 +0000 |
---|---|---|
committer | Leo <thinkabit.ukim@gmail.com> | 2021-03-11 16:14:18 +0000 |
commit | e4312dbae2db001f0df21c09e0bcc509c5007d43 (patch) | |
tree | cd0427c8845f7ac44d0c1d0b445731f9605f1e22 | |
parent | 685196929c0f028acb4b67cc6a3b5b1a15b661b4 (diff) |
testing/xdg-desktop-portal-wlr: upgrade to 0.2.0
- remove patch, fixed upstream
- remove elogind dependency, add elogind-dev build dependency
- sort options and fix source url
-rw-r--r-- | testing/xdg-desktop-portal-wlr/0001-core-fix-error-handling-in-main.patch | 51 | ||||
-rw-r--r-- | testing/xdg-desktop-portal-wlr/APKBUILD | 18 |
2 files changed, 7 insertions, 62 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 deleted file mode 100644 index 804a97dce78..00000000000 --- a/testing/xdg-desktop-portal-wlr/0001-core-fix-error-handling-in-main.patch +++ /dev/null @@ -1,51 +0,0 @@ -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 index c60c2140ffd..d0ed35dbe53 100644 --- a/testing/xdg-desktop-portal-wlr/APKBUILD +++ b/testing/xdg-desktop-portal-wlr/APKBUILD @@ -1,20 +1,17 @@ # Contributor: Marian Buschsieweke <marian.buschsieweke@ovgu.de> # Maintainer: Marian Buschsieweke <marian.buschsieweke@ovgu.de> pkgname=xdg-desktop-portal-wlr -pkgver=0.1.0 -pkgrel=1 +pkgver=0.2.0 +pkgrel=0 pkgdesc="wlroots implementation of xdg-desktop-portal" url="https://github.com/emersion/xdg-desktop-portal-wlr" arch="all !mips !mips64 !s390x" # xdg-desktop-portal->flatpak->polkit, s390x: pipewire 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" +depends="xdg-desktop-portal" +makedepends="wlroots-dev pipewire-dev elogind-dev meson" options="!check" # No check yet +subpackages="$pkgname-dbg" +source="https://github.com/emersion/xdg-desktop-portal-wlr/releases/download/v$pkgver/xdg-desktop-portal-wlr-$pkgver.tar.gz" build() { abuild-meson build @@ -26,5 +23,4 @@ package() { 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" +sha512sums="9b01919b380510389710c005901810ac6fa00299f2b35a37fa949aab361438ab08c30fc95b88e1805dcea7e97ebe2d19111693f82eee545864077347d2659ca9 xdg-desktop-portal-wlr-0.2.0.tar.gz" |