From 65fd0b7fd7f4f4108c2b09dead7ff9d80a0a859b67bbcc40cedb6689ee86685e Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Sat, 4 Sep 2010 17:32:56 +0000 Subject: [PATCH 1/2] - xkeyboard 1.9 - obsolete patches * xkeyboard-config.mainline-cvs.mac-es.patch * xkeyboard-config-commit-81d9313.diff * xkeyboard-config-commit-dc87d0c.diff - adjusted patches * ibm_space_saver.diff * microsoftnek4k.diff * p_suse.diff * xkeyboard-config.ctrl_alt_bksp.patch * xkeyboard-config.inet.microsoftpro.patch * xkeyboard-config.macintosh.patch - make use of %fdupes macro - added new pkgconfig file OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xkeyboard-config?expand=0&rev=58 --- ibm_space_saver.diff | 24 +++---------- microsoftnek4k.diff | 8 ++--- p_suse.diff | 16 +++------ xkeyboard-config-1.7.tar.bz2 | 3 -- xkeyboard-config-1.9.tar.bz2 | 3 ++ xkeyboard-config-commit-81d9313.diff | 39 --------------------- xkeyboard-config-commit-dc87d0c.diff | 40 ---------------------- xkeyboard-config.changes | 18 ++++++++++ xkeyboard-config.ctrl_alt_bksp.patch | 10 +++--- xkeyboard-config.inet.microsoftpro.patch | 12 +++---- xkeyboard-config.macintosh.patch | 31 +++++++++-------- xkeyboard-config.mainline-cvs.mac-es.patch | 26 -------------- xkeyboard-config.spec | 14 +++----- 13 files changed, 65 insertions(+), 179 deletions(-) delete mode 100644 xkeyboard-config-1.7.tar.bz2 create mode 100644 xkeyboard-config-1.9.tar.bz2 delete mode 100644 xkeyboard-config-commit-81d9313.diff delete mode 100644 xkeyboard-config-commit-dc87d0c.diff delete mode 100644 xkeyboard-config.mainline-cvs.mac-es.patch diff --git a/ibm_space_saver.diff b/ibm_space_saver.diff index c5a30bc..7fadd84 100644 --- a/ibm_space_saver.diff +++ b/ibm_space_saver.diff @@ -1,17 +1,7 @@ -missing description ---- - rules/base.lists.part | 2 ++ - rules/base.m_s.part | 1 + - rules/base.xml.in | 6 ++++++ - symbols/group | 5 +++++ - 4 files changed, 14 insertions(+) - -Index: rules/base.lists.part -=================================================================== ---- rules/base.lists.part.orig -+++ rules/base.lists.part -@@ -64,6 +64,8 @@ - toshiba_s3000 trust trustda \ +--- rules/base.lists.part.orig 2010-09-04 18:41:55.000000000 +0200 ++++ rules/base.lists.part 2010-09-04 19:04:39.000000000 +0200 +@@ -73,6 +73,8 @@ + tm2030USB toshiba_s3000 trust trustda \ unitekkb1925 yahoo +! $specialkbds = ibm_space_saver @@ -19,8 +9,6 @@ Index: rules/base.lists.part // all layouts with 3rd and 4th groups ! $threelevellayouts = al az \ be br bt \ -Index: rules/base.m_s.part -=================================================================== --- rules/base.m_s.part.orig +++ rules/base.m_s.part @@ -1,4 +1,5 @@ @@ -29,8 +17,6 @@ Index: rules/base.m_s.part a4techKBS8 = +inet(media_nav_acpi_common) a4_rfkb23 = +inet(media_nav_acpi_common) asus_laptop = +inet(media_common) -Index: rules/base.xml.in -=================================================================== --- rules/base.xml.in.orig +++ rules/base.xml.in @@ -995,6 +995,12 @@ @@ -46,8 +32,6 @@ Index: rules/base.xml.in macintosh <_description>Macintosh Apple -Index: symbols/group -=================================================================== --- symbols/group.orig +++ symbols/group @@ -323,6 +323,11 @@ xkb_symbols "rctrl_toggle" { diff --git a/microsoftnek4k.diff b/microsoftnek4k.diff index 70c930d..10536b2 100644 --- a/microsoftnek4k.diff +++ b/microsoftnek4k.diff @@ -192,13 +192,13 @@ dell101 = dell(dell101) dellm65 = dell(dellm65) latitude = dell(latitude) ---- rules/base.m_k.part.orig 2009-09-21 23:23:32.000000000 +0200 -+++ rules/base.m_k.part 2009-11-17 11:27:33.000000000 +0100 +--- rules/base.m_k.part.orig 2010-04-23 20:00:45.000000000 +0200 ++++ rules/base.m_k.part 2010-09-04 19:09:14.000000000 +0200 @@ -6,6 +6,7 @@ + sun6 = sun(type6_usb) sun6euro = sun(type6tuv_usb) pc98 = xfree98(pc98) - evdev = evdev + microsoftnek4k = evdev+nek4k(nek4k) - olpc = evdev + $applealu = macintosh(alukbd) macintosh_hhk = macintosh(hhk) macintosh_old = macintosh(old) diff --git a/p_suse.diff b/p_suse.diff index e0e2d07..f5ed043 100644 --- a/p_suse.diff +++ b/p_suse.diff @@ -1,7 +1,7 @@ ---- symbols/pc.orig 2009-04-29 23:56:05.000000000 +0200 -+++ symbols/pc 2009-11-17 11:23:25.000000000 +0100 -@@ -35,9 +35,9 @@ xkb_symbols "pc105" { - modifier_map Mod4 { }; +--- symbols/pc.orig 2009-11-17 11:01:28.000000000 +0100 ++++ symbols/pc 2010-09-04 18:59:28.000000000 +0200 +@@ -34,9 +34,9 @@ + key { [ Super_L ] }; key { [ Shift_R ] }; - key { [ Control_R ] }; @@ -9,14 +9,6 @@ - key { [ Super_R ] }; + key { [ Super_R, Multi_key ] }; - modifier_map Mod4 { }; key { [ Menu ] }; -@@ -47,6 +47,7 @@ xkb_symbols "pc105" { - modifier_map Lock { Caps_Lock, ISO_Lock }; - modifier_map Control{ Control_L, Control_R }; - modifier_map Mod2 { Num_Lock }; -+ modifier_map Mod4 { Super_L, Super_R }; - // Fake keys for virtual<->real modifiers mapping - key { [ ISO_Level3_Shift ] }; diff --git a/xkeyboard-config-1.7.tar.bz2 b/xkeyboard-config-1.7.tar.bz2 deleted file mode 100644 index 0df9c2b..0000000 --- a/xkeyboard-config-1.7.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2597bd5ad1a4b9f1f1a763fbde1fc86629a77476860eb21bd80d36973867e440 -size 633314 diff --git a/xkeyboard-config-1.9.tar.bz2 b/xkeyboard-config-1.9.tar.bz2 new file mode 100644 index 0000000..6f739c3 --- /dev/null +++ b/xkeyboard-config-1.9.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:699df1178572c89214058e9b1b5e71fe835a88ff98c6c5af46abdfb7a1787585 +size 640775 diff --git a/xkeyboard-config-commit-81d9313.diff b/xkeyboard-config-commit-81d9313.diff deleted file mode 100644 index 2c2e58a..0000000 --- a/xkeyboard-config-commit-81d9313.diff +++ /dev/null @@ -1,39 +0,0 @@ -commit 81d931301ecdeadf2120e5f18b3df20824db6c9c -Author: Sergey V. Udaltsov -Date: Thu May 6 01:26:04 2010 +0100 - - Added several chars to hu layout - - https://bugs.freedesktop.org/show_bug.cgi?id=27825 - -diff --git a/symbols/hu b/symbols/hu -index 4280098..e5abdf2 100644 ---- a/symbols/hu -+++ b/symbols/hu -@@ -329,7 +329,7 @@ xkb_symbols "def_101" { - // The standard Hungaryan qwertz layout - hidden partial alphanumeric_keys - xkb_symbols "def_qwertz" { -- key { [ z, Z ] }; -+ key { [ z, Z, endash ] }; - key { [ y, Y, greater ] }; - }; - -@@ -338,7 +338,7 @@ xkb_symbols "def_qwertz" { - // The qwerty layout for people who familiar with the standard US layout - hidden partial alphanumeric_keys - xkb_symbols "def_qwerty" { -- key { [ y, Y ] }; -+ key { [ y, Y, endash ] }; - key { [ z, Z, greater ] }; - }; - -@@ -396,6 +396,8 @@ xkb_symbols "def_common" { - key { [ w, W, bar ] }; - key { [ u, U, EuroSign ] }; - key { [ i, I, Iacute, iacute ] }; -+ key { [ o, O, doublelowquotemark ] }; -+ key { [ p, P, rightdoublequotemark ] }; - key { [ odoubleacute, Odoubleacute, division ] }; - key { [ uacute, Uacute, multiply ] }; - diff --git a/xkeyboard-config-commit-dc87d0c.diff b/xkeyboard-config-commit-dc87d0c.diff deleted file mode 100644 index d204e22..0000000 --- a/xkeyboard-config-commit-dc87d0c.diff +++ /dev/null @@ -1,40 +0,0 @@ -commit dc87d0c1b7b1f3d44554164bd71cf603c35596ce -Author: Sergey V. Udaltsov -Date: Thu May 13 20:58:26 2010 +0100 - - Enhancement to hu keymap - - https://bugs.freedesktop.org/show_bug.cgi?id=28091 - -diff --git a/symbols/hu b/symbols/hu -index e5abdf2..b12eac1 100644 ---- a/symbols/hu -+++ b/symbols/hu -@@ -4,6 +4,7 @@ - // - // $XKeyboardConfig$ - // (C) 2002-2004 Soós Péter -+// (C) 2010 Andras Timar - // - // Permission is granted to anyone to use, distribute and modify - // this file in any way, provided that the above copyright notice -@@ -18,6 +19,10 @@ - // - Fixed abovedot - // - Added adiaeresis - // - Added EuroSign and cent symbol -+// 2010-04-23 - Added doublelowquotemark -+// - Added rightdoublequotemark -+// - Added endash -+// 2010-05-13 - Added ellipsis - - - // Default layout -@@ -421,7 +426,7 @@ xkb_symbols "def_common" { - key { [ n, N, braceright ] }; - key { [ m, M, less ] }; - key { [ comma, question, semicolon ] }; -- key { [ period, colon, greater ] }; -+ key { [ period, colon, ellipsis ] }; - key { [ minus, underscore, asterisk ] }; - - }; diff --git a/xkeyboard-config.changes b/xkeyboard-config.changes index ace772b..69ddb33 100644 --- a/xkeyboard-config.changes +++ b/xkeyboard-config.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Sat Sep 4 17:29:23 UTC 2010 - sndirsch@novell.com + +- xkeyboard 1.9 +- obsolete patches + * xkeyboard-config.mainline-cvs.mac-es.patch + * xkeyboard-config-commit-81d9313.diff + * xkeyboard-config-commit-dc87d0c.diff +- adjusted patches + * ibm_space_saver.diff + * microsoftnek4k.diff + * p_suse.diff + * xkeyboard-config.ctrl_alt_bksp.patch + * xkeyboard-config.inet.microsoftpro.patch + * xkeyboard-config.macintosh.patch +- make use of %fdupes macro +- added new pkgconfig file + ------------------------------------------------------------------- Sat Jun 19 14:19:48 CEST 2010 - sndirsch@suse.de diff --git a/xkeyboard-config.ctrl_alt_bksp.patch b/xkeyboard-config.ctrl_alt_bksp.patch index b0a8a1e..7592253 100644 --- a/xkeyboard-config.ctrl_alt_bksp.patch +++ b/xkeyboard-config.ctrl_alt_bksp.patch @@ -1,9 +1,9 @@ -Index: xkeyboard-config-1.7/rules/evdev.m_s.part -=================================================================== ---- xkeyboard-config-1.7.orig/rules/evdev.m_s.part -+++ xkeyboard-config-1.7/rules/evdev.m_s.part -@@ -1,2 +1,2 @@ +--- xkeyboard-config-1.9/rules/evdev.m_s.part.orig 2010-04-23 20:00:46.000000000 +0200 ++++ xkeyboard-config-1.9/rules/evdev.m_s.part 2010-09-04 19:17:20.000000000 +0200 +@@ -1,3 +1,3 @@ - $evdevkbds = +inet(evdev)+inet(%m) +- applealu_jis = +inet(evdev)+macintosh_vndr/jp(alujiskeys) - * = +inet(evdev) + $evdevkbds = +inet(evdev)+inet(%m)+terminate(ctrl_alt_bksp) ++ applealu_jis = +inet(evdev)+macintosh_vndr/jp(alujiskeys)+terminate(ctrl_alt_bksp) + * = +inet(evdev)+terminate(ctrl_alt_bksp) diff --git a/xkeyboard-config.inet.microsoftpro.patch b/xkeyboard-config.inet.microsoftpro.patch index 15e4315..d2611ed 100644 --- a/xkeyboard-config.inet.microsoftpro.patch +++ b/xkeyboard-config.inet.microsoftpro.patch @@ -1,12 +1,12 @@ ---- rules/base.o_s.part.orig 2009-08-20 23:19:19.000000000 +0200 -+++ rules/base.o_s.part 2009-11-17 12:12:12.000000000 +0100 -@@ -103,5 +103,9 @@ +--- rules/base.o_s.part.orig 2010-09-04 18:41:55.000000000 +0200 ++++ rules/base.o_s.part 2010-09-04 19:13:27.000000000 +0200 +@@ -109,6 +109,9 @@ esperanto:qwerty = +epo(qwerty) esperanto:dvorak = +epo(dvorak) terminate:ctrl_alt_bksp = +terminate(ctrl_alt_bksp) + inet:microsoftpro = +inet(microsoftprousb) + inet:media_common = +inet(media_common) + inet:nav_common = +inet(nav_common) -+ - - + apple:alupckeys = +macintosh_vndr/apple(alupckeys) + shift:both_capslock = +shift(both_capslock) + shift:lshift_both_capslock = +shift(lshift_both_capslock) diff --git a/xkeyboard-config.macintosh.patch b/xkeyboard-config.macintosh.patch index 7ae4f00..3ac3d49 100644 --- a/xkeyboard-config.macintosh.patch +++ b/xkeyboard-config.macintosh.patch @@ -4,24 +4,25 @@ apple+tab switches window alt+e gives euro, alt+l gives @, etc ================================================================================ ---- rules/base.ml_s.part -+++ rules/base.ml_s.part -@@ -20,7 +20,7 @@ - macintosh_old $nonlatin = macintosh_vndr/us(oldmac)+%l%(v):2 - macintosh_old * = macintosh_vndr/us(oldmac)+%l%(v) +--- rules/base.ml_s.part.orig 2010-04-23 20:00:45.000000000 +0200 ++++ rules/base.ml_s.part 2010-09-04 18:53:45.000000000 +0200 +@@ -28,7 +28,7 @@ + $applealu $macvendorlayouts = macintosh_vndr/apple(alukbd)+macintosh_vndr/%l%(v) + $applealu * = macintosh_vndr/apple(alukbd)+%l%(v) $macs en_US = pc+macintosh_vndr/us(extended) - $macs $macvendorlayouts = pc+macintosh_vndr/%l%(v) + $macs $macvendorlayouts = pc+macintosh_vndr/%l%(v)+altwin(swap_lalt_lwin)+level3(alt_switch) - olpc $olpclayouts = olpc+%l%(m) - olpc * = olpc+%l%(v) - $thinkpads br = pc+br(thinkpad) ---- rules/base.ml1_s.part -+++ rules/base.ml1_s.part -@@ -5,6 +5,6 @@ - macintosh_old us = macintosh_vndr/us(oldmac) - macintosh_old $macvendorlayouts = macintosh_vndr/us(oldmac)+macintosh_vndr/%l[1]%(v[1]) - macintosh_old * = macintosh_vndr/us(oldmac)+%l[1]%(v[1]) + nokiarx44 * = nokia_vndr/rx-44(%l) + nokiarx51 cz(qwerty) = nokia_vndr/rx-51(common)+nokia_vndr/rx-51(cz_qwerty) + nokiarx51 * = nokia_vndr/rx-51(common)+nokia_vndr/rx-51(%l%_v) +--- rules/base.ml1_s.part.orig 2010-04-23 20:00:45.000000000 +0200 ++++ rules/base.ml1_s.part 2010-09-04 18:54:19.000000000 +0200 +@@ -8,7 +8,7 @@ + applealu_jis us = macintosh_vndr/apple(alukbd)+macintosh_vndr/jp(usmac) + $applealu $macvendorlayouts = macintosh_vndr/apple(alukbd)+macintosh_vndr/%l[1]%(v[1]) + $applealu * = macintosh_vndr/apple(alukbd)+%l[1]%(v[1]) - $macs $macvendorlayouts = pc+macintosh_vndr/%l[1]%(v[1]) + $macs $macvendorlayouts = pc+macintosh_vndr/%l[1]%(v[1])+altwin(swap_lalt_lwin)+level3(alt_switch) + nokiarx51 cz(qwerty) = nokia_vndr/rx-51(common)+nokia_vndr/rx-51(cz_qwerty) + nokiarx51 * = nokia_vndr/rx-51(common)+nokia_vndr/rx-51(%l[1]%_v[1]) $thinkpads br = pc+%l[1](thinkpad) - * * = pc+%l[1]%(v[1]) diff --git a/xkeyboard-config.mainline-cvs.mac-es.patch b/xkeyboard-config.mainline-cvs.mac-es.patch deleted file mode 100644 index 83aa48d..0000000 --- a/xkeyboard-config.mainline-cvs.mac-es.patch +++ /dev/null @@ -1,26 +0,0 @@ -https://bugs.freedesktop.org/show_bug.cgi?id=8683 - -Index: symbols/macintosh_vndr/es -=================================================================== ---- symbols/macintosh_vndr/es.orig -+++ symbols/macintosh_vndr/es -@@ -3,4 +3,19 @@ partial default alphanumeric_keys - xkb_symbols "basic" { - include "es" - name[Group1]= "Spain - Mac"; -+ -+ key { [ 1, exclamdown, leftsinglequotemark, rightsinglequotemark ] }; -+ key { [ 2, exclam, leftdoublequotemark, rightdoublequotemark ] }; -+ -+ key { [ r, R, registered ] }; -+ key { [ y, Y, Yen ] }; -+ key { [ u, U, EuroSign ] }; -+ -+ key { [ g, G, at ] }; -+ -+ key { [ z, Z, Greek_OMEGA, doublelowquotemark ] }; -+ key { [ c, C, copyright ] }; -+ -+ // MacOS does not have euro on e, include it anyway -+ include "eurosign(e)" - }; diff --git a/xkeyboard-config.spec b/xkeyboard-config.spec index b1b9d17..c2b850f 100644 --- a/xkeyboard-config.spec +++ b/xkeyboard-config.spec @@ -1,5 +1,5 @@ # -# spec file for package xkeyboard-config (Version 1.7) +# spec file for package xkeyboard-config (Version 1.9) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,7 +19,7 @@ Name: xkeyboard-config -BuildRequires: intltool perl-XML-Parser xorg-x11 +BuildRequires: fdupes intltool perl-XML-Parser pkg-config xorg-x11 Url: http://www.freedesktop.org/Software/XKeyboardConfig License: GPLv2+ ; LGPLv2.1+ ; MIT License (or similar) Group: System/X11/Utilities @@ -27,11 +27,10 @@ Requires: xorg-x11 Provides: xorg-x11:/etc/X11/xkb/symbols/us XFree86:/etc/X11/xkb/symbols/us PreReq: /bin/ln /bin/rm AutoReqProv: on -Version: 1.7 +Version: 1.9 Release: 5 Summary: The X Keyboard Extension Source: %name-%version.tar.bz2 -Patch4: xkeyboard-config.mainline-cvs.mac-es.patch Patch40: xkeyboard-config.macintosh.patch Patch100: p_suse.diff Patch101: ibm_space_saver.diff @@ -42,8 +41,6 @@ Patch108: microsoftnek4k-keycodes.diff Patch109: disable-2xalt_2xctrl-toggle.diff Patch110: MDSW-change-keycode.diff Patch115: xkeyboard-config.inet.microsoftpro.patch -Patch116: xkeyboard-config-commit-81d9313.diff -Patch117: xkeyboard-config-commit-dc87d0c.diff Patch118: xkeyboard-config.ctrl_alt_bksp.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -65,7 +62,6 @@ Authors: %prep %setup -q -%patch4 %patch40 %patch100 %patch101 @@ -76,8 +72,6 @@ Authors: %patch109 -p1 %patch110 %patch115 -p0 -%patch116 -p1 -%patch117 -p1 %patch118 -p1 %build @@ -96,6 +90,7 @@ ln -snf /usr/bin/xkbcomp $RPM_BUILD_ROOT/usr/share/X11/xkb/xkbcomp mkdir -p $RPM_BUILD_ROOT/var/lib/xkb/compiled/ ln -snf /var/lib/xkb/compiled/ $RPM_BUILD_ROOT/usr/share/X11/xkb/compiled %find_lang %name +%fdupes -s $RPM_BUILD_ROOT/usr/share/X11/xkb %clean rm -rf $RPM_BUILD_ROOT @@ -106,5 +101,6 @@ rm -rf $RPM_BUILD_ROOT %dir /var/lib/xkb %dir /var/lib/xkb/compiled /usr/share/X11/xkb/ +%{_datadir}/pkgconfig/*.pc %changelog From aea979edc4306bd49eb02a95ccc71b828f82a5c07fc0465c09f3e12ae2388914 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Fri, 10 Sep 2010 13:17:30 +0000 Subject: [PATCH 2/2] Accepting request 47178 from X11:XOrg checked in (request 47178) OBS-URL: https://build.opensuse.org/request/show/47178 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xkeyboard-config?expand=0&rev=59 --- xkeyboard-config.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xkeyboard-config.spec b/xkeyboard-config.spec index c2b850f..38ab456 100644 --- a/xkeyboard-config.spec +++ b/xkeyboard-config.spec @@ -28,7 +28,7 @@ Provides: xorg-x11:/etc/X11/xkb/symbols/us XFree86:/etc/X11/xkb/symbols/us PreReq: /bin/ln /bin/rm AutoReqProv: on Version: 1.9 -Release: 5 +Release: 1 Summary: The X Keyboard Extension Source: %name-%version.tar.bz2 Patch40: xkeyboard-config.macintosh.patch