aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntoine Fontaine <antoine.fontaine@epfl.ch>2020-04-20 19:58:48 +0200
committerLeo <thinkabit.ukim@gmail.com>2020-04-20 20:04:49 +0000
commitbfec915c0dffc7bc6007f793aa2f4b9519f84d65 (patch)
tree57b15d489db4d56b03fa5f22ac82afba422bc9bf
parentc91b1d49b496c404bc7d431ccd99a6c4ade23e9a (diff)
downloadaports-bfec915c0dffc7bc6007f793aa2f4b9519f84d65.tar.gz
aports-bfec915c0dffc7bc6007f793aa2f4b9519f84d65.tar.bz2
aports-bfec915c0dffc7bc6007f793aa2f4b9519f84d65.tar.xz
community/cage: upgrade to 2020-04-17
it adds support for latest wlroots version and fix https://gitlab.alpinelinux.org/alpine/aports/issues/11418.
-rw-r--r--community/cage/0001-Removed-destructors-per-wlroots-PR-1915.patch29
-rw-r--r--community/cage/APKBUILD11
2 files changed, 6 insertions, 34 deletions
diff --git a/community/cage/0001-Removed-destructors-per-wlroots-PR-1915.patch b/community/cage/0001-Removed-destructors-per-wlroots-PR-1915.patch
deleted file mode 100644
index 343573668e..0000000000
--- a/community/cage/0001-Removed-destructors-per-wlroots-PR-1915.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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. */
diff --git a/community/cage/APKBUILD b/community/cage/APKBUILD
index 0c533e5723..64df3e7e40 100644
--- a/community/cage/APKBUILD
+++ b/community/cage/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Will Sinatra <wpsinatra@gmail.com>
# Contributor: Will Sinatra <wpsinatra@gmail.com>
pkgname=cage
-pkgver=0.1.1
+pkgver=0.1.1_git20200417
pkgrel=4
pkgdesc="A Wayland Kiosk"
url="https://www.hjdskes.nl/projects/cage/"
@@ -10,8 +10,10 @@ license="MIT"
depends="xorg-server-xwayland"
makedepends="meson wlroots-dev wayland-protocols"
options="!check" # no test suite
-source="$pkgname-$pkgver.tar.gz::https://github.com/Hjdskes/cage/archive/v$pkgver.tar.gz
- 0001-Removed-destructors-per-wlroots-PR-1915.patch"
+_commit="6eb693c05b5b34d4ed5ad8234a9f79a14ac8e07d"
+source="$pkgname-$_commit.tar.gz::https://github.com/Hjdskes/cage/archive/$_commit.tar.gz
+ "
+builddir="$srcdir/cage-$_commit"
build() {
meson \
@@ -26,5 +28,4 @@ package() {
DESTDIR="$pkgdir" ninja -C build install
}
-sha512sums="f071f04f1ff7d2b89ae72238ef1a28fd3fbc389803e4a4fe0c3d938c7a2a1cc962b63929d081d975f98131ff6dd9637762e8036bb320277e2580f0cbeb0c6201 cage-0.1.1.tar.gz
-1de44027277095786341b15a27bece111105155552d6ca6d27510f30acd921f1a9218ca76e3573e95995540128a076f99b3be219421ae09764f3045fb0638a5a 0001-Removed-destructors-per-wlroots-PR-1915.patch"
+sha512sums="0fa39171f75ff691d6383aede8f2b80e951fb22af0d6af5632baa3170c71cd95ba6a28d29b530bbec9a4be1115701d8873d5b4777c8a10db4b50f34caf9bb0b3 cage-6eb693c05b5b34d4ed5ad8234a9f79a14ac8e07d.tar.gz"