mirrors/aports
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2026-05-05 04:16:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

community/cage: fix build with wlroots >= 0.9.0

Browse Source 
See https://github.com/Hjdskes/cage/issues/89
This commit is contained in:
Sören Tempel 2020-02-21 20:29:30 +01:00
parent dcf16f1d23
commit 092f0591dd
2 changed files with 36 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
community/cage/0001-Removed-destructors-per-wlroots-PR-1915.patch Normal file
View File

@ -0,0 +1,29 @@
From 808cd777963e30e1271e0300364a4365ece9b088 Mon Sep 17 00:00:00 2001
From: Derek Wallace <derek.wallace@nikolamotor.com>
Date: Mon, 9 Dec 2019 15:15:00 -0700
Subject: [PATCH] Removed destructors per wlroots PR 1915
---
cage.c | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/cage.c b/cage.c
index 9c7098a..a701b28 100644
--- a/cage.c
+++ b/cage.c
@@ -374,15 +374,6 @@ end:
wl_event_source_remove(sigint_source);
wl_event_source_remove(sigterm_source);
seat_destroy(server.seat);
- wlr_server_decoration_manager_destroy(server_decoration_manager);
- wlr_xdg_decoration_manager_v1_destroy(xdg_decoration_manager);
- wlr_xdg_shell_destroy(xdg_shell);
- wlr_idle_inhibit_v1_destroy(server.idle_inhibit_v1);
- if (server.idle) {
- wlr_idle_destroy(server.idle);
- }
- wlr_data_device_manager_destroy(data_device_mgr);
- wlr_compositor_destroy(compositor);
wlr_output_layout_destroy(server.output_layout);
/* This function is not null-safe, but we only ever get here
with a proper wl_display. */

10
community/cage/APKBUILD
View File

@ -10,10 +10,13 @@ license="MIT"
depends="xorg-server-xwayland"
makedepends="meson cmake wlroots-dev wayland-protocols"
options="!check" #No checks
source="$pkgname"-"$pkgver".tar.gz::https://github.com/Hjdskes/cage/archive/v"$pkgver".tar.gz
source="$pkgname-$pkgver.tar.gz::https://github.com/Hjdskes/cage/archive/v$pkgver.tar.gz
0001-Removed-destructors-per-wlroots-PR-1915.patch"
prepare() {
meson --buildtype=plain -Dxwayland=true --prefix /usr "$srcdir/build"
default_prepare
meson --buildtype=plain -Dxwayland=true \
--prefix /usr "$srcdir/build"
}
build() {
@ -24,4 +27,5 @@ package() {
DESTDIR="$pkgdir" ninja -C "$srcdir/build" install
}
sha512sums="f071f04f1ff7d2b89ae72238ef1a28fd3fbc389803e4a4fe0c3d938c7a2a1cc962b63929d081d975f98131ff6dd9637762e8036bb320277e2580f0cbeb0c6201 cage-0.1.1.tar.gz"
sha512sums="f071f04f1ff7d2b89ae72238ef1a28fd3fbc389803e4a4fe0c3d938c7a2a1cc962b63929d081d975f98131ff6dd9637762e8036bb320277e2580f0cbeb0c6201 cage-0.1.1.tar.gz
1de44027277095786341b15a27bece111105155552d6ca6d27510f30acd921f1a9218ca76e3573e95995540128a076f99b3be219421ae09764f3045fb0638a5a 0001-Removed-destructors-per-wlroots-PR-1915.patch"