update xkeyboard-config

2 files changed, 94 insertions, 8 deletions

diff --git a/xkeyboard-config-ducky/PKGBUILD b/xkeyboard-config-ducky/PKGBUILD
index 24879bd..6da7ab4 100644
--- a/xkeyboard-config-ducky/PKGBUILD
+++ b/xkeyboard-config-ducky/PKGBUILD
@@ -1,4 +1,3 @@
-#
 # Original maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Original maintainer: Jan de Groot <jgc@archlinux.org>
 #
@@ -9,8 +8,8 @@
 
 _pkgname=xkeyboard-config
 pkgname=xkeyboard-config-ducky
-pkgver=2.25
-pkgrel=1
+pkgver=2.26
+pkgrel=2
 pkgdesc="X keyboard configuration files"
 arch=(any)
 license=('custom')
@@ -19,11 +18,13 @@ makedepends=('intltool' 'xorg-xkbcomp' 'libxslt')
 provides=('xkbdata' "${_pkgname}")
 replaces=('xkbdata' "${_pkgname}")
 conflicts=('xkbdata' "${_pkgname}")
-source=("https://xorg.freedesktop.org/archive/individual/data/${_pkgname}/${_pkgname}-${pkgver}.tar.bz2"
-        'ducky_mini'
-        'ru.patch'
-        'us.patch')
-sha512sums=('2d9d6bdd885edc8e03e5a2c136c3b29b4ea795122709fa210bf151c4e7416a44fa2928bb29137ee8c6691d8646c1f645748576dea3f940ce84c8d4d0f91e09eb'
+source=(https://xorg.freedesktop.org/archive/individual/data/${_pkgname}/${_pkgname}-${pkgver}.tar.bz2
+        pt-layout.patch
+        ducky_mini
+        ru.patch
+        us.patch)
+sha512sums=('5c8a31f7a6ad5daed8a3fceb56230b2e2fc04a25f52a43b3b4ea81e4a6ab15c52869f749c4b747d855cd4b618c04bcbb40e85dec7eab31fbe3bd45e8c9b755ef'
+            '98c8b47e9a36ba3f130454fdd68c508f54b78eb65ddb071ca85bdcc3b324699e51155e3fc425ccae98350bb6430fea4771c0338024c1e06063a54b879bb707db'
             '2f3561852475959e884a09662e248155d642e1e3ae3996020333dee0709907917f05a43f4351dffde898fd0a10954078fe998763a4df0a35167afaafa9abf600'
             '854c52d168837a5c72559498d10dff7843275323c4082d1c741c832d068108be3a51e823c98a27ea47c5fe4f335499fdbcaa3698117740ef24c07c41161ad59b'
             '7d9c692980c77a3b0658a5dd707ecdcd1e3fe47c2958f539f1f81dd04d5f204f779569d6b880c3f12872397d6171b2ec2caab9a4e79461c9f5828ca1c45acb08')
diff --git a/xkeyboard-config-ducky/pt-layout.patch b/xkeyboard-config-ducky/pt-layout.patch
new file mode 100644
index 0000000..19c1d06
--- /dev/null
+++ b/xkeyboard-config-ducky/pt-layout.patch
@@ -0,0 +1,85 @@
+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
+
+