diff --git a/0001-Fixed-broken-pt-layout.patch b/0001-Fixed-broken-pt-layout.patch deleted file mode 100644 index 5979fc6..0000000 --- a/0001-Fixed-broken-pt-layout.patch +++ /dev/null @@ -1,80 +0,0 @@ -From af6c0f29dbee1cc7b280eed891592797c2e31220 Mon Sep 17 00:00:00 2001 -From: Sergey Udaltsov -Date: Thu, 7 Feb 2019 20:40:35 +0000 -Subject: [PATCH xkeyboard-config] Fixed broken pt layout - -Backticks broke it, removed ---- - symbols/pt | 56 +++++++++++++++++++++++++++--------------------------- - 1 file changed, 28 insertions(+), 28 deletions(-) - -diff --git a/symbols/pt b/symbols/pt -index 73a1b7b..3ec0981 100644 ---- a/symbols/pt -+++ b/symbols/pt -@@ -221,35 +221,35 @@ xkb_symbols "colemak" { - - name[Group1]="Portuguese (Colemak)"; - -- key `` { [ q, Q, at, Greek_OMEGA ] }; -- key `` { [ w, W, lstroke, Lstroke ] }; -- key `` { [ f, F, dstroke, ordfeminine ] }; -- key `` { [ p, P, thorn, THORN ] }; -- key `` { [ g, G, eng, ENG ] }; -- key `` { [ j, J, dead_hook, dead_horn ] }; -- key `` { [ l, L, lstroke, Lstroke ] }; -- key `` { [ u, U, downarrow, uparrow ] }; -- key `` { [ y, Y, leftarrow, yen ] }; -- key `` { [ ccedilla, Ccedilla, dead_acute, dead_doubleacute ] }; -+ key { [ q, Q, at, Greek_OMEGA ] }; -+ key { [ w, W, lstroke, Lstroke ] }; -+ key { [ f, F, dstroke, ordfeminine ] }; -+ key { [ p, P, thorn, THORN ] }; -+ key { [ g, G, eng, ENG ] }; -+ key { [ j, J, dead_hook, dead_horn ] }; -+ key { [ l, L, lstroke, Lstroke ] }; -+ key { [ u, U, downarrow, uparrow ] }; -+ key { [ y, Y, leftarrow, yen ] }; -+ key { [ ccedilla, Ccedilla, dead_acute, dead_doubleacute ] }; - -- key `` { [ a, A, ae, AE ] }; -- key `` { [ r, R, paragraph, registered ] }; -- key `` { [ s, S, ssharp, section ] }; -- key `` { [ t, T, tslash, Tslash ] }; -- key `` { [ d, D, eth, ETH ] }; -- key `` { [ h, H, hstroke, Hstroke ] }; -- key `` { [ n, N, n, N ] }; -- key `` { [ e, E, EuroSign, cent ] }; -- key `` { [ i, I, rightarrow, idotless ] }; -- key `` { [ o, O, oslash, Ooblique ] }; -+ key { [ a, A, ae, AE ] }; -+ key { [ r, R, paragraph, registered ] }; -+ key { [ s, S, ssharp, section ] }; -+ key { [ t, T, tslash, Tslash ] }; -+ key { [ d, D, eth, ETH ] }; -+ key { [ h, H, hstroke, Hstroke ] }; -+ key { [ n, N, n, N ] }; -+ key { [ e, E, EuroSign, cent ] }; -+ key { [ i, I, rightarrow, idotless ] }; -+ key { [ o, O, oslash, Ooblique ] }; - -- key `` { [ z, Z, guillemotleft, less ] }; -- key `` { [ x, X, guillemotright, greater ] }; -- key `` { [ c, C, cent, copyright ] }; -- key `` { [ v, V, leftdoublequotemark, leftsinglequotemark ] }; -- key `` { [ b, B, rightdoublequotemark, rightsinglequotemark ] }; -- key `` { [ k, K, kra, ampersand ] }; -- key `` { [ m, M, mu, masculine ] }; -+ key { [ z, Z, guillemotleft, less ] }; -+ key { [ x, X, guillemotright, greater ] }; -+ key { [ c, C, cent, copyright ] }; -+ key { [ v, V, leftdoublequotemark, leftsinglequotemark ] }; -+ key { [ b, B, rightdoublequotemark, rightsinglequotemark ] }; -+ key { [ k, K, kra, ampersand ] }; -+ key { [ m, M, mu, masculine ] }; - -- key `` { [ BackSpace, BackSpace, BackSpace, BackSpace ] }; -+ key { [ BackSpace, BackSpace, BackSpace, BackSpace ] }; - }; --- -2.21.0 diff --git a/0001-Map-evdev-keycode-KEY_ROTATE_LOCK_TOGGLE-to-XF86Rota.patch b/0001-Map-evdev-keycode-KEY_ROTATE_LOCK_TOGGLE-to-XF86Rota.patch deleted file mode 100644 index 3e6ecf6..0000000 --- a/0001-Map-evdev-keycode-KEY_ROTATE_LOCK_TOGGLE-to-XF86Rota.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 0fb8b664a9a49b299ac3f7851df8cd9b9121e445 Mon Sep 17 00:00:00 2001 -From: Hans de Goede -Date: Mon, 21 Jan 2019 20:27:36 +0100 -Subject: [PATCH xkeyboard-config] Map evdev keycode KEY_ROTATE_LOCK_TOGGLE to - XF86RotationLockToggle - -Add XF86RotationLockToggle, to be used as mapping for evdev's -KEY_ROTATE_LOCK_TOGGLE. - -I've a Point of View P1006W-232 Windows tablet which actually has a -rotate-lock toggle-button. The latest kernel correctly generates -KEY_ROTATE_LOCK_TOGGLE events for this. So now I'm hooking up support for -it through all the higher layers. - -The patch for adding the RotationLockToggle keysym to xproto is here: -https://patchwork.freedesktop.org/patch/279365/ - -Signed-off-by: Hans de Goede ---- - keycodes/evdev | 1 + - symbols/inet | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/keycodes/evdev b/keycodes/evdev -index dd2b865..5dcc9f6 100644 ---- a/keycodes/evdev -+++ b/keycodes/evdev -@@ -286,6 +286,7 @@ default xkb_keycodes "evdev" { - - = 372; // #define KEY_FAVORITES 364 - = 382; // #define KEY_KEYBOARD 374 -+ = 569; // #define KEY_ROTATE_LOCK_TOGGLE 561 - - // Fake keycodes for virtual keys - = 92; -diff --git a/symbols/inet b/symbols/inet -index b97ccf2..6c9dd87 100644 ---- a/symbols/inet -+++ b/symbols/inet -@@ -220,6 +220,7 @@ xkb_symbols "evdev" { - - key { [ XF86Favorites ] }; - key { [ XF86Keyboard ] }; -+ key { [ XF86RotationLockToggle ] }; - - key { [ XF86Tools ] }; - key { [ XF86Launch5 ] }; --- -2.21.0 - diff --git a/0001-Map-evdev-keycode-KEY_SOUND-to-XF86AudioPreset.patch b/0001-Map-evdev-keycode-KEY_SOUND-to-XF86AudioPreset.patch deleted file mode 100644 index 72b92d7..0000000 --- a/0001-Map-evdev-keycode-KEY_SOUND-to-XF86AudioPreset.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 08723f30072fcfcee2d061271bec7d79668dc869 Mon Sep 17 00:00:00 2001 -From: Hans de Goede -Date: Fri, 12 May 2017 14:37:55 +0200 -Subject: [PATCH xkeyboard-config] Map evdev keycode KEY_SOUND to - XF86AudioPreset - -KEY_SOUND is used on actual devices and recent xproto versions -defines the AudioPreset keysym for this key. - -Signed-off-by: Hans de Goede ---- - symbols/inet | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/symbols/inet b/symbols/inet -index ae1f6ee..b97ccf2 100644 ---- a/symbols/inet -+++ b/symbols/inet -@@ -184,7 +184,7 @@ xkb_symbols "evdev" { - key { [ Print ] }; - // key { [ ] }; // KEY_HP - key { [ XF86WebCam ] }; --// key { [ ] }; // KEY_SOUND -+ key { [ XF86AudioPreset ] }; - // key { [ ] }; // KEY_QUESTION - key { [ XF86Mail ] }; - key { [ XF86Messenger ] }; // KEY_CHAT --- -2.21.0 - diff --git a/0001-evdev-inet-Fix-KEY_KEYBOARD-mapping.patch b/0001-evdev-inet-Fix-KEY_KEYBOARD-mapping.patch deleted file mode 100644 index 9adafff..0000000 --- a/0001-evdev-inet-Fix-KEY_KEYBOARD-mapping.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 67b5d6bfbee52bd59f3e5dac3e0d552ed572b3b2 Mon Sep 17 00:00:00 2001 -From: Hans de Goede -Date: Fri, 21 Dec 2018 11:08:08 +0100 -Subject: [PATCH xkeyboard-config] evdev/inet: Fix KEY_KEYBOARD mapping - -KEY_KEYBOARD has an evdev-keycode value of 374 not 366. It seems that -with the original addition of the mapping the evdev-keycode value was -mistaken for the X scancode which is 8 higher then the evdev-keycode -since the X scancodes start at 8. What seems to have happened is that -the evdev-keycode was used instead of the X scancode and then 8 was -subtracted for the wrong "// #define KEY_KEYBOARD 366" comment. - -This commit corrects the comment to say 374 and corrects the X -scancode being mapped to 382. - -Cc: Christian Kellner -Reviewed-by: Christian Kellner -Signed-off-by: Hans de Goede ---- - keycodes/evdev | 2 +- - symbols/inet | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/keycodes/evdev b/keycodes/evdev -index 90b8278..dd2b865 100644 ---- a/keycodes/evdev -+++ b/keycodes/evdev -@@ -285,7 +285,7 @@ default xkb_keycodes "evdev" { - = 255; // #define KEY_RFKILL 247 - - = 372; // #define KEY_FAVORITES 364 -- = 374; // #define KEY_KEYBOARD 366 -+ = 382; // #define KEY_KEYBOARD 374 - - // Fake keycodes for virtual keys - = 92; -diff --git a/symbols/inet b/symbols/inet -index 8e65c5e..ae1f6ee 100644 ---- a/symbols/inet -+++ b/symbols/inet -@@ -219,7 +219,7 @@ xkb_symbols "evdev" { - key { [ XF86RFKill ] }; // KEY_RFKILL - - key { [ XF86Favorites ] }; -- key { [ XF86Keyboard ] }; -+ key { [ XF86Keyboard ] }; - - key { [ XF86Tools ] }; - key { [ XF86Launch5 ] }; --- -2.21.0 - diff --git a/sources b/sources index 94928d9..f0c6892 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xkeyboard-config-2.26.tar.bz2) = 5c8a31f7a6ad5daed8a3fceb56230b2e2fc04a25f52a43b3b4ea81e4a6ab15c52869f749c4b747d855cd4b618c04bcbb40e85dec7eab31fbe3bd45e8c9b755ef +SHA512 (xkeyboard-config-2.27.tar.bz2) = ae29177461f9d2c6ce1c56c0b8b147600e3f0ecd15e8754c9531811702d9a030a31f42679a88a9fb706bec458974c337ee2a0180f22573702caa7184eb94017e diff --git a/xkeyboard-config.spec b/xkeyboard-config.spec index 20cef83..464650b 100644 --- a/xkeyboard-config.spec +++ b/xkeyboard-config.spec @@ -6,8 +6,8 @@ Summary: X Keyboard Extension configuration data Name: xkeyboard-config -Version: 2.26 -Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Version: 2.27 +Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} License: MIT URL: http://www.freedesktop.org/wiki/Software/XKeyboardConfig @@ -19,15 +19,9 @@ Source2: commitid Source0: http://xorg.freedesktop.org/archive/individual/data/%{name}/%{name}-%{version}.tar.bz2 %endif -Patch01: 0001-evdev-inet-Fix-KEY_KEYBOARD-mapping.patch -Patch02: 0001-Fixed-broken-pt-layout.patch -Patch03: 0001-Map-evdev-keycode-KEY_ROTATE_LOCK_TOGGLE-to-XF86Rota.patch -Patch04: 0001-Map-evdev-keycode-KEY_SOUND-to-XF86AudioPreset.patch - BuildArch: noarch -BuildRequires: gettext -BuildRequires: intltool +BuildRequires: gettext gettext-devel BuildRequires: libtool BuildRequires: libxslt BuildRequires: perl(XML::Parser) @@ -58,7 +52,7 @@ Development files for %{name}. %autosetup -S git %build -AUTOPOINT="intltoolize --automake --copy" autoreconf -v --force --install || exit 1 +autoreconf -v --force --install || exit 1 %configure \ --enable-compat-rules \ --with-xkb-base=%{_datadir}/X11/xkb \ @@ -93,6 +87,10 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/X11/xkb/compiled %{_datadir}/pkgconfig/xkeyboard-config.pc %changelog +* Thu Jun 13 2019 Peter Hutterer 2.27-1 +- xkeyboard-config 2.27 +- drop intltool, no longer needed, see upstream commit e8026f673e + * Mon May 27 2019 Peter Hutterer 2.26-2 - xkeyboard-config 2.26, with sources this time