diff --git a/.gitignore b/.gitignore index cae5016..6299c3a 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ xkeyboard-config-1.9.tar.bz2 /xkeyboard-config-2.6.tar.bz2 /xkeyboard-config-2.7.tar.bz2 /xkeyboard-config-2.8.tar.bz2 +/xkeyboard-config-2.9.tar.bz2 diff --git a/0001-English-Mali-layouts-have-English-language-assigned-.patch b/0001-English-Mali-layouts-have-English-language-assigned-.patch deleted file mode 100644 index f54c821..0000000 --- a/0001-English-Mali-layouts-have-English-language-assigned-.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 3f7d33a91dbb8f3ba27d824761364b24e8dac70b Mon Sep 17 00:00:00 2001 -From: "Sergey V. Udaltsov" -Date: Fri, 1 Feb 2013 00:40:51 +0000 -Subject: [PATCH] English Mali layouts have English language assigned to them - ---- - rules/base.xml.in | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/rules/base.xml.in b/rules/base.xml.in -index 7239c09..19380fa 100644 ---- a/rules/base.xml.in -+++ b/rules/base.xml.in -@@ -5377,6 +5377,9 @@ - - <_shortDescription>en - <_description>English (Mali, US Macintosh) -+ -+ eng -+ - - - -@@ -5385,6 +5388,9 @@ - - <_shortDescription>en - <_description>English (Mali, US international) -+ -+ eng -+ - - - --- -1.8.1.4 - diff --git a/0001-Fixing-ISO-codes.patch b/0001-Fixing-ISO-codes.patch deleted file mode 100644 index 9403ecf..0000000 --- a/0001-Fixing-ISO-codes.patch +++ /dev/null @@ -1,56 +0,0 @@ -From ffed69dca21ada0671aa6da3f4d11c27318bafce Mon Sep 17 00:00:00 2001 -From: "Sergey V. Udaltsov" -Date: Fri, 1 Feb 2013 00:33:50 +0000 -Subject: [PATCH] Fixing ISO codes - -https://bugs.freedesktop.org/show_bug.cgi?id=59840 ---- - rules/base.xml.in | 11 ++++++++--- - 1 file changed, 8 insertions(+), 3 deletions(-) - -diff --git a/rules/base.xml.in b/rules/base.xml.in -index f5de8ae..7239c09 100644 ---- a/rules/base.xml.in -+++ b/rules/base.xml.in -@@ -2495,7 +2495,7 @@ - <_shortDescription>hr - <_description>Croatian - -- scr -+ hrv - - - -@@ -3887,7 +3887,7 @@ - <_shortDescription>mn - <_description>Mongolian - -- mng -+ mon - - - -@@ -4877,7 +4877,7 @@ - <_shortDescription>zh - <_description>Taiwanese - -- trv -+ fox - - - -@@ -4897,6 +4897,11 @@ - ssf - tao - tsu -+ trv -+ xnb -+ sxr -+ uun -+ fos - - - --- -1.8.1.4 - diff --git a/0001-Fixing-wrong-iso639-3-codes.patch b/0001-Fixing-wrong-iso639-3-codes.patch deleted file mode 100644 index 7fb7603..0000000 --- a/0001-Fixing-wrong-iso639-3-codes.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 868655ca4069a724863dd22f72cf65673b14d9d8 Mon Sep 17 00:00:00 2001 -From: "Sergey V. Udaltsov" -Date: Fri, 1 Feb 2013 00:32:16 +0000 -Subject: [PATCH] Fixing wrong iso639-3 codes - -https://bugs.freedesktop.org/show_bug.cgi?id=59840 ---- - rules/base.xml.in | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/rules/base.xml.in b/rules/base.xml.in -index fd9cc27..f5de8ae 100644 ---- a/rules/base.xml.in -+++ b/rules/base.xml.in -@@ -5174,7 +5174,7 @@ - <_shortDescription>sd - <_description>Sindhi - -- sd -+ snd - - - -@@ -5362,7 +5362,7 @@ - <_shortDescription>fr - <_description>French (Mali, alternative) - -- fr -+ fra - - - --- -1.8.1.4 - diff --git a/0001-fr-fra-ISO-639.patch b/0001-fr-fra-ISO-639.patch deleted file mode 100644 index 19d73c7..0000000 --- a/0001-fr-fra-ISO-639.patch +++ /dev/null @@ -1,25 +0,0 @@ -From b4be67b48fb11989f1824dd0b1c8c399430162b0 Mon Sep 17 00:00:00 2001 -From: "Sergey V. Udaltsov" -Date: Sun, 3 Feb 2013 21:31:07 +0000 -Subject: [PATCH] fr --> fra (ISO 639) - ---- - rules/base.extras.xml.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/rules/base.extras.xml.in b/rules/base.extras.xml.in -index cec043f..4647bec 100644 ---- a/rules/base.extras.xml.in -+++ b/rules/base.extras.xml.in -@@ -60,7 +60,7 @@ - ca - <_shortDescription>fr - <_description>French (Canada) -- fr -+ fra - - - --- -1.8.1.4 - diff --git a/0001-rules-fix-iso639-code-for-irish.patch b/0001-rules-fix-iso639-code-for-irish.patch deleted file mode 100644 index 4ac5694..0000000 --- a/0001-rules-fix-iso639-code-for-irish.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 3b2fc092cc49bc51d1108e90ad98778d3d666faf Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Tue, 16 Apr 2013 17:11:47 +1000 -Subject: [PATCH] rules: fix iso639 code for irish - -"gla" is scottish gaelic, "gle" is irish. - -http://www-01.sil.org/iso639-3/documentation.asp?id=gla -http://www-01.sil.org/iso639-3/documentation.asp?id=gle - -Signed-off-by: Peter Hutterer ---- - rules/base.xml.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/rules/base.xml.in b/rules/base.xml.in -index 4b9691c..6b57a72 100644 ---- a/rules/base.xml.in -+++ b/rules/base.xml.in -@@ -5115,7 +5115,7 @@ - CloGaelach - <_description>CloGaelach - -- gla -+ gle - - - --- -1.8.1.4 - diff --git a/olpc-ae00.patch b/olpc-ae00.patch deleted file mode 100644 index 0f08277..0000000 --- a/olpc-ae00.patch +++ /dev/null @@ -1,27 +0,0 @@ -From ffdfa93d9dff9a5642693002dadf154a6acc7126 Mon Sep 17 00:00:00 2001 -From: Daniel Drake -Date: Wed, 8 May 2013 13:46:19 -0600 -Subject: [PATCH] Fix AE00 alias in olpcm keycodes - -The olpcm symbols refer to AE00 but that is not defined anywhere. - -https://bugs.freedesktop.org/show_bug.cgi?id=34738 ---- - keycodes/olpc | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/keycodes/olpc b/keycodes/olpc -index 0d7724b..d8f1ff8 100644 ---- a/keycodes/olpc -+++ b/keycodes/olpc -@@ -16,6 +16,7 @@ xkb_keycodes "olpc" { - default - xkb_keycodes "olpcm" { - -+ alias = ; // many OLPC keyboards don't put tilde there - alias = ; // on model olpcm, new physical position of BKSL - alias = ; // on model olpcm, new physical position of =+ - alias = ; // on model olpcm, new physical position of '" --- -1.8.1.4 - diff --git a/olpc-mechanical-keyboard.patch b/olpc-mechanical-keyboard.patch deleted file mode 100644 index 5773ab6..0000000 --- a/olpc-mechanical-keyboard.patch +++ /dev/null @@ -1,258 +0,0 @@ -From 690ea60dcb6793879489c17ab5d85afd272fa0f7 Mon Sep 17 00:00:00 2001 -From: Walter Bender -Date: Sat, 20 Apr 2013 16:02:25 +0000 -Subject: add support for the OLPC mechanical non-membrane keyboard - -Patch updated against current tree. - -> From: Paul Fox -> Date: Tue, 20 Jul 2010 16:22:40 -0400 -> Subject: [PATCH] add support for the OLPC "mechanical" (non-membrane) keyboard -> model(s). to aid in this, add keycodes/olpc with aliases to avoid needing to -> use BKSL and TLDE, which don't appear anywhere near their "traditional" -> position on the olpcm mechanical keyboards. ---- -Index: xkeyboard-config-2.8/keycodes/Makefile.am -=================================================================== ---- xkeyboard-config-2.8.orig/keycodes/Makefile.am -+++ xkeyboard-config-2.8/keycodes/Makefile.am -@@ -12,6 +12,7 @@ fujitsu \ - hp \ - ibm \ - macintosh \ -+olpc \ - sony \ - sun \ - xfree86 \ -Index: xkeyboard-config-2.8/keycodes/olpc -=================================================================== ---- /dev/null -+++ xkeyboard-config-2.8/keycodes/olpc -@@ -0,0 +1,23 @@ -+ -+// OLPC's mechanical keyboard moves several keys to the AA row. make -+// them easier to write symbol files naturally. -+ -+// see http://wiki.laptop.org/go/OLPC_English_Non-membrane_Keyboard -+// and http://wiki.laptop.org/go/OLPC_Spanish_Non-membrane_Keyboard -+ -+default -+xkb_keycodes "olpc" { -+ -+ alias = ; // many OLPC keyboards don't put tilde there -+ alias = ; // on model olpc, physical position of BKSL -+ -+}; -+ -+default -+xkb_keycodes "olpcm" { -+ -+ alias = ; // on model olpcm, new physical position of BKSL -+ alias = ; // on model olpcm, new physical position of =+ -+ alias = ; // on model olpcm, new physical position of '" -+ -+}; -Index: xkeyboard-config-2.8/rules/base.ml_c.part -=================================================================== ---- xkeyboard-config-2.8.orig/rules/base.ml_c.part -+++ xkeyboard-config-2.8/rules/base.ml_c.part -@@ -1,4 +1,5 @@ - pc98 nec_vndr/jp = pc98(basic) - * jp = complete+japan -- olpc * = olpc -+ olpc * = olpc -+ olpcm * = olpc - * * = complete -Index: xkeyboard-config-2.8/rules/base.ml_s.part -=================================================================== ---- xkeyboard-config-2.8.orig/rules/base.ml_s.part -+++ xkeyboard-config-2.8/rules/base.ml_s.part -@@ -24,6 +24,8 @@ - nokiasu8w * = nokia_vndr/su-8w(%l) - olpc $olpclayouts = olpc+%l%(m) - olpc * = olpc+%l%(v) -+ olpcm $olpclayouts = olpc+%l%(m) -+ olpcm * = olpc+%l%(v) - $thinkpads br = pc+br(thinkpad) - sl-c3x00 * = pc+sharp_vndr/sl-c3x00(basic) - ws003sh * = pc+sharp_vndr/ws003sh(basic) -Index: xkeyboard-config-2.8/rules/evdev.m_k.part -=================================================================== ---- xkeyboard-config-2.8.orig/rules/evdev.m_k.part -+++ xkeyboard-config-2.8/rules/evdev.m_k.part -@@ -1,3 +1,5 @@ - pc98 = evdev(pc98) - applealu_jis = evdev+macintosh(jisevdev) -+ olpc = evdev+olpc(olpc) -+ olpcm = evdev+olpc(olpcm) - * = evdev -Index: xkeyboard-config-2.8/symbols/es -=================================================================== ---- xkeyboard-config-2.8.orig/symbols/es -+++ xkeyboard-config-2.8/symbols/es -@@ -158,10 +158,12 @@ xkb_symbols "mac" { - partial alphanumeric_keys - xkb_symbols "olpc" { - -+ // http://wiki.laptop.org/go/OLPC_Spanish_Keyboard -+ - include "us(basic)" - name[Group1]="Spanish"; - -- key { [ masculine, ordfeminine ] }; -+ key { [ masculine, ordfeminine ] }; - key { [ 1, exclam, bar ] }; - key { [ 2, quotedbl, at ] }; - key { [ 3, dead_grave, numbersign, grave ] }; -@@ -180,7 +182,7 @@ xkb_symbols "olpc" { - - key { [ ntilde, Ntilde ] }; - key { [ plus, asterisk, dead_tilde ] }; -- key { [ bracketright, braceright, section ] }; -+ key { [ bracketright, braceright, section ] }; - - key { [ comma, semicolon ] }; - key { [ period, colon ] }; -@@ -190,6 +192,47 @@ xkb_symbols "olpc" { - - include "level3(ralt_switch)" - }; -+ -+partial alphanumeric_keys -+xkb_symbols "olpcm" { -+ -+ // Mechanical (non-membrane) OLPC Spanish keyboard layout. -+ // See: http://wiki.laptop.org/go/OLPC_Spanish_Non-membrane_Keyboard -+ -+ include "us(basic)" -+ name[Group1]="Spain"; -+ -+ key { [ questiondown, exclamdown, backslash ] }; -+ key { [ 1, exclam, bar ] }; -+ key { [ 2, quotedbl, at ] }; -+ key { [ 3, dead_grave, numbersign, grave ] }; -+ key { [ 4, dollar, asciitilde, dead_tilde ] }; -+ key { [ 5, percent, asciicircum, dead_circumflex ] }; -+ key { [ 6, ampersand, notsign ] }; -+ key { [ 7, slash, backslash ] }; // no '\' label on olpcm, leave for compatibility -+ key { [ 8, parenleft, masculine ] }; -+ key { [ 9, parenright, ordfeminine ] }; -+ key { [ 0, equal ] }; -+ key { [ apostrophe, question ] }; -+ -+ key { [ e, E, EuroSign ] }; -+ key { [ dead_acute, dead_diaeresis, dead_abovering, acute ] }; -+ key { [ plus, asterisk ] }; -+ -+ key { [ ntilde, Ntilde ] }; -+ // no AC11 or AC12 on olpcm -+ -+ key { [ comma, semicolon ] }; -+ key { [ period, colon ] }; -+ key { [ minus, underscore ] }; -+ -+ key { [ less, greater ] }; -+ key { [ bracketleft, braceleft, ccedilla, Ccedilla ] }; -+ key { [ bracketright, braceright ] }; -+ -+ -+ include "level3(ralt_switch)" -+}; - - partial alphanumeric_keys - xkb_symbols "deadtilde" { -Index: xkeyboard-config-2.8/symbols/olpc -=================================================================== ---- xkeyboard-config-2.8.orig/symbols/olpc -+++ xkeyboard-config-2.8/symbols/olpc -@@ -13,9 +13,9 @@ xkb_symbols "olpc" { - modifier_map Mod4 { KP_Prior }; // KP_Prior is the "O" game key - modifier_map Mod5 { KP_Next }; // KP_Next is the "X" game key - -- key { [ XF86Search ] }; // search key -- key { [ XF86Meeting ] }; // fn+search key -+ key { [ XF86Search ] }; // search key (unpopulated on olpcm, harmless) -+ key { [ XF86Meeting ] }; // fn+search key (unpopulated on olpcm, harmless) - key { [ XF86Start ] }; // gear key (fn+space) -- key { [ XF86TaskPane ] }; // frame key (the top-right key) -- key { [ XF86Messenger ] }; // overlay key (next to frame key) -+ key { [ XF86TaskPane ] }; // frame key (the top-right key) (unpopulated on olpcm, harmless) -+ key { [ XF86Messenger ] }; // overlay key (next to frame key) (unpopulated on olpcm, harmless) - }; -Index: xkeyboard-config-2.8/symbols/us -=================================================================== ---- xkeyboard-config-2.8.orig/symbols/us -+++ xkeyboard-config-2.8/symbols/us -@@ -1033,7 +1033,7 @@ xkb_symbols "olpc" { - key { [ j, J, EuroSign, EuroSign ] }; - key { [ semicolon, colon, masculine, ordfeminine ] }; - key { [ apostrophe, quotedbl, currency, currency ] }; -- key { [ backslash, bar, section, section ] }; -+ key { [ backslash, bar, section, section ] }; - - key { [ c, C, ccedilla, Ccedilla ] }; - key { [ n, N, ntilde, Ntilde ] }; -@@ -1054,6 +1054,63 @@ xkb_symbols "olpc2" { - include "group(olpc)" - }; - -+xkb_symbols "olpcm" { -+ -+ include "us(basic)" -+ name[Group1]= "USA"; -+ -+ // Mechanical (non-membrane) OLPC int'l US English keyboard layout. -+ // See: http://wiki.laptop.org/go/OLPC_English_Non-membrane_Keyboard -+ -+ key { [ grave, asciitilde, dead_grave, dead_tilde ] }; -+ key { [ 1, exclam, exclamdown, exclamdown ] }; -+ key { [ 2, at, notsign, notsign ] }; -+ key { [ 3, numbersign, 0x1000300, 0x1000300 ] }; // combining grave -+ key { [ 4, dollar, 0x1000301, 0x1000301 ] }; // combining acute -+ key { [ 5, percent, 0x1000306, 0x1000306 ] }; // combining breve above -+ key { [ 6,asciicircum, 0x100030A, 0x100030A ] }; // combining ring above -+ key { [ 7, ampersand, 0x1000302, 0x1000302 ] }; // combining circumflex above -+ key { [ 8, asterisk, 0x100030C, 0x100030C ] }; // combining caron above -+ key { [ 9, parenleft, 0x1000307, 0x1000307 ] }; // combining dot above -+ key { [ 0, parenright, 0x1000308, 0x1000308 ] }; // combining diaeresis above -+ key { [ minus, underscore, 0x1000304, 0x1000304 ] }; // combining macron above -+ -+ key { [ q, Q, Greek_omega, Greek_OMEGA ] }; -+ key { [ w, W, oslash, Oslash ] }; -+ key { [ e, E, oe, OE ] }; -+ key { [ r, R, 0x1000327, 0x1000327 ] }; // combining cedilla -+ key { [ t, T, 0x100032E, 0x100032E ] }; // combining breve below -+ key { [ y, Y, 0x1000325, 0x1000325 ] }; // combining ring below -+ key { [ u, U, 0x100032D, 0x100032D ] }; // combining circumflex below -+ key { [ i, I, 0x100032C, 0x100032C ] }; // combining caron below -+ key { [ o, O, 0x1000323, 0x1000323 ] }; // combining dot below -+ key { [ p, P, 0x1000324, 0x1000324 ] }; // combining diaeresis below -+ key { [ bracketleft, braceleft, 0x1000331, 0x1000331 ] }; // combining macron below -+ key { [bracketright, braceright, 0x1000330, 0x1000330 ] }; // combining tilde below -+ -+ key { [ a, A, ae, AE ] }; -+ key { [ s, S, ssharp, 0x1001E9C ] }; // uppercase S sharp -+ key { [ d, D, eth, ETH ] }; -+ key { [ f, F, thorn, THORN ] }; -+ key { [ h, H, sterling, sterling ] }; -+ key { [ j, J, EuroSign, EuroSign ] }; -+ key { [ semicolon, colon, masculine, ordfeminine ] }; -+ // no AC11 or AC12 on olpcm -+ -+ key { [ c, C, ccedilla, Ccedilla ] }; -+ key { [ n, N, ntilde, Ntilde ] }; -+ key { [ m, M, mu, mu ] }; -+ key { [ comma, less, guillemotleft, guillemotleft ] }; -+ key { [ period, greater, guillemotright, guillemotright ] }; -+ key { [ slash, question, questiondown, questiondown ] }; -+ -+ key { [ backslash, bar, section, section ] }; -+ key { [ equal, plus, 0x1000303, 0x1000303 ] }; -+ key { [ apostrophe, quotedbl, currency, currency ] }; -+ -+ include "level3(ralt_switch)" -+}; -+ - // Based on Cherokee Nation Official Layout - // http://www.cherokee.org/extras/downloads/font/Keyboard.htm - diff --git a/sources b/sources index 5aff1c5..29ca9ee 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e66d567d85a954d589c5723fb0e1f3dd xkeyboard-config-2.8.tar.bz2 +9b1280d8ba40274a0f1567c94fca7501 xkeyboard-config-2.9.tar.bz2 diff --git a/xkeyboard-config.spec b/xkeyboard-config.spec index 6776a18..d8b3f5d 100644 --- a/xkeyboard-config.spec +++ b/xkeyboard-config.spec @@ -6,8 +6,8 @@ Summary: X Keyboard Extension configuration data Name: xkeyboard-config -Version: 2.8 -Release: 3%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Version: 2.9 +Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} License: MIT Group: User Interface/X URL: http://www.freedesktop.org/wiki/Software/XKeyboardConfig @@ -19,15 +19,6 @@ Source2: commitid Source0: http://xorg.freedesktop.org/archive/individual/data/xkeyboard-config/%{name}-%{version}.tar.bz2 %endif -Patch01: 0001-English-Mali-layouts-have-English-language-assigned-.patch -Patch02: 0001-Fixing-ISO-codes.patch -Patch03: 0001-Fixing-wrong-iso639-3-codes.patch -Patch04: 0001-fr-fra-ISO-639.patch -Patch05: 0001-rules-fix-iso639-code-for-irish.patch -# Fix OLPC Spanish mechanical keyboard http://dev.laptop.org/ticket/12645 -Patch06: olpc-mechanical-keyboard.patch -Patch07: olpc-ae00.patch - BuildArch: noarch BuildRequires: pkgconfig @@ -118,6 +109,9 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/X11/xkb/compiled %{_datadir}/pkgconfig/xkeyboard-config.pc %changelog +* Thu May 30 2013 Peter Hutterer 2.9-1 +- xkeyboard-config 2.9 + * Wed May 15 2013 Daniel Drake 2.8-3 - Add upstream patches for OLPC mechanical keyboard support