rpms/xorg-x11-xkb-utils/devel xkbcomp-1.0.5-dont-overwrite.patch, NONE, 1.1 .cvsignore, 1.12, 1.13 sources, 1.10, 1.11 xorg-x11-xkb-utils.spec, 1.23, 1.24 xkbcomp-1.0.4-open-less.patch, 1.1, NONE

[Peter Hutterer]

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-xkb-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3942

Modified Files:
	.cvsignore sources xorg-x11-xkb-utils.spec 
Added Files:
	xkbcomp-1.0.5-dont-overwrite.patch 
Removed Files:
	xkbcomp-1.0.4-open-less.patch 
Log Message:
* Mon Aug 25 2008 Peter Hutterer <peter.hutterer at redhat.com> 7.2-7
- xkbcomp 1.0.5
- Remove xkbcomp-1.0.4-open-less.patch.
- xkbcomp-1.0.5-dont-overwrite.patch: Don't overwrite groups unnecessarily.


xkbcomp-1.0.5-dont-overwrite.patch:

--- NEW FILE xkbcomp-1.0.5-dont-overwrite.patch ---
>From 8d7979fae69abfff1086a98381a099858c2e4fe6 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer at redhat.com>
Date: Mon, 25 Aug 2008 15:23:41 +0930
Subject: [PATCH] Don't overwrite previously assigned type indices with useless ones.

The default type for a key with no levels is ONE_LEVEL.
Let's not overwrite the kt_index with this default type if we have previously
assigned a real type.

Reproduceable by running setxkbmap -layout "ru(phonetic),us", the first group
is assigned ONE_LEVEL and shift stops working.

Red Hat Bug #436626 <https://bugzilla.redhat.com/show_bug.cgi?id=436626>
---
 symbols.c |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git xkbcomp-1.0.5/symbols.c xkbcomp-1.0.5/symbols.c
index ffc26b2..762e5ac 100644
--- xkbcomp-1.0.5/symbols.c
+++ xkbcomp-1.0.5/symbols.c
@@ -1757,7 +1757,15 @@ unsigned	types[XkbNumKbdGroups];
     xkb->map->key_sym_map[kc].group_info= XkbSetNumGroups(i,nGroups);
     xkb->map->key_sym_map[kc].width= width;
     for (i=0;i<nGroups;i++) {
-	xkb->map->key_sym_map[kc].kt_index[i]= types[i];
+        /* assign kt_index[i] to the index of the type in map->types.
+         * kt_index[i] may have been set by a previous run (if we have two
+         * layouts specified). Let's not overwrite it with the ONE_LEVEL
+         * default group if we dont even have keys for this group anyway.
+         *
+         * FIXME: There should be a better fix for this.
+         */
+	if (key->numLevels[i])
+	    xkb->map->key_sym_map[kc].kt_index[i]= types[i];
 	if (key->syms[i]!=NULL) {
 	    for (tmp=0;tmp<width;tmp++) {
 		if (tmp<key->numLevels[i])
-- 
1.5.4.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-xkb-utils/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	17 Apr 2008 17:51:05 -0000	1.12
+++ .cvsignore	25 Aug 2008 06:19:05 -0000	1.13
@@ -2,4 +2,4 @@
 xkbevd-1.0.2.tar.bz2
 xkbprint-1.0.1.tar.bz2
 xkbutils-1.0.1.tar.bz2
-xkbcomp-1.0.4.tar.bz2
+xkbcomp-1.0.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-xkb-utils/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	17 Apr 2008 17:51:05 -0000	1.10
+++ sources	25 Aug 2008 06:19:05 -0000	1.11
@@ -2,4 +2,4 @@
 68f2a143716c23b566f8509d9498f516  xkbevd-1.0.2.tar.bz2
 b98ae2d8b21c545b7b322d0b302efefa  xkbprint-1.0.1.tar.bz2
 84396a3dd75337caaae29d8fa5616fb1  xkbutils-1.0.1.tar.bz2
-d5122f1d5a91725a81c843f3bd388244  xkbcomp-1.0.4.tar.bz2
+6cc96c3e4ed5d9802fe717beac008f19  xkbcomp-1.0.5.tar.bz2


Index: xorg-x11-xkb-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-xkb-utils/devel/xorg-x11-xkb-utils.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- xorg-x11-xkb-utils.spec	15 Jul 2008 17:43:39 -0000	1.23
+++ xorg-x11-xkb-utils.spec	25 Aug 2008 06:19:05 -0000	1.24
@@ -1,7 +1,7 @@
 Summary: X.Org X11 xkb utilities
 Name: xorg-x11-xkb-utils
 Version: 7.2
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
@@ -10,12 +10,12 @@
 # use the macro so the doc dir is changed automagically
 %define xkbutils_version 1.0.1
 Source0: ftp://ftp.x.org/pub/individual/app/xkbutils-%{xkbutils_version}.tar.bz2
-Source1: ftp://ftp.x.org/pub/individual/app/xkbcomp-1.0.4.tar.bz2
+Source1: ftp://ftp.x.org/pub/individual/app/xkbcomp-1.0.5.tar.bz2
 Source2: ftp://ftp.x.org/pub/individual/app/xkbevd-1.0.2.tar.bz2
 Source3: ftp://ftp.x.org/pub/individual/app/xkbprint-1.0.1.tar.bz2
 Source4: ftp://ftp.x.org/pub/individual/app/setxkbmap-1.0.4.tar.bz2
 
-Patch0: xkbcomp-1.0.4-open-less.patch
+Patch1: xkbcomp-1.0.5-dont-overwrite.patch
 
 BuildRequires: pkgconfig
 BuildRequires: libxkbfile-devel
@@ -43,7 +43,7 @@
 
 %prep
 %setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4
-%patch0 -p0 -b .open-less
+%patch1 -p0 -b .dont-overwrite
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -DHAVE_STRCASECMP"
@@ -82,6 +82,11 @@
 %{_mandir}/man1/xkbprint.1*
 
 %changelog
+* Mon Aug 25 2008 Peter Hutterer <peter.hutterer at redhat.com> 7.2-7
+- xkbcomp 1.0.5
+- Remove xkbcomp-1.0.4-open-less.patch.
+- xkbcomp-1.0.5-dont-overwrite.patch: Don't overwrite groups unnecessarily.
+
 * Tue Jul 15 2008 Adam Jackson <ajax at redhat.com> 7.2-6
 - Fix license tag.
 


--- xkbcomp-1.0.4-open-less.patch DELETED ---