aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Riomar <henrik.riomar@gmail.com>2018-12-05 14:11:25 +0100
committerHenrik Riomar <henrik.riomar@gmail.com>2018-12-05 19:46:55 +0100
commitf4fbff32e3ac214c330022d644d1a9a138fcd16f (patch)
tree4afd17790c05a8a05b53002612a50c1cc08c1dc5
parent5a3331a3c81ea705266f8ecda09ecac4a5666147 (diff)
downloadaports-f4fbff32e3ac214c330022d644d1a9a138fcd16f.tar.bz2
testing/sway: upgrade to 1.0.0-beta2
-rw-r--r--testing/sway/0001-swaylock-fix-build-with-musl-libc.patch34
-rw-r--r--testing/sway/APKBUILD47
2 files changed, 60 insertions, 21 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
new file mode 100644
index 0000000..33006ee
--- /dev/null
+++ b/testing/sway/0001-swaylock-fix-build-with-musl-libc.patch
@@ -0,0 +1,34 @@
+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 438a3a1..d0bd5bd 100644
--- a/testing/sway/APKBUILD
+++ b/testing/sway/APKBUILD
@@ -1,45 +1,50 @@
# Maintainer:
pkgname=sway
-pkgver=0.15.2
-pkgrel=1
+pkgver=1.0_beta2
+_pkgver=1.0-beta.2
+pkgrel=0
pkgdesc="i3 compatible window manager for Wayland"
url="http://swaywm.org"
arch="all"
license="MIT"
options="suid !check"
depends=""
-makedepends="asciidoc cmake dbus-dev gdk-pixbuf-dev json-c-dev libcap-dev libinput-dev
- linux-pam-dev pango-dev wayland-dev wlc-dev"
+makedepends="cairo-dev
+ gdk-pixbuf-dev
+ json-c-dev
+ linux-pam-dev
+ meson
+ ninja
+ pango-dev
+ pcre2-dev
+ scdoc
+ wayland-dev
+ wayland-protocols
+ wlroots-dev
+ "
subpackages="$pkgname-doc"
-source="$pkgname-$pkgver.tar.gz::https://github.com/SirCmpwn/$pkgname/archive/$pkgver.tar.gz"
-builddir="$srcdir/$pkgname-$pkgver"
+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
+ swaylock/pam/swaylock.linux
}
build() {
cd "$builddir"
- cmake . \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_SYSCONFDIR=/etc \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DVERSION="$pkgver"
- make
+ meson build --prefix /usr
+ ninja -C build
}
package() {
cd "$builddir"
- make DESTDIR="$pkgdir/" install
-
+ DESTDIR="$pkgdir" ninja -C build install
chmod u+s "$pkgdir"/usr/bin/sway
-
- local i; for i in 1 5 7; do
- install -Dm644 bin/*.$i \
- "$pkgdir"/usr/share/man/man$i/
- done
}
-sha512sums="c457ace514f5c69ebd366d313cce93a76b199bb51c7540debc9c0586bff490401e6374f9725c784474afdfcca15bcab686a972c6c178117e45e2de83825ed370 sway-0.15.2.tar.gz"
+sha512sums="532acb6f1510578b7d9d222f04ff8104c836428ef215ddb6d7181839231d65101b3d47c8389a38f14cf59692116495b60759062ebd797edf83cf77aebaac379f sway-1.0-beta.2.tar.gz
+cad753bcee43c87adcbcfdc542bd16c9fec4b67ccea3cd8ae364d640036f22306bcd0294d06d155d0b12eae11fa357fbaa8d272547f1217c7e307180654293d6 0001-swaylock-fix-build-with-musl-libc.patch"