summaryrefslogtreecommitdiff
path: root/source/x
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2019-04-28 18:58:12 +0000
committerEric Hameleers <alien@slackware.com>2019-04-29 08:59:45 +0200
commit0aa4ddfcc4e2610b1ba115e34626bbc52d384990 (patch)
treeee88c01460e5e25a152e4a9b0dbd2c5878739480 /source/x
parent495148272d8fc1529a1d066c8b0e30dc4230832e (diff)
downloadcurrent-0aa4ddfcc4e2610b1ba115e34626bbc52d384990.tar.gz
Sun Apr 28 18:58:12 UTC 201920190428185812
ap/qpdf-8.4.1-x86_64-1.txz: Upgraded. l/M2Crypto-0.33.0-x86_64-1.txz: Upgraded. l/python-requests-2.21.0-x86_64-4.txz: Rebuilt. Also patch __init__.py to allow a newer urllib3. Thanks to petslack. x/xkeyboard-config-2.26-noarch-2.txz: Rebuilt. Fixed broken pt keymap. Thanks to sairum. extra/bash-completion/bash-completion-2.9-noarch-1.txz: Upgraded.
Diffstat (limited to 'source/x')
-rw-r--r--source/x/x11/build/xkeyboard-config2
-rw-r--r--source/x/x11/patch/xkeyboard-config.patch1
-rw-r--r--source/x/x11/patch/xkeyboard-config/xkeyboard-config.fix_pt.patch82
3 files changed, 84 insertions, 1 deletions
diff --git a/source/x/x11/build/xkeyboard-config b/source/x/x11/build/xkeyboard-config
index d00491fd..0cfbf088 100644
--- a/source/x/x11/build/xkeyboard-config
+++ b/source/x/x11/build/xkeyboard-config
@@ -1 +1 @@
-1
+2
diff --git a/source/x/x11/patch/xkeyboard-config.patch b/source/x/x11/patch/xkeyboard-config.patch
new file mode 100644
index 00000000..712521a9
--- /dev/null
+++ b/source/x/x11/patch/xkeyboard-config.patch
@@ -0,0 +1 @@
+zcat $CWD/patch/xkeyboard-config/xkeyboard-config.fix_pt.patch.gz | patch -p1 || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/x/x11/patch/xkeyboard-config/xkeyboard-config.fix_pt.patch b/source/x/x11/patch/xkeyboard-config/xkeyboard-config.fix_pt.patch
new file mode 100644
index 00000000..93d59738
--- /dev/null
+++ b/source/x/x11/patch/xkeyboard-config/xkeyboard-config.fix_pt.patch
@@ -0,0 +1,82 @@
+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 ] };
+ };
+