aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--testing/sway/APKBUILD21
-rw-r--r--testing/sway/stdint.patch10
2 files changed, 9 insertions, 22 deletions
diff --git a/testing/sway/APKBUILD b/testing/sway/APKBUILD
index 9e061fd7e1f..0e4554c1ea4 100644
--- a/testing/sway/APKBUILD
+++ b/testing/sway/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer:
pkgname=sway
-pkgver=0.13.0
+pkgver=0.15.0
pkgrel=0
pkgdesc="i3 compatible window manager for Wayland"
url="http://swaywm.org"
@@ -8,15 +8,14 @@ arch="all"
license="MIT"
options="suid !check"
depends=""
-makedepends="asciidoc cmake gdk-pixbuf-dev json-c-dev libcap-dev libinput-dev
+makedepends="asciidoc cmake dbus-dev gdk-pixbuf-dev json-c-dev libcap-dev libinput-dev
linux-pam-dev pango-dev wayland-dev wlc-dev"
subpackages="$pkgname-doc"
-source="$pkgname-$pkgver.tar.gz::https://github.com/SirCmpwn/$pkgname/archive/$pkgver.tar.gz
- stdint.patch"
+source="$pkgname-$pkgver.tar.gz::https://github.com/SirCmpwn/$pkgname/archive/$pkgver.tar.gz"
builddir="$srcdir/$pkgname-$pkgver"
prepare() {
- default_prepare || return 1
+ default_prepare
cd "$builddir"
sed -i 's/login/base-auth/g' swaylock/pam/swaylock
@@ -28,22 +27,20 @@ build() {
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_SYSCONFDIR=/etc \
-DCMAKE_INSTALL_PREFIX=/usr \
- -DVERSION="$pkgver" \
- || return 1
+ -DVERSION="$pkgver"
make
}
package() {
cd "$builddir"
- make DESTDIR="$pkgdir/" install || return 1
+ make DESTDIR="$pkgdir/" install
- chmod u+s "$pkgdir"/usr/bin/sway || return 1
+ 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/ || return 1
+ "$pkgdir"/usr/share/man/man$i/
done
}
-sha512sums="7f137e103bb278777ee3e36b40446156ee02bfbba3ce099b23b093751832a67155cd9519f7583364608d584d2d7c9206a8945f2114ae58220b47bd0f1ff362e8 sway-0.13.0.tar.gz
-4967a6b1552a47be1ee978e2d9c590fc3748670fb321afb8c7a6134bc0cb237b5b98ce00f777e02ac6029265c690910a1688a0f56ff2f3125bd663f9444b737c stdint.patch"
+sha512sums="2ac448f16cae83563b4ed7039b355c238cdf45bf16af58002c56781fbbac640a5b61b2fd05eb8bcfea5cc06a65707a48e093a68e80be44c14cf1d5d0a9410331 sway-0.15.0.tar.gz"
diff --git a/testing/sway/stdint.patch b/testing/sway/stdint.patch
deleted file mode 100644
index 5c72680d450..00000000000
--- a/testing/sway/stdint.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- sway-0.13.0/wayland/pango.c.orig
-+++ sway-0.13.0/wayland/pango.c
-@@ -4,6 +4,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <stdio.h>
-+#include <stdint.h>
- #include <stdbool.h>
- #include "log.h"
-