From 8bbbd7544e1219d48fe77606fd3d69a3250b75d2 Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Fri, 9 Sep 2022 15:13:36 -0700
Subject: wayland: Update to 1.21.0

---
 pkg/wayland/config.h         | 2 +-
 pkg/wayland/gen.lua          | 4 ++--
 pkg/wayland/src              | 2 +-
 pkg/wayland/ver              | 2 +-
 pkg/xkeyboard-config/gen.lua | 4 ++--
 pkg/xkeyboard-config/src     | 2 +-
 pkg/xkeyboard-config/ver     | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'pkg')

diff --git a/pkg/wayland/config.h b/pkg/wayland/config.h
index c14e8d4d..44008e5c 100644
--- a/pkg/wayland/config.h
+++ b/pkg/wayland/config.h
@@ -11,4 +11,4 @@
 #undef HAVE_SYS_UCRED_H
 #define HAVE_XUCRED_CR_PID 0
 #define PACKAGE "wayland"
-#define PACKAGE_VERSION "1.20.0"
+#define PACKAGE_VERSION "1.21.0"
diff --git a/pkg/wayland/gen.lua b/pkg/wayland/gen.lua
index b3b9a7c7..0633ac86 100644
--- a/pkg/wayland/gen.lua
+++ b/pkg/wayland/gen.lua
@@ -10,9 +10,9 @@ cflags{
 build('sed', '$outdir/include/wayland-version.h', '$srcdir/src/wayland-version.h.in', {
 	expr={
 		'-e s,@WAYLAND_VERSION_MAJOR@,1,',
-		'-e s,@WAYLAND_VERSION_MINOR@,20,',
+		'-e s,@WAYLAND_VERSION_MINOR@,21,',
 		'-e s,@WAYLAND_VERSION_MICRO@,0,',
-		'-e s,@WAYLAND_VERSION@,1.20.0,',
+		'-e s,@WAYLAND_VERSION@,1.21.0,',
 	},
 })
 
diff --git a/pkg/wayland/src b/pkg/wayland/src
index 75c1a93e..8135e856 160000
--- a/pkg/wayland/src
+++ b/pkg/wayland/src
@@ -1 +1 @@
-Subproject commit 75c1a93e2067220fa06208f20f8f096bb463ec08
+Subproject commit 8135e856ebd79872f886466e9cee39affb7d9ee8
diff --git a/pkg/wayland/ver b/pkg/wayland/ver
index 641dfa67..0f99bb2f 100644
--- a/pkg/wayland/ver
+++ b/pkg/wayland/ver
@@ -1 +1 @@
-1.20.0 r0
+1.21.0 r0
diff --git a/pkg/xkeyboard-config/gen.lua b/pkg/xkeyboard-config/gen.lua
index e91492e2..8b36832b 100644
--- a/pkg/xkeyboard-config/gen.lua
+++ b/pkg/xkeyboard-config/gen.lua
@@ -73,7 +73,7 @@ local data = [[
 		af al am apl
 		ara at au az
 		ba bd be
-		bg br brai
+		bg bqn br brai
 		bt bw by
 		ca cd ch
 		cm cn cz
@@ -85,7 +85,7 @@ local data = [[
 		id ie il
 		in iq
 		ir is it
-		jp jv
+		jp
 		ke kg kh
 		kr kz
 		la latam latin
diff --git a/pkg/xkeyboard-config/src b/pkg/xkeyboard-config/src
index ba00d1dd..60d5dd7b 160000
--- a/pkg/xkeyboard-config/src
+++ b/pkg/xkeyboard-config/src
@@ -1 +1 @@
-Subproject commit ba00d1dd8674ff05bd2a9f43c1198eeabcd1db47
+Subproject commit 60d5dd7bf463e5754f047cb98b17102e524e8f16
diff --git a/pkg/xkeyboard-config/ver b/pkg/xkeyboard-config/ver
index cbe0f86f..8cdeb92e 100644
--- a/pkg/xkeyboard-config/ver
+++ b/pkg/xkeyboard-config/ver
@@ -1 +1 @@
-2.33 r0
+2.36 r0
-- 
cgit v1.2.3