aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorSören Tempel <soeren+git@soeren-tempel.net>2016-08-15 15:59:47 +0200
committerSören Tempel <soeren+git@soeren-tempel.net>2016-08-15 16:09:14 +0200
commitf40ce0ba93c3e086c60fd1ed68116a9b8bf87baf (patch)
treea6446d9654b895106dd0f42ebe1318e33eb8f248 /main
parent50958027561684ccb76662a50ce1b8ac720e6544 (diff)
downloadaports-f40ce0ba93c3e086c60fd1ed68116a9b8bf87baf.tar.bz2
aports-f40ce0ba93c3e086c60fd1ed68116a9b8bf87baf.tar.xz
main/wayland: upgrade to 1.11.0
Diffstat (limited to 'main')
-rw-r--r--main/wayland/APKBUILD23
-rw-r--r--main/wayland/musl-fixes.patch11
2 files changed, 25 insertions, 9 deletions
diff --git a/main/wayland/APKBUILD b/main/wayland/APKBUILD
index 0701c56d14..5c2881ef09 100644
--- a/main/wayland/APKBUILD
+++ b/main/wayland/APKBUILD
@@ -2,7 +2,7 @@
# Contributor: Bartłomiej Piotrowski <bpiotrowski@alpinelinux.org>
# Maintainer:
pkgname=wayland
-pkgver=1.10.0
+pkgver=1.11.0
pkgrel=0
pkgdesc="A computer display server protocol"
url="http://wayland.freedesktop.org"
@@ -13,12 +13,14 @@ depends_dev="libffi-dev expat-dev"
makedepends="$depends_dev doxygen xmlto graphviz grep libxml2-dev"
install=""
subpackages="$pkgname-dev $pkgname-doc"
-source="http://wayland.freedesktop.org/releases/$pkgname-$pkgver.tar.xz"
+source="http://wayland.freedesktop.org/releases/$pkgname-$pkgver.tar.xz
+ musl-fixes.patch"
-_builddir="$srcdir"/$pkgname-$pkgver
-build() {
- cd "$_builddir"
+patch_args="-p0"
+builddir="$srcdir"/$pkgname-$pkgver
+build() {
+ cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -33,10 +35,13 @@ build() {
}
package() {
- cd "$_builddir"
+ cd "$builddir"
make DESTDIR="$pkgdir" install || return 1
}
-md5sums="e7751c38807c231afaba9d6b68f2a2b7 wayland-1.10.0.tar.xz"
-sha256sums="4bf6e790aa6f50ab3825676282ecd75850ec9c4767af96ecb7127b1f3c3d60dc wayland-1.10.0.tar.xz"
-sha512sums="772e89bdfa494bc263b5c6c4692784738e55a6c6196d5a8e6180f269e0c2d7592f159efb0dca1b1489273e14ba8cda16f5522e58fc9824beff8688f11a00f985 wayland-1.10.0.tar.xz"
+md5sums="fccf680be066e234729d5b69e0bd0fa9 wayland-1.11.0.tar.xz
+e88e7885ee4c6bba978bfe9d53b1342d musl-fixes.patch"
+sha256sums="9540925f7928becfdf5e3b84c70757f6589bf1ceef09bea78784d8e4772c0db0 wayland-1.11.0.tar.xz
+cd23fb565a3b0d32266500214c984ddd371911eab2e0db226a5055ceccae90d6 musl-fixes.patch"
+sha512sums="c8a0c927b6e095707a58398fe545ed708f4c808a70920c1f82c79d4275e6137cdf9926c0f18227faba511f717f4db4dfee9528075e00ec600ea44b97479471dd wayland-1.11.0.tar.xz
+9ef7f9298b2967135c3a8dcc94f77f042478fbf326455fe0a7018cc0500827f54b1fbc597b6e9609d845b3feb5e6b7da4b1783a2ec7ad84a9fe377a3e9a82dcc musl-fixes.patch"
diff --git a/main/wayland/musl-fixes.patch b/main/wayland/musl-fixes.patch
new file mode 100644
index 0000000000..9e49a56ddc
--- /dev/null
+++ b/main/wayland/musl-fixes.patch
@@ -0,0 +1,11 @@
+--- src/scanner.c.orig 2016-06-01 07:24:27.293294492 +0200
++++ src/scanner.c 2016-06-01 07:25:01.861658088 +0200
+@@ -808,7 +808,7 @@ find_enumeration(struct protocol *protoc
+ struct interface *i;
+ struct enumeration *e;
+ char *enum_name;
+- uint idx = 0, j;
++ unsigned int idx = 0, j;
+
+ for (j = 0; j + 1 < strlen(enum_attribute); j++) {
+ if (enum_attribute[j] == '.') {