summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--desktop/wayland/.rev2
-rw-r--r--desktop/wayland/config.h6
-rw-r--r--desktop/wayland/patch/0001-scanner-Use-int-rather-than-uint-for-loop-index.patch27
m---------desktop/wayland/src0
4 files changed, 4 insertions, 31 deletions
diff --git a/desktop/wayland/.rev b/desktop/wayland/.rev
index d00491fd..0cfbf088 100644
--- a/desktop/wayland/.rev
+++ b/desktop/wayland/.rev
@@ -1 +1 @@
-1
+2
diff --git a/desktop/wayland/config.h b/desktop/wayland/config.h
index 1559974f..c59dbe65 100644
--- a/desktop/wayland/config.h
+++ b/desktop/wayland/config.h
@@ -10,8 +10,8 @@
#define PACKAGE "wayland"
#define PACKAGE_BUGREPORT "https://bugs.freedesktop.org/enter_bug.cgi?product=Wayland&component=wayland&version=1.11.0"
#define PACKAGE_NAME "wayland"
-#define PACKAGE_STRING "wayland 1.11.0"
+#define PACKAGE_STRING "wayland 1.12.0"
#define PACKAGE_TARNAME "wayland"
#define PACKAGE_URL "http://wayland.freedesktop.org/"
-#define PACKAGE_VERSION "1.11.0"
-#define VERSION "1.11.0"
+#define PACKAGE_VERSION "1.12.0"
+#define VERSION "1.12.0"
diff --git a/desktop/wayland/patch/0001-scanner-Use-int-rather-than-uint-for-loop-index.patch b/desktop/wayland/patch/0001-scanner-Use-int-rather-than-uint-for-loop-index.patch
deleted file mode 100644
index 3fef6cb9..00000000
--- a/desktop/wayland/patch/0001-scanner-Use-int-rather-than-uint-for-loop-index.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 04baf9967a84adb6856fdb69fda80553719a4bfa Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Sun, 26 Jun 2016 12:11:13 -0700
-Subject: [PATCH] scanner: Use int rather than uint for loop index
-
-uint requires including sys/types.h and defining _GNU_SOURCE. We could use
-unsigned instead, but there is no reason not to use just int instead.
----
- src/scanner.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/scanner.c b/src/scanner.c
-index 5f06e8e..836a181 100644
---- a/src/scanner.c
-+++ b/src/scanner.c
-@@ -808,7 +808,7 @@ find_enumeration(struct protocol *protocol,
- struct interface *i;
- struct enumeration *e;
- char *enum_name;
-- uint idx = 0, j;
-+ int idx = 0, j;
-
- for (j = 0; j + 1 < strlen(enum_attribute); j++) {
- if (enum_attribute[j] == '.') {
---
-2.9.0
-
diff --git a/desktop/wayland/src b/desktop/wayland/src
-Subproject 47163797f810373c81b6e13b7a8a245eb987778
+Subproject a0d76ffda5c3483e5e67fed19b7d8afe8966782