rpms/xorg-x11-server/devel xorg-x11-server-1.1.1-xkb-vidmode-switch.patch, NONE, 1.1 xorg-x11-server.spec, 1.192, 1.193
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Dec 1 19:36:13 UTC 2006
Author: ajackson
Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16211
Modified Files:
xorg-x11-server.spec
Added Files:
xorg-x11-server-1.1.1-xkb-vidmode-switch.patch
Log Message:
* Fri Dec 1 2006 Adam Jackson <ajax at redhat.com> 1.1.1-54.fc7
- xorg-x11-server-1.1.1-xkb-vidmode-switch.patch: Fix string matching on
XKB actions to be case-insensitive again. (#216656)
xorg-x11-server-1.1.1-xkb-vidmode-switch.patch:
hw/xfree86/dixmods/xkbPrivate.c | 8 ++++----
include/dix.h | 6 ++++++
xkb/maprules.c | 16 +++++-----------
xkb/xkbfmisc.c | 16 ----------------
4 files changed, 15 insertions(+), 31 deletions(-)
--- NEW FILE xorg-x11-server-1.1.1-xkb-vidmode-switch.patch ---
--- xorg-server-1.1.1/hw/xfree86/dixmods/xkbPrivate.c.xkb-vidmode-switch 2006-07-05 14:31:40.000000000 -0400
+++ xorg-server-1.1.1/hw/xfree86/dixmods/xkbPrivate.c 2006-12-01 13:25:31.000000000 -0500
@@ -26,13 +26,13 @@
if (xf86act->type == XkbSA_XFree86Private) {
memcpy(msgbuf, xf86act->data, XkbAnyActionDataSize);
msgbuf[XkbAnyActionDataSize]= '\0';
- if (strcmp(msgbuf, "-vmode")==0)
+ if (strcasecmp(msgbuf, "-vmode")==0)
xf86ProcessActionEvent(ACTION_PREV_MODE, NULL);
- else if (strcmp(msgbuf, "+vmode")==0)
+ else if (strcasecmp(msgbuf, "+vmode")==0)
xf86ProcessActionEvent(ACTION_NEXT_MODE, NULL);
- else if (strcmp(msgbuf, "ungrab")==0)
+ else if (strcasecmp(msgbuf, "ungrab")==0)
xf86ProcessActionEvent(ACTION_DISABLEGRAB, NULL);
- else if (strcmp(msgbuf, "clsgrb")==0)
+ else if (strcasecmp(msgbuf, "clsgrb")==0)
xf86ProcessActionEvent(ACTION_CLOSECLIENT, NULL);
else
xf86ProcessActionEvent(ACTION_MESSAGE, (void *) msgbuf);
--- xorg-server-1.1.1/include/dix.h.xkb-vidmode-switch 2006-07-05 14:38:48.000000000 -0400
+++ xorg-server-1.1.1/include/dix.h 2006-12-01 13:25:31.000000000 -0500
@@ -814,4 +814,10 @@
SelectionCallbackKind kind;
} SelectionInfoRec;
+/* strcasecmp.c */
+#if NEED_STRCASECMP
+#define strcasecmp xstrcasecmp
+extern int xstrcasecmp(char *s1, char *s2);
+#endif
+
#endif /* DIX_H */
--- xorg-server-1.1.1/xkb/xkbfmisc.c.xkb-vidmode-switch 2006-07-05 14:31:44.000000000 -0400
+++ xorg-server-1.1.1/xkb/xkbfmisc.c 2006-12-01 13:25:31.000000000 -0500
@@ -247,19 +247,3 @@
/* if we get here, the pattern is exhausted (-:just like me:-) */
return (name[0]=='\0');
}
-
-#ifdef NEED_STRCASECMP
-_X_HIDDEN int
-_XkbStrCaseCmp(char *str1,char *str2)
-{
- const u_char *us1 = (const u_char *)str1, *us2 = (const u_char *)str2;
-
- while (tolower(*us1) == tolower(*us2)) {
- if (*us1++ == '\0')
- return (0);
- us2++;
- }
-
- return (tolower(*us1) - tolower(*us2));
-}
-#endif
--- xorg-server-1.1.1/xkb/maprules.c.xkb-vidmode-switch 2006-07-05 14:38:48.000000000 -0400
+++ xorg-server-1.1.1/xkb/maprules.c 2006-12-01 13:26:40.000000000 -0500
@@ -62,12 +62,6 @@
#define PR_DEBUG2(s,a,b)
#endif
-#ifdef NEED_STRCASECMP
-extern int _XkbStrCaseCmp(char *s1, char *s2);
-#else
-#define _XkbStrCaseCmp strcasecmp
-#endif
-
/***====================================================================***/
#define DFLT_LINE_SIZE 128
@@ -1092,20 +1086,20 @@
for ( ; GetInputLine(file,&line,False); line.num_line= 0) {
if (line.line[0]=='!') {
tok = strtok(&(line.line[1]), " \t");
- if (_XkbStrCaseCmp(tolower(tok),"model") == 0)
+ if (strcasecmp(tolower(tok),"model") == 0)
headingtype = HEAD_MODEL;
- else if (_XkbStrCaseCmp(tok,"layout") == 0)
+ else if (strcasecmp(tok,"layout") == 0)
headingtype = HEAD_LAYOUT;
- else if (_XkbStrCaseCmp(tok,"variant") == 0)
+ else if (strcasecmp(tok,"variant") == 0)
headingtype = HEAD_VARIANT;
- else if (_XkbStrCaseCmp(tok,"option") == 0)
+ else if (strcasecmp(tok,"option") == 0)
headingtype = HEAD_OPTION;
else {
int i;
headingtype = HEAD_EXTRA;
extra_ndx= -1;
for (i=0;(i<rules->num_extra)&&(extra_ndx<0);i++) {
- if (!_XkbStrCaseCmp(tok,rules->extra_names[i]))
+ if (!strcasecmp(tok,rules->extra_names[i]))
extra_ndx= i;
}
if (extra_ndx<0) {
Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -r1.192 -r1.193
--- xorg-x11-server.spec 1 Dec 2006 17:00:54 -0000 1.192
+++ xorg-x11-server.spec 1 Dec 2006 19:36:11 -0000 1.193
@@ -8,7 +8,7 @@
Summary: X.Org X11 X server
Name: xorg-x11-server
Version: 1.1.1
-Release: 53%{?dist}
+Release: 54%{?dist}
URL: http://www.x.org
License: MIT/X11
Group: User Interface/X
@@ -33,6 +33,7 @@
Patch13: xorg-x11-server-1.1.1-ia64-int10.patch
Patch14: xorg-x11-server-1.1.1-ia64-pci-chipsets.patch
Patch15: xorg-x11-server-1.1.1-automake-1.10-fixes.patch
+Patch16: xorg-x11-server-1.1.1-xkb-vidmode-switch.patch
# OpenGL compositing manager feature/optimization patches.
Patch100: xorg-x11-server-1.1.0-no-move-damage.patch
@@ -335,6 +336,7 @@
%patch13 -p1 -b .ia64-int10
%patch14 -p1 -b .ia64-pci-chipsets
%patch15 -p1 -b .automake-1.10
+%patch16 -p1 -b .xkb-vidmode-switch
%patch100 -p0 -b .no-move-damage
%patch101 -p0 -b .dont-backfill-bg-none
@@ -677,6 +679,10 @@
# -------------------------------------------------------------------
%changelog
+* Fri Dec 1 2006 Adam Jackson <ajax at redhat.com> 1.1.1-54.fc7
+- xorg-x11-server-1.1.1-xkb-vidmode-switch.patch: Fix string matching on
+ XKB actions to be case-insensitive again. (#216656)
+
* Fri Dec 1 2006 Adam Jackson <ajax at redhat.com> 1.1.1-53.fc7
- xorg-x11-server-1.1.1-automake-1.10-fixes.patch: Tweak automakefiles to be
1.10-compliant.
More information about the fedora-cvs-commits
mailing list