summaryrefslogtreecommitdiff
path: root/source/x
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2019-06-14 19:27:00 +0000
committerEric Hameleers <alien@slackware.com>2019-06-15 08:59:45 +0200
commit3932354f1e1ad64a5a0363ef94eff823460c4c17 (patch)
tree73e00c63d668cd04922659ccd16f47715036f020 /source/x
parentfd6b57e0557ee8639a2010c4abbe4ab5db56328f (diff)
downloadcurrent-3932354f1e1ad64a5a0363ef94eff823460c4c17.tar.gz
Fri Jun 14 19:27:00 UTC 201920190614192700
a/util-linux-2.34-x86_64-1.txz: Upgraded. kde/kdepimlibs-4.14.10-x86_64-8.txz: Rebuilt. Recompiled to pull in new gpgme++ header files. n/gpgme-1.13.1-x86_64-1.txz: Upgraded. x/xkeyboard-config-2.27-noarch-1.txz: Upgraded. xfce/exo-0.12.6-x86_64-1.txz: Upgraded. testing/packages/mesa-19.1.0-x86_64-2.txz: Rebuilt. Added gallium drivers: swr,iris Thanks to USUARIONUEVO.
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, 1 insertions, 84 deletions
diff --git a/source/x/x11/build/xkeyboard-config b/source/x/x11/build/xkeyboard-config
index 0cfbf088..d00491fd 100644
--- a/source/x/x11/build/xkeyboard-config
+++ b/source/x/x11/build/xkeyboard-config
@@ -1 +1 @@
-2
+1
diff --git a/source/x/x11/patch/xkeyboard-config.patch b/source/x/x11/patch/xkeyboard-config.patch
deleted file mode 100644
index 712521a9..00000000
--- a/source/x/x11/patch/xkeyboard-config.patch
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 93d59738..00000000
--- a/source/x/x11/patch/xkeyboard-config/xkeyboard-config.fix_pt.patch
+++ /dev/null
@@ -1,82 +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 ] };
- };
-