handle ssharp in XConvertCase

0001-Handle-ssharp-in-XConvertCase.patch

@@ -0,0 +1,52 @@
+From 4e08eddcbd4ce67fc3879ac9ed67a9c75ef99780 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Wed, 11 Dec 2019 14:12:27 +1000
+Subject: [PATCH libX11] 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 to xkbcomp using XConvertCase() to determine whether a key
+requires the type FOUR_LEVEL_ALPHABETIC or FOUR_LEVEL_SEMIALPHABETIC.
+
+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.
+
+https://gitlab.freedesktop.org/xorg/lib/libx11/issues/110
+
+Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+---
+ src/KeyBind.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/KeyBind.c b/src/KeyBind.c
+index d7c78b37..225581ca 100644
+--- a/src/KeyBind.c
++++ b/src/KeyBind.c
+@@ -466,6 +466,8 @@ UCSConvertCase( register unsigned code,
+             *upper = 0x0178;
+         else if (code == 0x00b5)      /* micro sign */
+             *upper = 0x039c;
++        else if (code == 0x00df)      /* ssharp */
++            *upper = 0x1e9e;
+ 	return;
+     }
+ 
+@@ -595,6 +597,8 @@ UCSConvertCase( register unsigned code,
+         }
+         else if (code == 0x1e9b)
+             *upper = 0x1e60;
++        else if (code == 0x1e9e)
++            *lower = XK_ssharp;
+     }
+ 
+     /* Greek Extended, U+1F00 to U+1FFF */
+-- 
+2.23.0
+

libX11.spec

@@ -5,7 +5,7 @@
 Summary: Core X11 protocol client library
 Name: libX11
 Version: 1.6.9
-Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
+Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
 License: MIT
 URL: http://www.x.org
 
@@ -18,6 +18,7 @@ Source0: https://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.
 %endif
 
 Patch2: dont-forward-keycode-0.patch
+Patch3: 0001-Handle-ssharp-in-XConvertCase.patch
 
 BuildRequires: xorg-x11-util-macros >= 1.11
 BuildRequires: pkgconfig(xproto) >= 7.0.15
@@ -56,6 +57,7 @@ libX11/libxcb interoperability library
 %prep
 %setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}}
 %patch2 -p1 -b .dont-forward-keycode-0
+%patch3 -p1
 
 %build
 autoreconf -v --install --force
@@ -121,6 +123,9 @@ make %{?_smp_mflags} check
 %{_mandir}/man5/*.5*
 
 %changelog
+* Wed Dec 11 2019 Peter Hutterer <peter.hutterer@redhat.com> 1.6.9-2
+- handle ssharp in XConvertCase
+
 * Wed Oct 09 2019 Adam Jackson <ajax@redhat.com> - 1.6.9-1
 - libX11 1.6.9