xorg-server: Changes to 'debian-unstable'
debian/changelog | 6 -
debian/patches/15_keyboard_leds.diff | 24 ++++
debian/patches/44_XKB_mapping_changes_for_all_core-sending_devices.diff | 52 +++++-----
debian/patches/series | 1
4 files changed, 61 insertions(+), 22 deletions(-)
New commits:
commit ed5bdd8403962d1373d6b0eb8360557affe4cfed
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Oct 24 02:17:07 2007 +0200
Fix keyboard LEDs
New patch 15_keyboard_leds.diff by Paulo César Pereira de Andrade
<pcpa@mandriva.com.br> from upstream bug#12434 to fix keyboard leds.
The problem should be fixed properly in 1.4.1, but this patch will do for
now (closes: #440743 and its pile of duplicates).
diff --git a/debian/changelog b/debian/changelog
index 8823a7c..f9d8d86 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,10 @@ xorg-server (2:1.4-4) UNRELEASED; urgency=low
* Add conflict on xserver-xorg-input-wacom (<< 0.7.8) to xserver-xorg-core.
That driver is built against the old ABI, but doesn't provide
xserver-xorg-input.
+ * New patch 15_keyboard_leds.diff by Paulo César Pereira de Andrade
+ <pcpa@mandriva.com.br> from upstream bug#12434 to fix keyboard leds.
+ The problem should be fixed properly in 1.4.1, but this patch will do for
+ now (closes: #440743 and its pile of duplicates).
[ David Nusinow ]
* Add 14_default_screen_section.diff. This allows you to not have a screen
@@ -23,7 +27,7 @@ xorg-server (2:1.4-4) UNRELEASED; urgency=low
* Bump x11proto-core-dev build-dependency to >= 7.0.9,
thanks Max Kellermann, closes: #446869.
- -- Brice Goglin <bgoglin@debian.org> Tue, 16 Oct 2007 18:23:20 +0200
+ -- Julien Cristau <jcristau@debian.org> Wed, 24 Oct 2007 02:12:41 +0200
xorg-server (2:1.4-3) unstable; urgency=low
diff --git a/debian/patches/15_keyboard_leds.diff b/debian/patches/15_keyboard_leds.diff
new file mode 100644
index 0000000..73cd4a0
--- /dev/null
+++ b/debian/patches/15_keyboard_leds.diff
@@ -0,0 +1,24 @@
+This patch by Paulo César Pereira de Andrade <pcpa@mandriva.com.br>
+
+http://bugs.freedesktop.org/show_bug.cgi?id=12434
+
+--- xorg-server-1.4/dix/devices.c.orig 2007-10-19 17:04:51.000000000 -0200
++++ xorg-server-1.4/dix/devices.c 2007-10-23 17:50:38.000000000 -0200
+@@ -294,7 +294,17 @@ CoreKeyboardBell(int volume, DeviceIntPt
+ static void
+ CoreKeyboardCtl(DeviceIntPtr pDev, KeybdCtrl *ctrl)
+ {
++#ifdef XKB
++ if (!noXkbExtension) {
++ DeviceIntPtr dev = (DeviceIntPtr)
++ pDev->devPrivates[CoreDevicePrivatesIndex].ptr;
++
++ if (dev && dev->key && dev->key->xkbInfo && dev->key->xkbInfo->kbdProc)
++ (*dev->key->xkbInfo->kbdProc)(dev, ctrl);
++ }
++#else
+ return;
++#endif
+ }
+
+ /**
diff --git a/debian/patches/44_XKB_mapping_changes_for_all_core-sending_devices.diff b/debian/patches/44_XKB_mapping_changes_for_all_core-sending_devices.diff
index f823591..49a56a4 100644
--- a/debian/patches/44_XKB_mapping_changes_for_all_core-sending_devices.diff
+++ b/debian/patches/44_XKB_mapping_changes_for_all_core-sending_devices.diff
@@ -11,9 +11,11 @@ through to XKB for all extended devices as well.
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=443044
---
---- a/Xi/exevents.c
-+++ b/Xi/exevents.c
-@@ -73,6 +73,10 @@ SOFTWARE.
+Index: xorg-server/Xi/exevents.c
+===================================================================
+--- xorg-server.orig/Xi/exevents.c 2007-10-21 11:32:46.000000000 +0200
++++ xorg-server/Xi/exevents.c 2007-10-24 02:15:17.000000000 +0200
+@@ -73,6 +73,10 @@
#include "dixgrabs.h" /* CreateGrab() */
#include "scrnintstr.h"
@@ -24,7 +26,7 @@ http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=443044
#define WID(w) ((w) ? ((w)->drawable.id) : 0)
#define AllModifiersMask ( \
ShiftMask | LockMask | ControlMask | Mod1Mask | Mod2Mask | \
-@@ -942,7 +946,7 @@ SetModifierMapping(ClientPtr client, Dev
+@@ -942,7 +946,7 @@
}
void
@@ -33,7 +35,7 @@ http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=443044
KeyCode firstKeyCode, CARD8 count, DeviceIntPtr dev)
{
xEvent event;
-@@ -957,6 +961,11 @@ SendDeviceMappingNotify(CARD8 request,
+@@ -957,6 +961,11 @@
ev->count = count;
}
@@ -45,7 +47,7 @@ http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=443044
SendEventToAllWindows(dev, DeviceMappingNotifyMask, (xEvent *) ev, 1);
}
-@@ -992,7 +1001,7 @@ ChangeKeyMapping(ClientPtr client,
+@@ -992,7 +1001,7 @@
keysyms.map = map;
if (!SetKeySymsMap(&k->curKeySyms, &keysyms))
return BadAlloc;
@@ -54,9 +56,11 @@ http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=443044
return client->noClientException;
}
---- a/Xi/setbmap.c
-+++ b/Xi/setbmap.c
-@@ -134,7 +134,7 @@ ProcXSetDeviceButtonMapping(ClientPtr cl
+Index: xorg-server/Xi/setbmap.c
+===================================================================
+--- xorg-server.orig/Xi/setbmap.c 2007-10-21 11:32:46.000000000 +0200
++++ xorg-server/Xi/setbmap.c 2007-10-24 02:15:17.000000000 +0200
+@@ -134,7 +134,7 @@
}
if (ret != MappingBusy)
@@ -65,9 +69,11 @@ http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=443044
return Success;
}
---- a/Xi/setmmap.c
-+++ b/Xi/setmmap.c
-@@ -122,7 +122,7 @@ ProcXSetDeviceModifierMapping(ClientPtr
+Index: xorg-server/Xi/setmmap.c
+===================================================================
+--- xorg-server.orig/Xi/setmmap.c 2007-10-21 11:32:46.000000000 +0200
++++ xorg-server/Xi/setmmap.c 2007-10-24 02:15:17.000000000 +0200
+@@ -122,7 +122,7 @@
if (ret == MappingSuccess || ret == MappingBusy || ret == MappingFailed) {
rep.success = ret;
if (ret == MappingSuccess)
@@ -76,9 +82,11 @@ http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=443044
WriteReplyToClient(client, sizeof(xSetDeviceModifierMappingReply),
&rep);
} else {
---- a/dix/devices.c
-+++ b/dix/devices.c
-@@ -1208,10 +1208,9 @@ SendMappingNotify(unsigned request, unsi
+Index: xorg-server/dix/devices.c
+===================================================================
+--- xorg-server.orig/dix/devices.c 2007-10-24 02:15:16.000000000 +0200
++++ xorg-server/dix/devices.c 2007-10-24 02:15:17.000000000 +0200
+@@ -1218,10 +1218,9 @@
}
#ifdef XKB
if (!noXkbExtension &&
@@ -92,7 +100,7 @@ http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=443044
#endif
/* 0 is the server client */
-@@ -1359,6 +1358,7 @@ int
+@@ -1369,6 +1368,7 @@
ProcSetModifierMapping(ClientPtr client)
{
xSetModifierMappingReply rep;
@@ -100,7 +108,7 @@ http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=443044
REQUEST(xSetModifierMappingReq);
REQUEST_AT_LEAST_SIZE(xSetModifierMappingReq);
-@@ -1374,8 +1374,10 @@ ProcSetModifierMapping(ClientPtr client)
+@@ -1384,8 +1384,10 @@
rep.success = DoSetModifierMapping(client, (KeyCode *)&stuff[1],
stuff->numKeyPerModifier);
@@ -112,7 +120,7 @@ http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=443044
WriteReplyToClient(client, sizeof(xSetModifierMappingReply), &rep);
return client->noClientException;
}
-@@ -1438,16 +1440,19 @@ ProcChangeKeyboardMapping(ClientPtr clie
+@@ -1448,16 +1450,19 @@
keysyms.maxKeyCode = stuff->firstKeyCode + stuff->keyCodes - 1;
keysyms.mapWidth = stuff->keySymsPerKeyCode;
keysyms.map = (KeySym *)&stuff[1];
@@ -137,9 +145,11 @@ http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=443044
return client->noClientException;
}
---- a/include/exevents.h
-+++ b/include/exevents.h
-@@ -129,6 +129,7 @@ extern int SetModifierMapping(
+Index: xorg-server/include/exevents.h
+===================================================================
+--- xorg-server.orig/include/exevents.h 2007-10-21 11:32:46.000000000 +0200
++++ xorg-server/include/exevents.h 2007-10-24 02:15:17.000000000 +0200
+@@ -129,6 +129,7 @@
KeyClassPtr * /* k */);
extern void SendDeviceMappingNotify(
diff --git a/debian/patches/series b/debian/patches/series
index 1706d24..42c53f1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,6 +11,7 @@
12_bgPixel_fix_64bit_issue.diff
13_debian_add_xkbpath_env_variable.diff
14_default_screen_section.diff
+15_keyboard_leds.diff
21_glx_align_fixes.patch
41_vbe_filter_less.diff
42_fix_RemoveGeneralSocket_crash_from_dbus.diff
Reply to: