From 59274c0a1bac3420d0f0db5c70d40f8457ff42a8 Mon Sep 17 00:00:00 2001
From: Daniel Sabogal <dsabogalcc@gmail.com>
Date: Sat, 1 Oct 2016 20:38:42 -0400
Subject: main/wayland: upgrade to 1.12.0

---
 main/wayland/APKBUILD         | 18 ++++++------------
 main/wayland/musl-fixes.patch | 11 -----------
 2 files changed, 6 insertions(+), 23 deletions(-)
 delete mode 100644 main/wayland/musl-fixes.patch

(limited to 'main/wayland')

diff --git a/main/wayland/APKBUILD b/main/wayland/APKBUILD
index 5c2881ef098..662733703ef 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.11.0
+pkgver=1.12.0
 pkgrel=0
 pkgdesc="A computer display server protocol"
 url="http://wayland.freedesktop.org"
@@ -11,13 +11,10 @@ license="MIT"
 depends=""
 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
-	musl-fixes.patch"
+source="http://wayland.freedesktop.org/releases/$pkgname-$pkgver.tar.xz"
 
-patch_args="-p0"
-builddir="$srcdir"/$pkgname-$pkgver
+builddir="$srcdir/$pkgname-$pkgver"
 
 build() {
 	cd "$builddir"
@@ -39,9 +36,6 @@ package() {
 	make DESTDIR="$pkgdir" install || return 1
 }
 
-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"
+md5sums="ee615e2d1e205eec48b02f069327eb96  wayland-1.12.0.tar.xz"
+sha256sums="d6b4135cba0188abcb7275513c72dede751d6194f6edc5b82183a3ba8b821ab1  wayland-1.12.0.tar.xz"
+sha512sums="cde05344e6c9ee40c80651f5b6d6b4a14787a9cf2c8e3099d69b8f78672610e3ccbe4a87446f9ae93ca402cfbb916ef7444294efa7a0fc88ef1a984f94dabd20  wayland-1.12.0.tar.xz"
diff --git a/main/wayland/musl-fixes.patch b/main/wayland/musl-fixes.patch
deleted file mode 100644
index 9e49a56ddce..00000000000
--- a/main/wayland/musl-fixes.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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] == '.') {
-- 
cgit v1.2.3