From da9868e0d77d589ba1dd0d51a7f65a96eea2b3ed Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon, 20 Jan 2020 15:13:38 +1000
Subject: [PATCH] libxkbcommon 0.10.0

---
 ...keysym-handle-ssharp-in-XConvertCase.patch | 50 -------------------
 libxkbcommon.spec                             |  9 ++--
 sources                                       |  2 +-
 3 files changed, 6 insertions(+), 55 deletions(-)
 delete mode 100644 0001-keysym-handle-ssharp-in-XConvertCase.patch

diff --git a/0001-keysym-handle-ssharp-in-XConvertCase.patch b/0001-keysym-handle-ssharp-in-XConvertCase.patch
deleted file mode 100644
index 12aa704..0000000
--- a/0001-keysym-handle-ssharp-in-XConvertCase.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From adaf6072aeb4048f459cf855ee92b5188bc6d9e5 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Fri, 13 Dec 2019 13:35:25 +1000
-Subject: [PATCH] keysym: handle ssharp in XConvertCase()
-
-lowercase: LATIN SMALL LETTER SHARP S (U+00DF)
-uppercase: LATIN CAPITAL LETTER SHARP S (U+1E9E)
-
-The uppercase sharp s (XK_ssharp) is a relatively recent addition to unicode
-but was added to the relevant keyboard layouts in xkeyboard-config-2.25
-(d1411e5e95c)
-https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/issues/144
-
-Alas, the CapsLock behavior was broken on the finnish layout (maybe others).
-This was due XConvertCase() never returning the uppercase characters.
-
-Let's make this function return the right lower/upper symbols for the sharp s
-and hope that the world won't get any worse because of it.
-
-Corresponding Xlib patch:
-https://gitlab.freedesktop.org/xorg/lib/libx11/issues/110
----
- src/keysym.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/keysym.c b/src/keysym.c
-index 6d06de0..f3a196b 100644
---- a/src/keysym.c
-+++ b/src/keysym.c
-@@ -478,6 +478,8 @@ UCSConvertCase(uint32_t code, xkb_keysym_t *lower, xkb_keysym_t *upper)
-             *upper = 0x0178;
-         else if (code == 0x00b5)      /* micro sign */
-             *upper = 0x039c;
-+        else if (code == 0x00df)      /* ssharp */
-+            *upper = 0x1e9e;
- 	return;
-     }
- 
-@@ -607,6 +609,8 @@ UCSConvertCase(uint32_t code, xkb_keysym_t *lower, xkb_keysym_t *upper)
-         }
-         else if (code == 0x1e9b)
-             *upper = 0x1e60;
-+        else if (code == 0x1e9e)
-+            *lower = XKB_KEY_ssharp;
-     }
- 
-     /* Greek Extended, U+1F00 to U+1FFF */
--- 
-2.23.0
-
diff --git a/libxkbcommon.spec b/libxkbcommon.spec
index 518cdcb..d6dda2b 100644
--- a/libxkbcommon.spec
+++ b/libxkbcommon.spec
@@ -1,8 +1,8 @@
 #global gitdate  20120917
 
 Name:           libxkbcommon
-Version:        0.9.1
-Release:        3%{?gitdate:.%{gitdate}}%{?dist}
+Version:        0.10.0
+Release:        1%{?gitdate:.%{gitdate}}%{?dist}
 Summary:        X.Org X11 XKB parsing library
 License:        MIT
 URL:            http://www.x.org
@@ -14,8 +14,6 @@ Source0:        http://xkbcommon.org/download/%{name}-%{version}.tar.xz
 %endif
 Source1:        make-git-snapshot.sh
 
-Patch01:        0001-keysym-handle-ssharp-in-XConvertCase.patch
-
 BuildRequires:  git meson
 BuildRequires:  xorg-x11-util-macros byacc flex bison
 BuildRequires:  xorg-x11-proto-devel libX11-devel
@@ -91,6 +89,9 @@ X.Org X11 XKB keymap creation library development package
 %{_libdir}/pkgconfig/xkbcommon-x11.pc
 
 %changelog
+* Mon Jan 20 2020 Peter Hutterer <peter.hutterer@redhat.com> 0.10.0-1
+- libxkbcommon 0.10.0
+
 * Fri Dec 13 2019 Peter Hutterer <peter.hutterer@redhat.com> 0.9.1-3
 - convert ssharp to the correct uppercase letter
 
diff --git a/sources b/sources
index 2a6b27b..85fd122 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libxkbcommon-0.9.1.tar.xz) = 8d4551a06e7dd4936633f544409401dc33f8f1900adb5daa6403615c71f321d17212db739f89a5b3e393d729b3f33167691404849a25d5526b403fd9ec3e8878
+SHA512 (libxkbcommon-0.10.0.tar.xz) = 58c523b42a8ea0cae7322d453fbc5d4624374221246cb067074e2ff9820eef3ceea8686283136432cdf0842acfc0858c7b2d3954de234b6501092ae1d27c9e79