bump versions, fix patches

4 files changed, 26 insertions, 19 deletions

diff --git a/rxvt-unicode-cvs-opt/PKGBUILD b/rxvt-unicode-cvs-opt/PKGBUILD
index 0fc0907..7ca6949 100644
--- a/rxvt-unicode-cvs-opt/PKGBUILD
+++ b/rxvt-unicode-cvs-opt/PKGBUILD
@@ -9,7 +9,7 @@
 
 _pkgname=rxvt-unicode
 pkgname=rxvt-unicode-cvs-opt
-pkgver=20180221
+pkgver=20181025
 pkgrel=1
 pkgdesc='A unicode enabled rxvt-clone terminal emulator (urxvt) - latest cvs revision'
 arch=('i686' 'x86_64')
diff --git a/xkeyboard-config-ducky/PKGBUILD b/xkeyboard-config-ducky/PKGBUILD
index 7847099..24879bd 100644
--- a/xkeyboard-config-ducky/PKGBUILD
+++ b/xkeyboard-config-ducky/PKGBUILD
@@ -9,7 +9,7 @@
 
 _pkgname=xkeyboard-config
 pkgname=xkeyboard-config-ducky
-pkgver=2.22
+pkgver=2.25
 pkgrel=1
 pkgdesc="X keyboard configuration files"
 arch=(any)
@@ -23,10 +23,10 @@ source=("https://xorg.freedesktop.org/archive/individual/data/${_pkgname}/${_pkg
         'ducky_mini'
         'ru.patch'
         'us.patch')
-sha256sums=('deaec9989fbc443358b43864437b7b6d39caff07890a4a8055105ce9fcaa59bd'
-            '8068381fb15735e60e636ab1b42f99f98e7112be8e9bd03f436688eb2a19ea80'
-            '3f62c3684339c3fb4c51a33c485685f881d20013971d114774ece3b613001832'
-            '215471b50a3c9544dd2e185cc34dd60bec3be8c54c12ed66723f81846f73eb38')
+sha512sums=('2d9d6bdd885edc8e03e5a2c136c3b29b4ea795122709fa210bf151c4e7416a44fa2928bb29137ee8c6691d8646c1f645748576dea3f940ce84c8d4d0f91e09eb'
+            '2f3561852475959e884a09662e248155d642e1e3ae3996020333dee0709907917f05a43f4351dffde898fd0a10954078fe998763a4df0a35167afaafa9abf600'
+            '854c52d168837a5c72559498d10dff7843275323c4082d1c741c832d068108be3a51e823c98a27ea47c5fe4f335499fdbcaa3698117740ef24c07c41161ad59b'
+            '7d9c692980c77a3b0658a5dd707ecdcd1e3fe47c2958f539f1f81dd04d5f204f779569d6b880c3f12872397d6171b2ec2caab9a4e79461c9f5828ca1c45acb08')
 
 build() {
   cd ${_pkgname}-${pkgver}
diff --git a/xkeyboard-config-ducky/ru.patch b/xkeyboard-config-ducky/ru.patch
index 0c1d945..8f3ed0c 100644
--- a/xkeyboard-config-ducky/ru.patch
+++ b/xkeyboard-config-ducky/ru.patch
@@ -1,11 +1,15 @@
---- a/symbols/ru	2017-10-04 14:29:44.000000000 +0300
-+++ b/symbols/ru	2017-12-06 15:21:17.855795258 +0300
-@@ -959,3 +959,8 @@
- // srp: Потребно да се ставља lv5:rwin_switch_lock или једна из других брава петег ступња, да би шљакао пребацивач Caps!
- // https://bugs.freedesktop.org/show_bug.cgi?id=102189
+--- a/symbols/ru	2018-10-25 15:20:51.864401115 +0300
++++ b/symbols/ru	2018-10-25 15:33:00.545899046 +0300
+@@ -130,6 +130,12 @@
+     key <AB10> { [       Cyrillic_io,       Cyrillic_IO  ] };
  };
-+
+ 
++// ducky mini fn mimicking layout for Russian
 +xkb_symbols "ducky" {
 +    name[Group1] = "Russian (RU typewriter, with a layout mimicking the Ducky Shine Mini fn functionality)";
 +    include "ducky_mini(ru)"
 +};
++
+ partial alphanumeric_keys
+ xkb_symbols "typewriter-legacy" {
+ 
diff --git a/xkeyboard-config-ducky/us.patch b/xkeyboard-config-ducky/us.patch
index 2012ae6..bb26448 100644
--- a/xkeyboard-config-ducky/us.patch
+++ b/xkeyboard-config-ducky/us.patch
@@ -1,12 +1,15 @@
---- a/symbols/us	2017-10-04 14:29:44.000000000 +0300
-+++ b/symbols/us	2017-12-06 15:21:23.275832820 +0300
-@@ -1787,3 +1787,9 @@
- 	xkb_symbols "sun_type6" {
- 	include "sun_vndr/us(sun_type6)"
+--- a/symbols/us	2018-10-25 15:27:27.338774628 +0300
++++ b/symbols/us	2018-10-25 15:32:56.549186558 +0300
+@@ -56,6 +56,12 @@
+     key <BKSL> {	[ backslash,         bar	]	};
  };
-+
-+
+ 
++// ducky mini fn mimicking layout for US English
 +xkb_symbols "ducky" {
 +    name[Group1] = "English (US, with a layout mimicking the Ducky Shine Mini fn functionality)";
 +    include "ducky_mini(us)"
 +};
++
+ partial alphanumeric_keys
+ xkb_symbols "euro" {
+