From 0aa4ddfcc4e2610b1ba115e34626bbc52d384990 Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Sun, 28 Apr 2019 18:58:12 +0000 Subject: Sun Apr 28 18:58:12 UTC 2019 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. --- source/x/x11/build/xkeyboard-config | 2 +- source/x/x11/patch/xkeyboard-config.patch | 1 + .../xkeyboard-config/xkeyboard-config.fix_pt.patch | 82 ++++++++++++++++++++++ 3 files changed, 84 insertions(+), 1 deletion(-) create mode 100644 source/x/x11/patch/xkeyboard-config.patch create mode 100644 source/x/x11/patch/xkeyboard-config/xkeyboard-config.fix_pt.patch (limited to 'source/x') diff --git a/source/x/x11/build/xkeyboard-config b/source/x/x11/build/xkeyboard-config index d00491fd7..0cfbf0888 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 000000000..712521a90 --- /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 000000000..93d597383 --- /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 +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 `` { [ q, Q, at, Greek_OMEGA ] }; +- key `` { [ w, W, lstroke, Lstroke ] }; +- key `` { [ f, F, dstroke, ordfeminine ] }; +- key `` { [ p, P, thorn, THORN ] }; +- key `` { [ g, G, eng, ENG ] }; +- key `` { [ j, J, dead_hook, dead_horn ] }; +- key `` { [ l, L, lstroke, Lstroke ] }; +- key `` { [ u, U, downarrow, uparrow ] }; +- key `` { [ y, Y, leftarrow, yen ] }; +- key `` { [ ccedilla, Ccedilla, dead_acute, dead_doubleacute ] }; +- +- key `` { [ a, A, ae, AE ] }; +- key `` { [ r, R, paragraph, registered ] }; +- key `` { [ s, S, ssharp, section ] }; +- key `` { [ t, T, tslash, Tslash ] }; +- key `` { [ d, D, eth, ETH ] }; +- key `` { [ h, H, hstroke, Hstroke ] }; +- key `` { [ n, N, n, N ] }; +- key `` { [ e, E, EuroSign, cent ] }; +- key `` { [ i, I, rightarrow, idotless ] }; +- key `` { [ o, O, oslash, Ooblique ] }; +- +- key `` { [ z, Z, guillemotleft, less ] }; +- key `` { [ x, X, guillemotright, greater ] }; +- key `` { [ c, C, cent, copyright ] }; +- key `` { [ v, V, leftdoublequotemark, leftsinglequotemark ] }; +- key `` { [ b, B, rightdoublequotemark, rightsinglequotemark ] }; +- key `` { [ k, K, kra, ampersand ] }; +- key `` { [ m, M, mu, masculine ] }; +- +- key `` { [ BackSpace, BackSpace, BackSpace, BackSpace ] }; ++ key { [ q, Q, at, Greek_OMEGA ] }; ++ key { [ w, W, lstroke, Lstroke ] }; ++ key { [ f, F, dstroke, ordfeminine ] }; ++ key { [ p, P, thorn, THORN ] }; ++ key { [ g, G, eng, ENG ] }; ++ key { [ j, J, dead_hook, dead_horn ] }; ++ key { [ l, L, lstroke, Lstroke ] }; ++ key { [ u, U, downarrow, uparrow ] }; ++ key { [ y, Y, leftarrow, yen ] }; ++ key { [ ccedilla, Ccedilla, dead_acute, dead_doubleacute ] }; ++ ++ key { [ a, A, ae, AE ] }; ++ key { [ r, R, paragraph, registered ] }; ++ key { [ s, S, ssharp, section ] }; ++ key { [ t, T, tslash, Tslash ] }; ++ key { [ d, D, eth, ETH ] }; ++ key { [ h, H, hstroke, Hstroke ] }; ++ key { [ n, N, n, N ] }; ++ key { [ e, E, EuroSign, cent ] }; ++ key { [ i, I, rightarrow, idotless ] }; ++ key { [ o, O, oslash, Ooblique ] }; ++ ++ key { [ z, Z, guillemotleft, less ] }; ++ key { [ x, X, guillemotright, greater ] }; ++ key { [ c, C, cent, copyright ] }; ++ key { [ v, V, leftdoublequotemark, leftsinglequotemark ] }; ++ key { [ b, B, rightdoublequotemark, rightsinglequotemark ] }; ++ key { [ k, K, kra, ampersand ] }; ++ key { [ m, M, mu, masculine ] }; ++ ++ key { [ BackSpace, BackSpace, BackSpace, BackSpace ] }; + }; + -- cgit v1.2.3-65-gdbad