diff --git a/temp/xkeyboard-config/0013-Add-model-for-Pine64-PinePhone-keyboard.patch b/temp/xkeyboard-config/0001-Add-model-for-Pine64-PinePhone-keyboard.patch similarity index 100% rename from temp/xkeyboard-config/0013-Add-model-for-Pine64-PinePhone-keyboard.patch rename to temp/xkeyboard-config/0001-Add-model-for-Pine64-PinePhone-keyboard.patch diff --git a/temp/xkeyboard-config/0001-RX-51-Symbols-Bind-Escape-to-third-level-Backspace.patch b/temp/xkeyboard-config/0001-RX-51-Symbols-Bind-Escape-to-third-level-Backspace.patch deleted file mode 100644 index 675cef161..000000000 --- a/temp/xkeyboard-config/0001-RX-51-Symbols-Bind-Escape-to-third-level-Backspace.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 05d512bd6a4d8e4db0e676c9c55b0bb3e4a294e1 Mon Sep 17 00:00:00 2001 -From: Joni Lapilainen -Date: Sun, 24 Feb 2013 17:46:47 +0200 -Subject: [PATCH 01/10] RX-51: Symbols: Bind Escape to third level Backspace - ---- - symbols/nokia_vndr/rx-51 | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/symbols/nokia_vndr/rx-51 b/symbols/nokia_vndr/rx-51 -index 318d372..ebd077e 100644 ---- a/symbols/nokia_vndr/rx-51 -+++ b/symbols/nokia_vndr/rx-51 -@@ -3,7 +3,7 @@ xkb_symbols "common" { - include "nokia_vndr/rx-51(common_keys)" - include "nokia_vndr/rx-51(modifiers)" - -- key { [ BackSpace, Delete, BackSpace, Delete ] }; -+ key { [ BackSpace, Delete, Escape, Delete ] }; - - // This section should not be included by any other section. - // It's referenced only once by rule file to allow multiple layout configurations. --- -1.8.1.4 - diff --git a/temp/xkeyboard-config/0014-Add-evdev-rule-for-Pine64-PinePhone-keyboard.patch b/temp/xkeyboard-config/0002-Add-evdev-rule-for-Pine64-PinePhone-keyboard.patch similarity index 100% rename from temp/xkeyboard-config/0014-Add-evdev-rule-for-Pine64-PinePhone-keyboard.patch rename to temp/xkeyboard-config/0002-Add-evdev-rule-for-Pine64-PinePhone-keyboard.patch diff --git a/temp/xkeyboard-config/0002-RX-51-Symbols-Bind-function-keys-to-fourth-level-top.patch b/temp/xkeyboard-config/0002-RX-51-Symbols-Bind-function-keys-to-fourth-level-top.patch deleted file mode 100644 index 6be5df6a6..000000000 --- a/temp/xkeyboard-config/0002-RX-51-Symbols-Bind-function-keys-to-fourth-level-top.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 4659852c4d94384a1af5239d248de6ebb16e4c05 Mon Sep 17 00:00:00 2001 -From: Joni Lapilainen -Date: Sun, 24 Feb 2013 18:08:04 +0200 -Subject: [PATCH 02/10] RX-51: Symbols: Bind function keys to fourth level top - row - ---- - symbols/nokia_vndr/rx-51 | 24 ++++++++++++------------ - 1 file changed, 12 insertions(+), 12 deletions(-) - -diff --git a/symbols/nokia_vndr/rx-51 b/symbols/nokia_vndr/rx-51 -index ebd077e..a0dc3f5 100644 ---- a/symbols/nokia_vndr/rx-51 -+++ b/symbols/nokia_vndr/rx-51 -@@ -3,7 +3,7 @@ xkb_symbols "common" { - include "nokia_vndr/rx-51(common_keys)" - include "nokia_vndr/rx-51(modifiers)" - -- key { [ BackSpace, Delete, Escape, Delete ] }; -+ key { [ BackSpace, Delete, Escape, F12 ] }; - - // This section should not be included by any other section. - // It's referenced only once by rule file to allow multiple layout configurations. -@@ -382,17 +382,17 @@ partial hidden alphanumeric_keys - xkb_symbols "english_base" { - - // 1. row -- key { [ q, Q, 1, 1 ] }; -- key { [ w, W, 2, 2 ] }; -- key { [ e, E, 3, 3 ] }; -- key { [ r, R, 4, 4 ] }; -- key { [ t, T, 5, 5 ] }; -- key { [ y, Y, 6, 6 ] }; -- key { [ u, U, 7, 7 ] }; -- key { [ i, I, 8, 8 ] }; -- key { [ o, O, 9, 9 ] }; -- key { [ p, P, 0, 0 ] }; -- key { [ comma, semicolon, equal, equal ] }; -+ key { [ q, Q, 1, F1 ] }; -+ key { [ w, W, 2, F2 ] }; -+ key { [ e, E, 3, F3 ] }; -+ key { [ r, R, 4, F4 ] }; -+ key { [ t, T, 5, F5 ] }; -+ key { [ y, Y, 6, F6 ] }; -+ key { [ u, U, 7, F7 ] }; -+ key { [ i, I, 8, F8 ] }; -+ key { [ o, O, 9, F9 ] }; -+ key { [ p, P, 0, F10 ] }; -+ key { [ comma, semicolon, equal, F11 ] }; - - // 2. row - key { [ a, A, asterisk, asterisk ] }; --- -1.8.1.4 - diff --git a/temp/xkeyboard-config/0003-RX-51-Symbols-Bind-PgUp-PgDown-Home-End-to-third-lev.patch b/temp/xkeyboard-config/0003-RX-51-Symbols-Bind-PgUp-PgDown-Home-End-to-third-lev.patch deleted file mode 100644 index 31bd09bd8..000000000 --- a/temp/xkeyboard-config/0003-RX-51-Symbols-Bind-PgUp-PgDown-Home-End-to-third-lev.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 8b6c8f189491308a7f2d0c2807046ce65483b9d9 Mon Sep 17 00:00:00 2001 -From: Joni Lapilainen -Date: Sun, 24 Feb 2013 18:18:29 +0200 -Subject: [PATCH 03/10] RX-51: Symbols: Bind PgUp, PgDown, Home, End to third - level arrow keys on arrows_4btns - ---- - symbols/nokia_vndr/rx-51 | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/symbols/nokia_vndr/rx-51 b/symbols/nokia_vndr/rx-51 -index a0dc3f5..5ca6aaa 100644 ---- a/symbols/nokia_vndr/rx-51 -+++ b/symbols/nokia_vndr/rx-51 -@@ -486,10 +486,10 @@ partial hidden alphanumeric_keys - xkb_symbols "arrows_4btns" { - // standard arrows mapping - // normal 2nd level must not be enumerated to allow text selection with Shift key -- key { type[Group1] = "ONE_LEVEL", symbols[Group1] = [ Up ] }; -- key { type[Group1] = "ONE_LEVEL", symbols[Group1] = [ Left ] }; -- key { type[Group1] = "ONE_LEVEL", symbols[Group1] = [ Down ] }; -- key { type[Group1] = "ONE_LEVEL", symbols[Group1] = [ Right ] }; -+ key { type[Group1] = "PC_FN_LEVEL2", symbols[Group1] = [ Up, Prior ] }; -+ key { type[Group1] = "PC_FN_LEVEL2", symbols[Group1] = [ Left, Home ] }; -+ key { type[Group1] = "PC_FN_LEVEL2", symbols[Group1] = [ Down, Next ] }; -+ key { type[Group1] = "PC_FN_LEVEL2", symbols[Group1] = [ Right, End ] }; - }; - - // author: Roman Moravcik --- -1.8.1.4 - diff --git a/temp/xkeyboard-config/0004-RX-51-Symbols-Bind-less-and-greater-to-fourth-level-.patch b/temp/xkeyboard-config/0004-RX-51-Symbols-Bind-less-and-greater-to-fourth-level-.patch deleted file mode 100644 index 8637d0cb7..000000000 --- a/temp/xkeyboard-config/0004-RX-51-Symbols-Bind-less-and-greater-to-fourth-level-.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 8471ec6f7574e27f714dee60d35814b6c719c18f Mon Sep 17 00:00:00 2001 -From: Joni Lapilainen -Date: Sun, 24 Feb 2013 18:38:10 +0200 -Subject: [PATCH 04/10] RX-51: Symbols: Bind less and greater to fourth level V - and B - ---- - symbols/nokia_vndr/rx-51 | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/symbols/nokia_vndr/rx-51 b/symbols/nokia_vndr/rx-51 -index 5ca6aaa..1f66785 100644 ---- a/symbols/nokia_vndr/rx-51 -+++ b/symbols/nokia_vndr/rx-51 -@@ -410,8 +410,8 @@ xkb_symbols "english_base" { - key { [ z, Z, sterling, sterling ] }; - key { [ x, X, dollar, dollar ] }; - key { [ c, C, EuroSign, EuroSign ] }; -- key { [ v, V, slash, slash ] }; -- key { [ b, B, backslash, backslash ] }; -+ key { [ v, V, slash, less ] }; -+ key { [ b, B, backslash, greater ] }; - key { [ n, N, quotedbl, quotedbl ] }; - key { [ m, M, apostrophe, apostrophe ] }; - key { [ space, space, at, at ] }; --- -1.8.1.4 - diff --git a/temp/xkeyboard-config/0005-RX-51-Symbols-Bind-volume-keys-as-XF86-raise-and-low.patch b/temp/xkeyboard-config/0005-RX-51-Symbols-Bind-volume-keys-as-XF86-raise-and-low.patch deleted file mode 100644 index 0b00e691b..000000000 --- a/temp/xkeyboard-config/0005-RX-51-Symbols-Bind-volume-keys-as-XF86-raise-and-low.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 5dec8ebd767243288ef0fcb6dda03b689fdd2d82 Mon Sep 17 00:00:00 2001 -From: Joni Lapilainen -Date: Sun, 24 Feb 2013 19:47:36 +0200 -Subject: [PATCH 05/10] RX-51: Symbols: Bind volume keys as XF86 raise and - lower volume, third level for VT switch - ---- - symbols/nokia_vndr/rx-51 | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/symbols/nokia_vndr/rx-51 b/symbols/nokia_vndr/rx-51 -index 1f66785..5b0dbd0 100644 ---- a/symbols/nokia_vndr/rx-51 -+++ b/symbols/nokia_vndr/rx-51 -@@ -445,8 +445,10 @@ xkb_symbols "common_keys" { - // The only exception is an active call in portrait mode where we want to - // use the real meanings of the keys. This special case and management of - // +/- keys in general is handled in maemo-statusmenu-volume. -- key { [ F8 ] }; -- key { [ F7 ] }; -+ // -+ // Maemo wants KF07 as F8 and FK08 as F7. We don't care about that. -+ key { type= "PC_FN_LEVEL2", [ XF86AudioLowerVolume, XF86Switch_VT_1 ] }; -+ key { type= "PC_FN_LEVEL2", [ XF86AudioRaiseVolume, XF86Switch_VT_2 ] }; - - key { [ F9 ] }; - key { [ F10 ] }; --- -1.8.1.4 - diff --git a/temp/xkeyboard-config/0006-RX-51-Symbols-Bind-bar-to-fourth-level-L.patch b/temp/xkeyboard-config/0006-RX-51-Symbols-Bind-bar-to-fourth-level-L.patch deleted file mode 100644 index 05a553755..000000000 --- a/temp/xkeyboard-config/0006-RX-51-Symbols-Bind-bar-to-fourth-level-L.patch +++ /dev/null @@ -1,25 +0,0 @@ -From bacc31890b3a2101a7518011513bea3c87a3d759 Mon Sep 17 00:00:00 2001 -From: Joni Lapilainen -Date: Sun, 24 Feb 2013 20:23:07 +0200 -Subject: [PATCH 06/10] RX-51: Symbols: Bind bar to fourth level L - ---- - symbols/nokia_vndr/rx-51 | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/symbols/nokia_vndr/rx-51 b/symbols/nokia_vndr/rx-51 -index 5b0dbd0..b866ad2 100644 ---- a/symbols/nokia_vndr/rx-51 -+++ b/symbols/nokia_vndr/rx-51 -@@ -403,7 +403,7 @@ xkb_symbols "english_base" { - key { [ h, H, parenleft, parenleft ] }; - key { [ j, J, parenright, parenright ] }; - key { [ k, K, ampersand, ampersand ] }; -- key { [ l, L, exclam, exclam ] }; -+ key { [ l, L, exclam, bar ] }; - key { [ period, colon, question, question ] }; - - // 3. row --- -1.8.1.4 - diff --git a/temp/xkeyboard-config/0007-RX-51-Symbols-Bind-tilde-to-fourth-level-C-and-F.patch b/temp/xkeyboard-config/0007-RX-51-Symbols-Bind-tilde-to-fourth-level-C-and-F.patch deleted file mode 100644 index dbe603b57..000000000 --- a/temp/xkeyboard-config/0007-RX-51-Symbols-Bind-tilde-to-fourth-level-C-and-F.patch +++ /dev/null @@ -1,34 +0,0 @@ -From ffe1a6ca63fc4c0e7b2ca2ae5e53d1add8bda206 Mon Sep 17 00:00:00 2001 -From: Joni Lapilainen -Date: Sun, 24 Feb 2013 20:35:00 +0200 -Subject: [PATCH 07/10] RX-51: Symbols: Bind tilde to fourth level C and F - ---- - symbols/nokia_vndr/rx-51 | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/symbols/nokia_vndr/rx-51 b/symbols/nokia_vndr/rx-51 -index b866ad2..3edba1f 100644 ---- a/symbols/nokia_vndr/rx-51 -+++ b/symbols/nokia_vndr/rx-51 -@@ -398,7 +398,7 @@ xkb_symbols "english_base" { - key { [ a, A, asterisk, asterisk ] }; - key { [ s, S, plus, plus ] }; - key { [ d, D, numbersign, numbersign ] }; -- key { [ f, F, minus, minus ] }; -+ key { [ f, F, minus, asciitilde ] }; - key { [ g, G, underscore, underscore ] }; - key { [ h, H, parenleft, parenleft ] }; - key { [ j, J, parenright, parenright ] }; -@@ -409,7 +409,7 @@ xkb_symbols "english_base" { - // 3. row - key { [ z, Z, sterling, sterling ] }; - key { [ x, X, dollar, dollar ] }; -- key { [ c, C, EuroSign, EuroSign ] }; -+ key { [ c, C, EuroSign, asciitilde ] }; - key { [ v, V, slash, less ] }; - key { [ b, B, backslash, greater ] }; - key { [ n, N, quotedbl, quotedbl ] }; --- -1.8.1.4 - diff --git a/temp/xkeyboard-config/0008-RX-51-Symbols-Bind-percent-to-fourth-level-D.patch b/temp/xkeyboard-config/0008-RX-51-Symbols-Bind-percent-to-fourth-level-D.patch deleted file mode 100644 index 81c1a9586..000000000 --- a/temp/xkeyboard-config/0008-RX-51-Symbols-Bind-percent-to-fourth-level-D.patch +++ /dev/null @@ -1,25 +0,0 @@ -From e2ebb55a2e722b4b141b2538395f93df3c730d09 Mon Sep 17 00:00:00 2001 -From: Joni Lapilainen -Date: Sun, 24 Feb 2013 21:05:42 +0200 -Subject: [PATCH 08/10] RX-51: Symbols: Bind percent to fourth level D - ---- - symbols/nokia_vndr/rx-51 | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/symbols/nokia_vndr/rx-51 b/symbols/nokia_vndr/rx-51 -index 3edba1f..a91db61 100644 ---- a/symbols/nokia_vndr/rx-51 -+++ b/symbols/nokia_vndr/rx-51 -@@ -397,7 +397,7 @@ xkb_symbols "english_base" { - // 2. row - key { [ a, A, asterisk, asterisk ] }; - key { [ s, S, plus, plus ] }; -- key { [ d, D, numbersign, numbersign ] }; -+ key { [ d, D, numbersign, percent ] }; - key { [ f, F, minus, asciitilde ] }; - key { [ g, G, underscore, underscore ] }; - key { [ h, H, parenleft, parenleft ] }; --- -1.8.1.4 - diff --git a/temp/xkeyboard-config/0009-RX-51-Symbols-Bind-Tab-to-third-level-Return.patch b/temp/xkeyboard-config/0009-RX-51-Symbols-Bind-Tab-to-third-level-Return.patch deleted file mode 100644 index 488e2fade..000000000 --- a/temp/xkeyboard-config/0009-RX-51-Symbols-Bind-Tab-to-third-level-Return.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 95b8be003cf2ef8887d1936d38a0214ff724ca69 Mon Sep 17 00:00:00 2001 -From: Joni Lapilainen -Date: Sun, 24 Feb 2013 21:12:00 +0200 -Subject: [PATCH 09/10] RX-51: Symbols: Bind Tab to third level Return - ---- - symbols/nokia_vndr/rx-51 | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/symbols/nokia_vndr/rx-51 b/symbols/nokia_vndr/rx-51 -index a91db61..aaa653a 100644 ---- a/symbols/nokia_vndr/rx-51 -+++ b/symbols/nokia_vndr/rx-51 -@@ -425,7 +425,7 @@ xkb_symbols "common_keys" { - key { [ Tab ] }; - - // broken UI spec. -- key { [ KP_Enter ] }; -+ key { type[Group1] = "PC_FN_LEVEL2", symbols[Group1] = [ KP_Enter, Tab ] }; - - key { [ Return ] }; - key { [ Escape ] }; --- -1.8.1.4 - diff --git a/temp/xkeyboard-config/0010-RX-51-Symbols-Bind-braces-to-fourth-level-N-and-M.patch b/temp/xkeyboard-config/0010-RX-51-Symbols-Bind-braces-to-fourth-level-N-and-M.patch deleted file mode 100644 index 9822e42a8..000000000 --- a/temp/xkeyboard-config/0010-RX-51-Symbols-Bind-braces-to-fourth-level-N-and-M.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 28d7293375839bff1368f42093043ffa10afac5e Mon Sep 17 00:00:00 2001 -From: Joni Lapilainen -Date: Mon, 25 Feb 2013 15:51:14 +0200 -Subject: [PATCH 10/10] RX-51: Symbols: Bind braces to fourth level N and M - -In a perfect world, we could easily get ({[]}) from the same H and J keys, -parentheses being in third level, braces in fourth, and brackets accessible -with Multi key, double press. However, there is a hardware limitation in N900 -which renders fourth level J (applies to few other keys too) useless. So, as a -next best solution, we map braces to fourth level N and M, as they are -physically under the keys that produce parentheses and brackets. This should -be somewhat logical placement and also easy to remember and use. ---- - symbols/nokia_vndr/rx-51 | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/symbols/nokia_vndr/rx-51 b/symbols/nokia_vndr/rx-51 -index aaa653a..fa76bbe 100644 ---- a/symbols/nokia_vndr/rx-51 -+++ b/symbols/nokia_vndr/rx-51 -@@ -412,8 +412,8 @@ xkb_symbols "english_base" { - key { [ c, C, EuroSign, asciitilde ] }; - key { [ v, V, slash, less ] }; - key { [ b, B, backslash, greater ] }; -- key { [ n, N, quotedbl, quotedbl ] }; -- key { [ m, M, apostrophe, apostrophe ] }; -+ key { [ n, N, quotedbl, braceleft ] }; -+ key { [ m, M, apostrophe, braceright ] }; - key { [ space, space, at, at ] }; - }; - --- -1.8.1.4 - diff --git a/temp/xkeyboard-config/0011-RX-51-Symbols-Extend-Swiss-layout.patch b/temp/xkeyboard-config/0011-RX-51-Symbols-Extend-Swiss-layout.patch deleted file mode 100644 index 7af39cab0..000000000 --- a/temp/xkeyboard-config/0011-RX-51-Symbols-Extend-Swiss-layout.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 609006cba4e96e376915df1e66cf397c73ffe8b7 Mon Sep 17 00:00:00 2001 -From: Daniele Debernardi -Date: Fri, 19 Jul 2019 22:18:33 +0000 -Subject: [PATCH] RX-51: Symbols: Extend Swiss layout - ---- - symbols/nokia_vndr/rx-51 | 26 ++++++++++++++++++-------- - 1 file changed, 18 insertions(+), 8 deletions(-) - -diff --git a/symbols/nokia_vndr/rx-51 b/symbols/nokia_vndr/rx-51 -index 567a054..ddb87da 100644 ---- a/symbols/nokia_vndr/rx-51 -+++ b/symbols/nokia_vndr/rx-51 -@@ -216,22 +216,32 @@ xkb_symbols "ch" { - name[Group1] = "Swiss"; - - // 1. row -- key { [ z, Z, 6, 6 ] }; -- key { [ udiaeresis, Udiaeresis, egrave, Egrave ] }; -+ key { [ z, Z, 6, F6 ] }; -+ key { [ udiaeresis, Udiaeresis, egrave, F11 ] }; - - // 2. row -- key { [ h, H, equal, equal ] }; -+ key { [ s, S, plus, ampersand ] }; -+ key { [ d, D, numbersign, dollar ] }; -+ key { [ f, F, minus, percent ] }; -+ key { [ g, G, underscore, bracketleft ] }; -+ key { [ h, H, equal, bracketright ] }; - key { [ j, J, parenleft, parenleft ] }; - key { [ k, K, parenright, parenright ] }; -- key { [ l, L, colon, colon ] }; -- key { [ odiaeresis, Odiaeresis, eacute, Aacute ] }; -- key { [ adiaeresis, Adiaeresis, agrave, Agrave ] }; -+ key { [ l, L, colon, semicolon ] }; -+ key { [ odiaeresis, Odiaeresis, eacute, bar ] }; -+ key { [ adiaeresis, Adiaeresis, agrave, asciitilde ] }; - - // 3. row - key { [ y, Y, question, question ] }; - key { [ x, X, exclam, exclam ] }; -- key { [ c, C, ccedilla, Ccedilla ] }; -- key { [ period, comma, comma, comma ] }; -+ key { [ c, C, ccedilla, less ] }; -+ key { [ v, V, slash, greater ] }; -+ key { [ b, B, backslash, braceleft ] }; -+ key { [ n, N, quotedbl, braceright ] }; -+ key { [ m, M, apostrophe, asciicircum ] }; -+ key { [ period, comma, comma, degree ] }; -+ key { [ Left, Up, Up, Prior ] }; -+ key { [ Right, Down, Down, Next ] }; - }; - - --- -2.22.0 - diff --git a/temp/xkeyboard-config/0012-RX-51-Symbols-Bind-square-brackets.patch b/temp/xkeyboard-config/0012-RX-51-Symbols-Bind-square-brackets.patch deleted file mode 100644 index 0636da36a..000000000 --- a/temp/xkeyboard-config/0012-RX-51-Symbols-Bind-square-brackets.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 56f8d74966442ba3f28f6d389186d1e2fe6767bb Mon Sep 17 00:00:00 2001 -From: Daniele Debernardi -Date: Wed, 21 Aug 2019 22:55:57 +0000 -Subject: [PATCH] RX-51: Symbols: Bind square brackets - ---- - symbols/nokia_vndr/rx-51 | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/symbols/nokia_vndr/rx-51 b/symbols/nokia_vndr/rx-51 -index ddb87da..21bbedb 100644 ---- a/symbols/nokia_vndr/rx-51 -+++ b/symbols/nokia_vndr/rx-51 -@@ -409,8 +409,8 @@ xkb_symbols "english_base" { - key { [ s, S, plus, plus ] }; - key { [ d, D, numbersign, percent ] }; - key { [ f, F, minus, asciitilde ] }; -- key { [ g, G, underscore, underscore ] }; -- key { [ h, H, parenleft, parenleft ] }; -+ key { [ g, G, underscore, bracketleft ] }; -+ key { [ h, H, parenleft, bracketright ] }; - key { [ j, J, parenright, parenright ] }; - key { [ k, K, ampersand, ampersand ] }; - key { [ l, L, exclam, bar ] }; --- -2.23.0 - diff --git a/temp/xkeyboard-config/APKBUILD b/temp/xkeyboard-config/APKBUILD index 7a0c0df4f..8df03e2a5 100644 --- a/temp/xkeyboard-config/APKBUILD +++ b/temp/xkeyboard-config/APKBUILD @@ -2,7 +2,7 @@ pkgname=xkeyboard-config pkgver=9999 _pkgver=2.35.1 -pkgrel=4 +pkgrel=5 pkgdesc="X keyboard configuration files" url="http://www.freedesktop.org/wiki/Software/XKeyboardConfig" arch="noarch" @@ -10,20 +10,8 @@ license="MIT" subpackages="$pkgname-doc" makedepends="meson perl libxslt" source="$pkgname-$_pkgver.tar.gz::https://github.com/freedesktop/xkeyboard-config/archive/refs/tags/xkeyboard-config-$_pkgver.tar.gz - 0001-RX-51-Symbols-Bind-Escape-to-third-level-Backspace.patch - 0002-RX-51-Symbols-Bind-function-keys-to-fourth-level-top.patch - 0003-RX-51-Symbols-Bind-PgUp-PgDown-Home-End-to-third-lev.patch - 0004-RX-51-Symbols-Bind-less-and-greater-to-fourth-level-.patch - 0005-RX-51-Symbols-Bind-volume-keys-as-XF86-raise-and-low.patch - 0006-RX-51-Symbols-Bind-bar-to-fourth-level-L.patch - 0007-RX-51-Symbols-Bind-tilde-to-fourth-level-C-and-F.patch - 0008-RX-51-Symbols-Bind-percent-to-fourth-level-D.patch - 0009-RX-51-Symbols-Bind-Tab-to-third-level-Return.patch - 0010-RX-51-Symbols-Bind-braces-to-fourth-level-N-and-M.patch - 0011-RX-51-Symbols-Extend-Swiss-layout.patch - 0012-RX-51-Symbols-Bind-square-brackets.patch - 0013-Add-model-for-Pine64-PinePhone-keyboard.patch - 0014-Add-evdev-rule-for-Pine64-PinePhone-keyboard.patch + 0001-Add-model-for-Pine64-PinePhone-keyboard.patch + 0002-Add-evdev-rule-for-Pine64-PinePhone-keyboard.patch " builddir="$srcdir/xkeyboard-config-xkeyboard-config-$_pkgver" @@ -41,18 +29,6 @@ package() { } sha512sums=" 2016e126dd807c07cdec045089a83b5b8c2e6eac8255a80c4e5976a0defc7ad55144186457a3109765f3bfb775270296d980366fee3826ee0e3bcd957e60aa5b xkeyboard-config-2.35.1.tar.gz -6a761968c0101251a256e4a0b9545c953ba82ecf5f20af35a2c487c01dfdb8804caf32eff0b9534854b7adaab5693a937fbb245c2a1001253735a48d90f80824 0001-RX-51-Symbols-Bind-Escape-to-third-level-Backspace.patch -13950fc4064f55a69adf2f0dc3d9e2f8ec31ad686202486f772745ed9c7a8b502aed6073c5d629eac30a274194f5d29402f64c2f286b4a46807f3bcfab6753ff 0002-RX-51-Symbols-Bind-function-keys-to-fourth-level-top.patch -db3c4a1f30c2efc3bf5bba7541d6956414f0d09f089d0ad5e35d340fc2c0faf8bdd6eb8c3708db307ad2c9e7ac841de8c4d11ead076d9c65dd5458b292efae19 0003-RX-51-Symbols-Bind-PgUp-PgDown-Home-End-to-third-lev.patch -4169251cafbea573316319c6a06b9df892995f42f3a1100ed3062171a57003d2f821d45b2a193c54e270703a73883ac9b612caa094b10136e14e691776d0f1c7 0004-RX-51-Symbols-Bind-less-and-greater-to-fourth-level-.patch -fb34ea9a5465575f1b21ade7c8ae4f65bf491b707d9f5c5aa7d0492d2b6c53a800feef078830610fe011ba177083eb2f58af98ce1c699a4aa45b53e5b3c37cb3 0005-RX-51-Symbols-Bind-volume-keys-as-XF86-raise-and-low.patch -d81a992697e69ed460598c0c61fc754d7bfc83e43d56abb8cd1c8075156e41c2ee9fb7ba836a2398fb56b565223fbc40587a8bfd6d36afcc49495129f2ec693f 0006-RX-51-Symbols-Bind-bar-to-fourth-level-L.patch -9a9586925b8ee350f57dd1b7621e70ad65f1c7f54361b188de665af5623b2008a51e57837191610d5805882085ac0ea479182acf69048d997f6b8b6dde0d3e69 0007-RX-51-Symbols-Bind-tilde-to-fourth-level-C-and-F.patch -21ce49429d03689ac5f50ea432e640fb4a09e051941dd7fcad82c7a3e1fa323fc363e059daee5910b9ad7c696e7ebb2d76fefcf31608903ac54cf99b4ced021e 0008-RX-51-Symbols-Bind-percent-to-fourth-level-D.patch -fe44b3535ec586a58901e63cb47413b574e19e889d1a2d32fd4c53dc6e374d78caa081f4679d374ccee2028c922b2ae547eb22a91f68f70d2faff029ee3b5099 0009-RX-51-Symbols-Bind-Tab-to-third-level-Return.patch -6241cc409bc4cbe4149d8703ae413c11fc2066c14374cf9fe126066759b4c9a1592ff183d3d14b5ee168be6678a2844cee622a1226ac1ddbc7d9b058143c591b 0010-RX-51-Symbols-Bind-braces-to-fourth-level-N-and-M.patch -65f92b510db6cb38d3761d4f38368875680b4ded1243c1f54b573d3a44820866892e25dfa3a4e729fe82575144b0d464f11150638b812a0884509fc9c9d5f5d0 0011-RX-51-Symbols-Extend-Swiss-layout.patch -8dd15fc2877b86265885648b733e12b68be6a7c14aa0ce79cf4649c12ab1445ff3111039651fc4243439ab46352b80a6d1be81c62978c8a22aa4300b8f1b5edd 0012-RX-51-Symbols-Bind-square-brackets.patch -363ac31d24d419d66be51ea22564864813c9b982779181d804707b1c3ee9507846c5061f6cf006af92faa0c0f17e39f50798baedc7d7d2ed3a69386d13602b39 0013-Add-model-for-Pine64-PinePhone-keyboard.patch -1119257dbcaa14f005b95275a1e20e27eea70e6be09db2b2f4adf1092325eb044ac2ce02773cfcd3cedee46f50c9898e63a967d5e9b4bf538e4a993663d4bcd8 0014-Add-evdev-rule-for-Pine64-PinePhone-keyboard.patch +363ac31d24d419d66be51ea22564864813c9b982779181d804707b1c3ee9507846c5061f6cf006af92faa0c0f17e39f50798baedc7d7d2ed3a69386d13602b39 0001-Add-model-for-Pine64-PinePhone-keyboard.patch +1119257dbcaa14f005b95275a1e20e27eea70e6be09db2b2f4adf1092325eb044ac2ce02773cfcd3cedee46f50c9898e63a967d5e9b4bf538e4a993663d4bcd8 0002-Add-evdev-rule-for-Pine64-PinePhone-keyboard.patch "