.gear/rules | 2 + .../tags/9368b65c77cac1505080088fefe928381bc959c9 | 18 ++ .gear/tags/list | 1 + rules/0042-o_s.part | 1 + symbols/ctrl | 8 + xkeyboard-config.spec | 270 +++++++++++++++++++++ 6 files changed, 300 insertions(+) diff --git a/.gear/rules b/.gear/rules new file mode 100644 index 00000000..f78a96e0 --- /dev/null +++ b/.gear/rules @@ -0,0 +1,2 @@ +tar: @name@-@version@:. +diff: @name@-@version@:. . diff --git a/.gear/tags/9368b65c77cac1505080088fefe928381bc959c9 b/.gear/tags/9368b65c77cac1505080088fefe928381bc959c9 new file mode 100644 index 00000000..3623b695 --- /dev/null +++ b/.gear/tags/9368b65c77cac1505080088fefe928381bc959c9 @@ -0,0 +1,18 @@ +object 3c325a4e9a6344e0e8ceb341464553085705e052 +type commit +tag xkeyboard-config-2.37 +tagger Sergey Udaltsov 1664901492 +0000 + +xkeyboard-config-2.37 +-----BEGIN PGP SIGNATURE----- + +iQFOBAABCgA4FiEE/7TM0nWqpCL1+YCOBmHZj8kzoUUFAmM8YXQaHHNlcmdleS51 +ZGFsdHNvdkBnbWFpbC5jb20ACgkQBmHZj8kzoUVs0Af9EV/6MZ0/KC2DfvNVFety +CKlc3cVY1PtfG+wtxi1Bl9TCQCgHNWCoYtX8cRDS93zQZH03DD9s168Jp26bE7mU +zWCCJ+dS54xSNbO/imeqHi+bHeCE04qRxAD+MV6RbDWKn5x9TU+hN8RAdY4wDz8i +1hThuU8hz/DzRmog+HgNRKFmESu16+S48mhUfdlMjmR9gqLZBv0kjupU7uVYNef8 +1oVKRi6Ppw6m8LERtCokOGPrRG4X4RZygZW0sqdmgdVBuRSlHVjQKE34vAevTZpP +25ivfp/YFaaTFWxDPwMU2lnFBesO3tIMlj2hL2UR4QLNAQMmtJx4v5WPi6I4zgLx +hQ== +=M4wi +-----END PGP SIGNATURE----- diff --git a/.gear/tags/list b/.gear/tags/list new file mode 100644 index 00000000..9824fa3c --- /dev/null +++ b/.gear/tags/list @@ -0,0 +1 @@ +9368b65c77cac1505080088fefe928381bc959c9 xkeyboard-config-2.37 diff --git a/rules/0042-o_s.part b/rules/0042-o_s.part index 5fa7849a..1e8ffc74 100644 --- a/rules/0042-o_s.part +++ b/rules/0042-o_s.part @@ -38,6 +38,7 @@ grp:lctrl_toggle = +group(lctrl_toggle) grp:rctrl_toggle = +group(rctrl_toggle) grp:lalt_toggle = +group(lalt_toggle) + grp:swapcaps = +ctrl(swapcapsgrp) grp:sclk_toggle = +group(sclk_toggle) grp:lctrl_lwin_rctrl_menu = +group(lctrl_lwin_rctrl_menu) grp:lctrl_lalt_toggle = +group(lctrl_lalt_toggle) diff --git a/symbols/ctrl b/symbols/ctrl index 5e44b4cd..7a44c519 100644 --- a/symbols/ctrl +++ b/symbols/ctrl @@ -59,6 +59,14 @@ xkb_symbols "rctrl_ralt" { modifier_map Mod1{ }; }; +// swap the caps lock key with the left control key +// and using left control key to switch groups +partial modifier_keys +xkb_symbols "swapcapsgrp" { + key { symbols[Group1]= [ Control_L ] }; + key { symbols[Group1]= [ ISO_Next_Group, Caps_Lock ] }; +}; + // Menu key functions as another right Ctrl. partial modifier_keys xkb_symbols "menu_rctrl" { diff --git a/xkeyboard-config.spec b/xkeyboard-config.spec new file mode 100644 index 00000000..f97c2862 --- /dev/null +++ b/xkeyboard-config.spec @@ -0,0 +1,270 @@ +Name: xkeyboard-config +Summary: XML-based XKB configuration registry +Version: 2.37 +Release: alt1 +Epoch: 1 +License: X11/MIT +Group: System/X11 +Url: https://www.freedesktop.org/wiki/Software/XKeyboardConfig/ +Packager: Valery Inozemtsev + +Requires: libX11 >= 1.4.3 + +Source: %name-%version.tar +Patch: %name-%version-%release.patch + +BuildArch: noarch +BuildRequires: meson intltool xkbcomp glib2-devel libX11-devel xorg-util-macros xsltproc + +%description +Just XML stuff. Later hopefully will be part of Xorg + +%package devel +Summary: XML-based XKB configuration registry development package +Group: Development/Other +Requires: %name = %version-%release + +%description devel +XML-based XKB configuration registry development package + +%prep +%setup -q +%patch -p1 + +%build +%meson \ + -Dxkb-base=%_datadir/X11/xkb \ + -Dcompat-rules=true \ + -Dxorg-rules-symlinks=true +%meson_build -v + +for d in compat geometry keycodes symbols types; do + cd $d + xkbcomp -lfhlpR -o $d.dir '*' + cd ../ +done + +%install +%meson_install + +rm -f %buildroot%_datadir/X11/xkb/compiled + +%find_lang %name + +%pre +[ ! -d %_datadir/X11/xkb/symbols/pc ] || rm -fr %_datadir/X11/xkb/symbols/pc + +%files -f %name.lang +%doc AUTHORS NEWS README COPYING +%doc docs/README.config docs/README.enhancing docs/README.symbols +%_datadir/X11/xkb +%_man7dir/*.7* + +%files devel +%_datadir/pkgconfig/*.pc + +%changelog +* Thu Nov 24 2022 Valery Inozemtsev 1:2.37-alt1 +- 2.37 + +* Mon Feb 21 2022 Valery Inozemtsev 1:2.35-alt1 +- 2.35 + +* Thu Mar 12 2020 Valery Inozemtsev 1:2.29-alt1 +- 2.29 + +* Wed Sep 11 2019 Valery Inozemtsev 1:2.27-alt1 +- 2.27 + +* Sun Oct 14 2018 Valery Inozemtsev 1:2.25-alt1 +- 2.25 + +* Fri Dec 09 2016 Valery Inozemtsev 1:2.19-alt1 +- 2.19 + +* Sat Jun 04 2016 Valery Inozemtsev 1:2.18-alt1 +- 2.18 + +* Fri Dec 26 2014 Valery Inozemtsev 1:2.13-alt2 +- fixed sintax error (closes: #30605) + +* Fri Oct 10 2014 Valery Inozemtsev 1:2.13-alt1 +- 2.13 + +* Fri Jan 31 2014 Valery Inozemtsev 1:2.11-alt1 +- 2.11 + +* Wed May 29 2013 Valery Inozemtsev 1:2.9-alt1 +- 2.9 + +* Mon Feb 04 2013 Valery Inozemtsev 1:2.8-alt1 +- 2.8 + +* Wed Oct 03 2012 Valery Inozemtsev 1:2.7-alt1 +- 2.7 + +* Sun Jun 03 2012 Valery Inozemtsev 1:2.6-alt1 +- 2.6 + +* Wed May 23 2012 Valery Inozemtsev 1:2.5.1-alt1 +- 2.5.1 + +* Mon Jan 23 2012 Valery Inozemtsev 1:2.5-alt1 +- 2.5 + +* Tue Jan 03 2012 Valery Inozemtsev 1:2.3-alt2 +- 2.3 + +* Thu Oct 06 2011 Valery Inozemtsev 2.4.1-alt1 +- 2.4.1 + +* Thu Jun 02 2011 Valery Inozemtsev 2.3-alt1 +- 2.3 + +* Wed Apr 06 2011 Valery Inozemtsev 2.2.1-alt1 +- 2.2.1 + +* Sat Feb 26 2011 Valery Inozemtsev 2.1-alt1 +- 2.1 + +* Fri Oct 01 2010 Valery Inozemtsev 2.0-alt1 +- 2.0 + +* Thu May 27 2010 Valery Inozemtsev 1.9-alt1 +- 1.9 + +* Wed Jan 27 2010 Valery Inozemtsev 1.8-alt1 +- 1.8 + +* Fri Oct 02 2009 Valery Inozemtsev 1.7-alt3 +- added FK22 as XF86TouchpadToggle to standard inet symbols + +* Thu Oct 01 2009 Valery Inozemtsev 1.7-alt2 +- added grp:rctrl_rshift_toggle option + +* Wed Sep 30 2009 Valery Inozemtsev 1.7-alt1 +- 1.7 + +* Tue Jun 09 2009 Valery Inozemtsev 1.6-alt4 +- added ru(bak) (closes: #20332) + +* Wed May 27 2009 Valery Inozemtsev 1.6-alt3 +- 1.6 release + +* Sat May 23 2009 Valery Inozemtsev 1.6-alt2 +- fixed symbols/ua + +* Thu May 14 2009 Valery Inozemtsev 1.6-alt1 +- 1.6 + +* Wed Jan 28 2009 Valery Inozemtsev 1.5-alt1 +- 1.5 + +* Wed Oct 01 2008 Valery Inozemtsev 1.4-alt1 +- 1.4 + +* Mon Sep 29 2008 Valery Inozemtsev 1.3-alt2.M41.1 +- build for branch 4.1 + +* Wed Aug 13 2008 Valery Inozemtsev 1.3-alt3 +- updated russian translate + +* Wed Aug 06 2008 Valery Inozemtsev 1.3-alt2 +- added support Logitech diNovo Media Desktop Laser Keyboard + +* Thu May 29 2008 Valery Inozemtsev 1.3-alt1 +- 1.3 + +* Thu Apr 24 2008 Valery Inozemtsev 1.2-alt3 +- final variant yakut language layout + +* Thu Apr 10 2008 Valery Inozemtsev 1.2-alt2 +- added yakut language layout + +* Wed Jan 30 2008 Valery Inozemtsev 1.2-alt1 +- 1.2 + +* Tue Jan 08 2008 Valery Inozemtsev 1.1-alt5 +- CVS snapshot 2008-01-07: + + added logiultrax, BTC 6301URF, thinkpad60 models + + small OLPC fixes + +* Sun Oct 28 2007 Valery Inozemtsev 1.1-alt4 +- CVS snapshot 2007-10-28: + + OLPC fixlets + +* Mon Oct 15 2007 Valery Inozemtsev 1.1-alt3 +- CVS snapshot 2007-10-13 + +* Thu Oct 04 2007 Valery Inozemtsev 1.1-alt2 +- drop Slovenian translation + +* Wed Sep 26 2007 Valery Inozemtsev 1.1-alt1 +- 1.1 + +* Sun Sep 16 2007 Valery Inozemtsev 1.0-alt5 +- CVS snapshot 2007-09-14 + +* Sat Aug 25 2007 Valery Inozemtsev 1.0-alt4 +- CVS snapshot 2007-08-24 + +* Sun Aug 19 2007 Valery Inozemtsev 1.0-alt3 +- CVS snapshot 2007-08-18 + +* Sat Jul 14 2007 Valery Inozemtsev 1.0-alt2 +- updated/new translations + +* Fri Jun 29 2007 Valery Inozemtsev 1.0-alt1 +- 1.0 + +* Fri Jun 22 2007 Valery Inozemtsev 0.9-alt8 +- CVS snapshot 2007-06-18: +- fixed symbols in chuvash keyboard layout + +* Fri Jun 15 2007 Valery Inozemtsev 0.9-alt7 +- CVS snapshot 2007-06-13: + + chuvash and udmurt keyboard layout + +* Tue Jun 05 2007 Valery Inozemtsev 0.9-alt6 +- CVS snapshot 2007-05-26 + +* Thu May 17 2007 Valery Inozemtsev 0.9-alt5 +- CVS snapshot 2007-05-14 + +* Sun Feb 04 2007 Valery Inozemtsev 0.9-alt4 +- CVS snapshot 2007-02-03: + + added (model, layout->geometry) section for thinkpad + +* Sat Jan 27 2007 Valery Inozemtsev 0.9-alt3 +- CVS snapshot 2007-01-27 +- closed #10720 + +* Wed Dec 06 2006 Valery Inozemtsev 0.9-alt2 +- CVS snapshot 2006-11-20 +- added support BTC 9116U Mini Wireless Internet and Gaming keyboard + +* Mon Oct 09 2006 Valery Inozemtsev 0.9-alt1 +- 0.9 + +* Mon Oct 02 2006 Valery Inozemtsev 0.8-alt7 +- CVS snaphot 2006-10-01 + +* Thu May 11 2006 Valery Inozemtsev 0.8-alt6 +- added support BTC 9019U + +* Sun May 07 2006 Valery Inozemtsev 0.8-alt5 +- CVS snapshot 2006-05-05 + +* Sun Apr 23 2006 Valery Inozemtsev 0.8-alt4 +- CVS snapshot 2006-04-20 +- Obsoletes xorg-x11-xkbdata + +* Mon Apr 17 2006 Valery Inozemtsev 0.8-alt3 +- added support Genius KB-19e NB + +* Sun Mar 26 2006 Valery Inozemtsev 0.8-alt2 +- CVS snapshot 2006-03-25 + +* Mon Mar 06 2006 Valery Inozemtsev 0.8-alt1 +- initial release +