xorg-server: Changes to 'debian-unstable'
debian/changelog | 7 +++++
debian/patches/43_fedora-xephyr-keysym-madness.diff | 24 ++++++++++++++++++++
debian/patches/series | 1
3 files changed, 32 insertions(+)
New commits:
commit bc57ffd1986e7d4629b4a0f3b5c54f44e4243939
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Feb 17 01:29:58 2007 +0100
Fix xephyr on 64bit architectures.
Add patch by Adam Jackson stolen from Fedora to fix Xephyr segv on startup on
64bit architectures.
diff --git a/debian/changelog b/debian/changelog
index 04cc704..200e40e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.1.1-18) unstable; urgency=medium
+
+ * Add patch from Fedora to make xephyr work on 64bit architectures
+ (closes: #405928).
+
+ -- Julien Cristau <jcristau@debian.org> Fri, 16 Feb 2007 22:20:08 +0100
+
xorg-server (2:1.1.1-17) unstable; urgency=medium
* Make the int10 module usable on i386 with a 64bit kernel (closes: #409730).
diff --git a/debian/patches/43_fedora-xephyr-keysym-madness.diff b/debian/patches/43_fedora-xephyr-keysym-madness.diff
new file mode 100644
index 0000000..7e22253
--- /dev/null
+++ b/debian/patches/43_fedora-xephyr-keysym-madness.diff
@@ -0,0 +1,24 @@
+--- xorg-server-1.1.1/hw/kdrive/ephyr/hostx.c.jx 2006-07-05 14:31:39.000000000 -0400
++++ xorg-server-1.1.1/hw/kdrive/ephyr/hostx.c 2007-01-29 17:56:34.000000000 -0500
+@@ -77,9 +77,10 @@
+
+ static int HostXWantDamageDebug = 0;
+
+-extern KeySym EphyrKeymap[];
++/* these two need to be 32-bits. do not say KeySym, that way lies madness */
++extern unsigned int EphyrKeymap[];
++extern unsigned int kdKeymap[];
+
+-extern KeySym kdKeymap[];
+ extern int kdMinScanCode;
+ extern int kdMaxScanCode;
+ extern int kdMinKeyCode;
+@@ -668,7 +669,7 @@
+ void
+ hostx_load_keymap(void)
+ {
+- KeySym *keymap;
++ unsigned int *keymap;
+ int mapWidth, min_keycode, max_keycode;
+ int i,j;
+
diff --git a/debian/patches/series b/debian/patches/series
index d690348..2e0c8ab 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -38,3 +38,4 @@
40_xorg-xserver-1.1.0-dbe-render.diff
41_xfree86_linux_acpi_fix_tokenizing.diff
42_build_int10_submodules.diff
+43_fedora-xephyr-keysym-madness.diff
Reply to: