diff options
| author | Henrik Riomar <henrik.riomar@gmail.com> | 2019-02-16 19:02:38 +0100 |
|---|---|---|
| committer | Henrik Riomar <henrik.riomar@gmail.com> | 2019-02-16 20:28:15 +0100 |
| commit | 94d61c61036433fb096b2a807e5cb5ce793cf899 (patch) | |
| tree | a2e63a53b80bfc2054b301c149c5b7cc585eb213 /testing/sway | |
| parent | 8f55f7474e1df766eb0a76d09192a331b6a1f9d8 (diff) | |
| download | aports-94d61c61036433fb096b2a807e5cb5ce793cf899.tar.bz2 aports-94d61c61036433fb096b2a807e5cb5ce793cf899.tar.xz | |
testing/sway: upgrade to 1.0-rc2
Diffstat (limited to 'testing/sway')
| -rw-r--r-- | testing/sway/0001-swaylock-fix-build-with-musl-libc.patch | 34 | ||||
| -rw-r--r-- | testing/sway/APKBUILD | 18 |
2 files changed, 7 insertions, 45 deletions
diff --git a/testing/sway/0001-swaylock-fix-build-with-musl-libc.patch b/testing/sway/0001-swaylock-fix-build-with-musl-libc.patch deleted file mode 100644 index 33006eea2e..0000000000 --- a/testing/sway/0001-swaylock-fix-build-with-musl-libc.patch +++ /dev/null @@ -1,34 +0,0 @@ -From c6b2ee7291fc9dee8c79f67fe8c9a69a52b9b17c Mon Sep 17 00:00:00 2001 -From: Cameron Nemo <camerontnorman@gmail.com> -Date: Fri, 30 Nov 2018 19:58:58 -0800 -Subject: [PATCH] swaylock: fix build with musl libc - -Signed-off-by: Cameron Nemo <camerontnorman@gmail.com> ---- - swaylock/main.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/swaylock/main.c b/swaylock/main.c -index 50f145e3..9aeb4e64 100644 ---- a/swaylock/main.c -+++ b/swaylock/main.c -@@ -4,6 +4,7 @@ - #include <errno.h> - #include <fcntl.h> - #include <getopt.h> -+#include <poll.h> - #include <stdbool.h> - #include <stdio.h> - #include <stdlib.h> -@@ -961,7 +962,7 @@ int main(int argc, char **argv) { - } - - state.eventloop = loop_create(); -- loop_add_fd(state.eventloop, wl_display_get_fd(state.display), POLL_IN, -+ loop_add_fd(state.eventloop, wl_display_get_fd(state.display), POLLIN, - display_in, NULL); - - state.run_display = true; --- -2.19.2 - diff --git a/testing/sway/APKBUILD b/testing/sway/APKBUILD index d0bd5bdd6b..7a3540f5f0 100644 --- a/testing/sway/APKBUILD +++ b/testing/sway/APKBUILD @@ -1,7 +1,8 @@ +# Contributor: Henrik Riomar <henrik.riomar@gmail.com> # Maintainer: pkgname=sway -pkgver=1.0_beta2 -_pkgver=1.0-beta.2 +pkgver=1.0_rc2 +_pkgver=1.0-rc2 pkgrel=0 pkgdesc="i3 compatible window manager for Wayland" url="http://swaywm.org" @@ -12,6 +13,9 @@ depends="" makedepends="cairo-dev gdk-pixbuf-dev json-c-dev + libevdev-dev + libinput-dev + libxkbcommon-dev linux-pam-dev meson ninja @@ -24,16 +28,9 @@ makedepends="cairo-dev " subpackages="$pkgname-doc" source="$pkgname-$_pkgver.tar.gz::https://github.com/swaywm/$pkgname/archive/$_pkgver.tar.gz - 0001-swaylock-fix-build-with-musl-libc.patch " builddir="$srcdir/$pkgname-$_pkgver" -prepare() { - default_prepare - sed -i 's/login/base-auth/g' \ - swaylock/pam/swaylock.linux -} - build() { cd "$builddir" meson build --prefix /usr @@ -46,5 +43,4 @@ package() { chmod u+s "$pkgdir"/usr/bin/sway } -sha512sums="532acb6f1510578b7d9d222f04ff8104c836428ef215ddb6d7181839231d65101b3d47c8389a38f14cf59692116495b60759062ebd797edf83cf77aebaac379f sway-1.0-beta.2.tar.gz -cad753bcee43c87adcbcfdc542bd16c9fec4b67ccea3cd8ae364d640036f22306bcd0294d06d155d0b12eae11fa357fbaa8d272547f1217c7e307180654293d6 0001-swaylock-fix-build-with-musl-libc.patch" +sha512sums="78c93f2326952d9e56ebf38f5d6b646934230b1bf5fac50cf35f16b2c1753ffa31dd9ec874a05025ed0d1d828b9a8643c78e739abbcfba55301255b3d0ed4a3e sway-1.0-rc2.tar.gz" |