xkeyboard-config-ducky: bring up to date, add wayland support; .gitignore
This commit is contained in:
Von Random
parent
c345bcc892
commit
c2374e6416
5 changed files with 71 additions and 93 deletions
3
.gitignore
vendored
3
.gitignore
vendored
|
|
@ -1 +1,4 @@
|
||||||
|
*.pkg.tar.zst
|
||||||
|
*.pkg.tar.gz
|
||||||
*.pkg.tar.xz
|
*.pkg.tar.xz
|
||||||
|
*.pkg.tar
|
||||||
|
|
|
||||||
|
|
@ -8,8 +8,8 @@
|
||||||
|
|
||||||
_pkgname=xkeyboard-config
|
_pkgname=xkeyboard-config
|
||||||
pkgname=xkeyboard-config-ducky
|
pkgname=xkeyboard-config-ducky
|
||||||
pkgver=2.26
|
pkgver=2.32
|
||||||
pkgrel=3
|
pkgrel=1
|
||||||
pkgdesc="X keyboard configuration files"
|
pkgdesc="X keyboard configuration files"
|
||||||
arch=(any)
|
arch=(any)
|
||||||
license=('custom')
|
license=('custom')
|
||||||
|
|
@ -19,21 +19,24 @@ provides=('xkbdata' "${_pkgname}")
|
||||||
replaces=('xkbdata' "${_pkgname}")
|
replaces=('xkbdata' "${_pkgname}")
|
||||||
conflicts=('xkbdata' "${_pkgname}")
|
conflicts=('xkbdata' "${_pkgname}")
|
||||||
source=(https://xorg.freedesktop.org/archive/individual/data/${_pkgname}/${_pkgname}-${pkgver}.tar.bz2
|
source=(https://xorg.freedesktop.org/archive/individual/data/${_pkgname}/${_pkgname}-${pkgver}.tar.bz2
|
||||||
pt-layout.patch
|
|
||||||
ducky_mini
|
ducky_mini
|
||||||
ru.patch
|
ru.patch
|
||||||
us.patch)
|
us.patch
|
||||||
sha512sums=('5c8a31f7a6ad5daed8a3fceb56230b2e2fc04a25f52a43b3b4ea81e4a6ab15c52869f749c4b747d855cd4b618c04bcbb40e85dec7eab31fbe3bd45e8c9b755ef'
|
base.xml.patch
|
||||||
'98c8b47e9a36ba3f130454fdd68c508f54b78eb65ddb071ca85bdcc3b324699e51155e3fc425ccae98350bb6430fea4771c0338024c1e06063a54b879bb707db'
|
evdev.xml.patch)
|
||||||
|
sha512sums=('c082a86efcf69ab50454875686b9b4c388cf48002de3728331de3c09c1349a38c9b9ad8ecace2215061c0c775e59c3dd230fffe3f24db63790aa71dc8eff8dea'
|
||||||
'ac79eb7fb16f517cf1178bcbfe83f708741feb950ee1e1c92fcea2b1e10ceae6d9f90ad860440f64da6759c843bcc10f4ac2479d323c450aeaf323bf37722257'
|
'ac79eb7fb16f517cf1178bcbfe83f708741feb950ee1e1c92fcea2b1e10ceae6d9f90ad860440f64da6759c843bcc10f4ac2479d323c450aeaf323bf37722257'
|
||||||
'854c52d168837a5c72559498d10dff7843275323c4082d1c741c832d068108be3a51e823c98a27ea47c5fe4f335499fdbcaa3698117740ef24c07c41161ad59b'
|
'854c52d168837a5c72559498d10dff7843275323c4082d1c741c832d068108be3a51e823c98a27ea47c5fe4f335499fdbcaa3698117740ef24c07c41161ad59b'
|
||||||
'7d9c692980c77a3b0658a5dd707ecdcd1e3fe47c2958f539f1f81dd04d5f204f779569d6b880c3f12872397d6171b2ec2caab9a4e79461c9f5828ca1c45acb08')
|
'7d9c692980c77a3b0658a5dd707ecdcd1e3fe47c2958f539f1f81dd04d5f204f779569d6b880c3f12872397d6171b2ec2caab9a4e79461c9f5828ca1c45acb08'
|
||||||
|
'fc7e4bce201538c828e44136ae2d3c39c4066a6d56413b229ad453eadd1d459aae22f218dde6f0e1afbddf3ebf995e6f8f56fd6406eff4ef6fa196207da9adb7'
|
||||||
|
'1ba6fe7aa471158b811fcb6a8efed29fb0c3685aaa373e106dc8c6b8c8e84503707ea1b71b19806351d7cae77691362f504738416ac2bfbcf7e904ff8d348247')
|
||||||
|
|
||||||
build() {
|
build() {
|
||||||
cd ${_pkgname}-${pkgver}
|
cd ${_pkgname}-${pkgver}
|
||||||
cp -v ${srcdir}/ducky_mini symbols
|
|
||||||
patch -p1 < ${srcdir}/ru.patch
|
patch -p1 < ${srcdir}/ru.patch
|
||||||
patch -p1 < ${srcdir}/us.patch
|
patch -p1 < ${srcdir}/us.patch
|
||||||
|
patch -p1 < ${srcdir}/base.xml.patch
|
||||||
|
patch -p1 < ${srcdir}/evdev.xml.patch
|
||||||
./configure --prefix=/usr \
|
./configure --prefix=/usr \
|
||||||
--with-xkb-base=/usr/share/X11/xkb \
|
--with-xkb-base=/usr/share/X11/xkb \
|
||||||
--with-xkb-rules-symlink=xorg \
|
--with-xkb-rules-symlink=xorg \
|
||||||
|
|
@ -47,6 +50,7 @@ build() {
|
||||||
make DESTDIR="${pkgdir}" install
|
make DESTDIR="${pkgdir}" install
|
||||||
rm -f "${pkgdir}/usr/share/X11/xkb/compiled"
|
rm -f "${pkgdir}/usr/share/X11/xkb/compiled"
|
||||||
|
|
||||||
|
install -m644 "${srcdir}/ducky_mini" "${pkgdir}/usr/share/X11/xkb/symbols"
|
||||||
install -m755 -d "${pkgdir}/var/lib/xkb"
|
install -m755 -d "${pkgdir}/var/lib/xkb"
|
||||||
install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
|
install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
|
||||||
install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
|
install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
|
||||||
|
|
|
||||||
28
xkeyboard-config-ducky/base.xml.patch
Normal file
28
xkeyboard-config-ducky/base.xml.patch
Normal file
|
|
@ -0,0 +1,28 @@
|
||||||
|
--- a/rules/base.xml 2021-02-16 03:04:08.000000000 +0300
|
||||||
|
+++ b/rules/base.xml 2021-04-19 23:13:37.689642897 +0300
|
||||||
|
@@ -1384,6 +1384,12 @@
|
||||||
|
</variant>
|
||||||
|
<variant>
|
||||||
|
<configItem>
|
||||||
|
+ <name>ducky</name>
|
||||||
|
+ <description>English (ducky emulation)</description>
|
||||||
|
+ </configItem>
|
||||||
|
+ </variant>
|
||||||
|
+ <variant>
|
||||||
|
+ <configItem>
|
||||||
|
<name>colemak</name>
|
||||||
|
<description>English (Colemak)</description>
|
||||||
|
</configItem>
|
||||||
|
@@ -4684,6 +4690,12 @@
|
||||||
|
<variantList>
|
||||||
|
<variant>
|
||||||
|
<configItem>
|
||||||
|
+ <name>ducky</name>
|
||||||
|
+ <description>Russian (ducky emulation)</description>
|
||||||
|
+ </configItem>
|
||||||
|
+ </variant>
|
||||||
|
+ <variant>
|
||||||
|
+ <configItem>
|
||||||
|
<name>phonetic</name>
|
||||||
|
<description>Russian (phonetic)</description>
|
||||||
|
</configItem>
|
||||||
28
xkeyboard-config-ducky/evdev.xml.patch
Normal file
28
xkeyboard-config-ducky/evdev.xml.patch
Normal file
|
|
@ -0,0 +1,28 @@
|
||||||
|
--- a/rules/evdev.xml 2021-04-19 23:13:26.982867056 +0300
|
||||||
|
+++ b/rules/evdev.xml 2021-04-19 23:12:43.442416463 +0300
|
||||||
|
@@ -1384,6 +1384,12 @@
|
||||||
|
</variant>
|
||||||
|
<variant>
|
||||||
|
<configItem>
|
||||||
|
+ <name>ducky</name>
|
||||||
|
+ <description>English (ducky emulation)</description>
|
||||||
|
+ </configItem>
|
||||||
|
+ </variant>
|
||||||
|
+ <variant>
|
||||||
|
+ <configItem>
|
||||||
|
<name>colemak</name>
|
||||||
|
<description>English (Colemak)</description>
|
||||||
|
</configItem>
|
||||||
|
@@ -4684,6 +4690,12 @@
|
||||||
|
<variantList>
|
||||||
|
<variant>
|
||||||
|
<configItem>
|
||||||
|
+ <name>ducky</name>
|
||||||
|
+ <description>Russian (ducky emulation)</description>
|
||||||
|
+ </configItem>
|
||||||
|
+ </variant>
|
||||||
|
+ <variant>
|
||||||
|
+ <configItem>
|
||||||
|
<name>phonetic</name>
|
||||||
|
<description>Russian (phonetic)</description>
|
||||||
|
</configItem>
|
||||||
|
|
@ -1,85 +0,0 @@
|
||||||
From af6c0f29dbee1cc7b280eed891592797c2e31220 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Sergey Udaltsov <sergey.udaltsov@gmail.com>
|
|
||||||
Date: Thu, 7 Feb 2019 20:40:35 +0000
|
|
||||||
Subject: [PATCH] Fixed broken pt layout
|
|
||||||
|
|
||||||
Backticks broke it, removed
|
|
||||||
---
|
|
||||||
symbols/pt | 62 +++++++++++++++++++++++++++---------------------------
|
|
||||||
1 file changed, 31 insertions(+), 31 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 `<AD01>` { [ q, Q, at, Greek_OMEGA ] };
|
|
||||||
- key `<AD02>` { [ w, W, lstroke, Lstroke ] };
|
|
||||||
- key `<AD03>` { [ f, F, dstroke, ordfeminine ] };
|
|
||||||
- key `<AD04>` { [ p, P, thorn, THORN ] };
|
|
||||||
- key `<AD05>` { [ g, G, eng, ENG ] };
|
|
||||||
- key `<AD06>` { [ j, J, dead_hook, dead_horn ] };
|
|
||||||
- key `<AD07>` { [ l, L, lstroke, Lstroke ] };
|
|
||||||
- key `<AD08>` { [ u, U, downarrow, uparrow ] };
|
|
||||||
- key `<AD09>` { [ y, Y, leftarrow, yen ] };
|
|
||||||
- key `<AD10>` { [ ccedilla, Ccedilla, dead_acute, dead_doubleacute ] };
|
|
||||||
-
|
|
||||||
- key `<AC01>` { [ a, A, ae, AE ] };
|
|
||||||
- key `<AC02>` { [ r, R, paragraph, registered ] };
|
|
||||||
- key `<AC03>` { [ s, S, ssharp, section ] };
|
|
||||||
- key `<AC04>` { [ t, T, tslash, Tslash ] };
|
|
||||||
- key `<AC05>` { [ d, D, eth, ETH ] };
|
|
||||||
- key `<AC06>` { [ h, H, hstroke, Hstroke ] };
|
|
||||||
- key `<AC07>` { [ n, N, n, N ] };
|
|
||||||
- key `<AC08>` { [ e, E, EuroSign, cent ] };
|
|
||||||
- key `<AC09>` { [ i, I, rightarrow, idotless ] };
|
|
||||||
- key `<AC10>` { [ o, O, oslash, Ooblique ] };
|
|
||||||
-
|
|
||||||
- key `<AB01>` { [ z, Z, guillemotleft, less ] };
|
|
||||||
- key `<AB02>` { [ x, X, guillemotright, greater ] };
|
|
||||||
- key `<AB03>` { [ c, C, cent, copyright ] };
|
|
||||||
- key `<AB04>` { [ v, V, leftdoublequotemark, leftsinglequotemark ] };
|
|
||||||
- key `<AB05>` { [ b, B, rightdoublequotemark, rightsinglequotemark ] };
|
|
||||||
- key `<AB08>` { [ k, K, kra, ampersand ] };
|
|
||||||
- key `<AB07>` { [ m, M, mu, masculine ] };
|
|
||||||
-
|
|
||||||
- key `<CAPS>` { [ BackSpace, BackSpace, BackSpace, BackSpace ] };
|
|
||||||
+ key <AD01> { [ q, Q, at, Greek_OMEGA ] };
|
|
||||||
+ key <AD02> { [ w, W, lstroke, Lstroke ] };
|
|
||||||
+ key <AD03> { [ f, F, dstroke, ordfeminine ] };
|
|
||||||
+ key <AD04> { [ p, P, thorn, THORN ] };
|
|
||||||
+ key <AD05> { [ g, G, eng, ENG ] };
|
|
||||||
+ key <AD06> { [ j, J, dead_hook, dead_horn ] };
|
|
||||||
+ key <AD07> { [ l, L, lstroke, Lstroke ] };
|
|
||||||
+ key <AD08> { [ u, U, downarrow, uparrow ] };
|
|
||||||
+ key <AD09> { [ y, Y, leftarrow, yen ] };
|
|
||||||
+ key <AD10> { [ ccedilla, Ccedilla, dead_acute, dead_doubleacute ] };
|
|
||||||
+
|
|
||||||
+ key <AC01> { [ a, A, ae, AE ] };
|
|
||||||
+ key <AC02> { [ r, R, paragraph, registered ] };
|
|
||||||
+ key <AC03> { [ s, S, ssharp, section ] };
|
|
||||||
+ key <AC04> { [ t, T, tslash, Tslash ] };
|
|
||||||
+ key <AC05> { [ d, D, eth, ETH ] };
|
|
||||||
+ key <AC06> { [ h, H, hstroke, Hstroke ] };
|
|
||||||
+ key <AC07> { [ n, N, n, N ] };
|
|
||||||
+ key <AC08> { [ e, E, EuroSign, cent ] };
|
|
||||||
+ key <AC09> { [ i, I, rightarrow, idotless ] };
|
|
||||||
+ key <AC10> { [ o, O, oslash, Ooblique ] };
|
|
||||||
+
|
|
||||||
+ key <AB01> { [ z, Z, guillemotleft, less ] };
|
|
||||||
+ key <AB02> { [ x, X, guillemotright, greater ] };
|
|
||||||
+ key <AB03> { [ c, C, cent, copyright ] };
|
|
||||||
+ key <AB04> { [ v, V, leftdoublequotemark, leftsinglequotemark ] };
|
|
||||||
+ key <AB05> { [ b, B, rightdoublequotemark, rightsinglequotemark ] };
|
|
||||||
+ key <AB08> { [ k, K, kra, ampersand ] };
|
|
||||||
+ key <AB07> { [ m, M, mu, masculine ] };
|
|
||||||
+
|
|
||||||
+ key <CAPS> { [ BackSpace, BackSpace, BackSpace, BackSpace ] };
|
|
||||||
};
|
|
||||||
--
|
|
||||||
2.18.1
|
|
||||||
|
|
||||||
|
|
||||||
Loading…
Reference in a new issue