Gentoo Archives: gentoo-commits

From: Matt Turner <mattst88@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/xkeyboard-config/, x11-misc/xkeyboard-config/files/
Date: Thu, 14 Mar 2019 21:07:43
Message-Id: 1552597647.d179736226a636501c3d423f1f92f822b114471a.mattst88@gentoo
1 commit: d179736226a636501c3d423f1f92f822b114471a
2 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
3 AuthorDate: Thu Mar 14 21:06:40 2019 +0000
4 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5 CommitDate: Thu Mar 14 21:07:27 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1797362
7
8 x11-misc/xkeyboard-config: Add upstream patch to fix pt layout
9
10 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
11
12 ...yboard-config-2.26-Fixed-broken-pt-layout.patch | 84 ++++++++++++++++++++++
13 ...2.26.ebuild => xkeyboard-config-2.26-r1.ebuild} | 4 ++
14 2 files changed, 88 insertions(+)
15
16 diff --git a/x11-misc/xkeyboard-config/files/xkeyboard-config-2.26-Fixed-broken-pt-layout.patch b/x11-misc/xkeyboard-config/files/xkeyboard-config-2.26-Fixed-broken-pt-layout.patch
17 new file mode 100644
18 index 00000000000..4728e4bebff
19 --- /dev/null
20 +++ b/x11-misc/xkeyboard-config/files/xkeyboard-config-2.26-Fixed-broken-pt-layout.patch
21 @@ -0,0 +1,84 @@
22 +From af6c0f29dbee1cc7b280eed891592797c2e31220 Mon Sep 17 00:00:00 2001
23 +From: Sergey Udaltsov <sergey.udaltsov@×××××.com>
24 +Date: Thu, 7 Feb 2019 20:40:35 +0000
25 +Subject: [PATCH] Fixed broken pt layout
26 +
27 +Backticks broke it, removed
28 +---
29 + symbols/pt | 62 +++++++++++++++++++++++++++---------------------------
30 + 1 file changed, 31 insertions(+), 31 deletions(-)
31 +
32 +diff --git a/symbols/pt b/symbols/pt
33 +index 73a1b7b..3ec0981 100644
34 +--- a/symbols/pt
35 ++++ b/symbols/pt
36 +@@ -221,35 +221,35 @@ xkb_symbols "colemak" {
37 +
38 + name[Group1]="Portuguese (Colemak)";
39 +
40 +- key `<AD01>` { [ q, Q, at, Greek_OMEGA ] };
41 +- key `<AD02>` { [ w, W, lstroke, Lstroke ] };
42 +- key `<AD03>` { [ f, F, dstroke, ordfeminine ] };
43 +- key `<AD04>` { [ p, P, thorn, THORN ] };
44 +- key `<AD05>` { [ g, G, eng, ENG ] };
45 +- key `<AD06>` { [ j, J, dead_hook, dead_horn ] };
46 +- key `<AD07>` { [ l, L, lstroke, Lstroke ] };
47 +- key `<AD08>` { [ u, U, downarrow, uparrow ] };
48 +- key `<AD09>` { [ y, Y, leftarrow, yen ] };
49 +- key `<AD10>` { [ ccedilla, Ccedilla, dead_acute, dead_doubleacute ] };
50 +-
51 +- key `<AC01>` { [ a, A, ae, AE ] };
52 +- key `<AC02>` { [ r, R, paragraph, registered ] };
53 +- key `<AC03>` { [ s, S, ssharp, section ] };
54 +- key `<AC04>` { [ t, T, tslash, Tslash ] };
55 +- key `<AC05>` { [ d, D, eth, ETH ] };
56 +- key `<AC06>` { [ h, H, hstroke, Hstroke ] };
57 +- key `<AC07>` { [ n, N, n, N ] };
58 +- key `<AC08>` { [ e, E, EuroSign, cent ] };
59 +- key `<AC09>` { [ i, I, rightarrow, idotless ] };
60 +- key `<AC10>` { [ o, O, oslash, Ooblique ] };
61 +-
62 +- key `<AB01>` { [ z, Z, guillemotleft, less ] };
63 +- key `<AB02>` { [ x, X, guillemotright, greater ] };
64 +- key `<AB03>` { [ c, C, cent, copyright ] };
65 +- key `<AB04>` { [ v, V, leftdoublequotemark, leftsinglequotemark ] };
66 +- key `<AB05>` { [ b, B, rightdoublequotemark, rightsinglequotemark ] };
67 +- key `<AB08>` { [ k, K, kra, ampersand ] };
68 +- key `<AB07>` { [ m, M, mu, masculine ] };
69 +-
70 +- key `<CAPS>` { [ BackSpace, BackSpace, BackSpace, BackSpace ] };
71 ++ key <AD01> { [ q, Q, at, Greek_OMEGA ] };
72 ++ key <AD02> { [ w, W, lstroke, Lstroke ] };
73 ++ key <AD03> { [ f, F, dstroke, ordfeminine ] };
74 ++ key <AD04> { [ p, P, thorn, THORN ] };
75 ++ key <AD05> { [ g, G, eng, ENG ] };
76 ++ key <AD06> { [ j, J, dead_hook, dead_horn ] };
77 ++ key <AD07> { [ l, L, lstroke, Lstroke ] };
78 ++ key <AD08> { [ u, U, downarrow, uparrow ] };
79 ++ key <AD09> { [ y, Y, leftarrow, yen ] };
80 ++ key <AD10> { [ ccedilla, Ccedilla, dead_acute, dead_doubleacute ] };
81 ++
82 ++ key <AC01> { [ a, A, ae, AE ] };
83 ++ key <AC02> { [ r, R, paragraph, registered ] };
84 ++ key <AC03> { [ s, S, ssharp, section ] };
85 ++ key <AC04> { [ t, T, tslash, Tslash ] };
86 ++ key <AC05> { [ d, D, eth, ETH ] };
87 ++ key <AC06> { [ h, H, hstroke, Hstroke ] };
88 ++ key <AC07> { [ n, N, n, N ] };
89 ++ key <AC08> { [ e, E, EuroSign, cent ] };
90 ++ key <AC09> { [ i, I, rightarrow, idotless ] };
91 ++ key <AC10> { [ o, O, oslash, Ooblique ] };
92 ++
93 ++ key <AB01> { [ z, Z, guillemotleft, less ] };
94 ++ key <AB02> { [ x, X, guillemotright, greater ] };
95 ++ key <AB03> { [ c, C, cent, copyright ] };
96 ++ key <AB04> { [ v, V, leftdoublequotemark, leftsinglequotemark ] };
97 ++ key <AB05> { [ b, B, rightdoublequotemark, rightsinglequotemark ] };
98 ++ key <AB08> { [ k, K, kra, ampersand ] };
99 ++ key <AB07> { [ m, M, mu, masculine ] };
100 ++
101 ++ key <CAPS> { [ BackSpace, BackSpace, BackSpace, BackSpace ] };
102 + };
103 +--
104 +2.19.2
105 +
106
107 diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.26.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.26-r1.ebuild
108 similarity index 95%
109 rename from x11-misc/xkeyboard-config/xkeyboard-config-2.26.ebuild
110 rename to x11-misc/xkeyboard-config/xkeyboard-config-2.26-r1.ebuild
111 index 6ec7db35152..85d56e7d72f 100644
112 --- a/x11-misc/xkeyboard-config/xkeyboard-config-2.26.ebuild
113 +++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.26-r1.ebuild
114 @@ -33,6 +33,10 @@ DEPEND="
115 ${LIVE_DEPEND}
116 "
117
118 +PATCHES=(
119 + "${FILESDIR}"/${P}-Fixed-broken-pt-layout.patch
120 +)
121 +
122 src_prepare() {
123 default
124 [[ ${PV} == 9999 ]] && eautoreconf