From 69984df6c9ae5533542b0bcb0a09413e405e00bb28e1afe8e6bf3004cc7b29d6 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Sat, 21 Jul 2007 16:12:52 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-server?expand=0&rev=36 --- xephyr-sig11-fix.diff | 20 ++++++++++++++++++++ xorg-x11-server.changes | 9 +++++++++ xorg-x11-server.spec | 10 +++++++++- 3 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 xephyr-sig11-fix.diff diff --git a/xephyr-sig11-fix.diff b/xephyr-sig11-fix.diff new file mode 100644 index 0000000..c9afb52 --- /dev/null +++ b/xephyr-sig11-fix.diff @@ -0,0 +1,20 @@ +--- hw/kdrive/ephyr/hostx.c.orig 2007-07-20 00:12:36.000000000 +0200 ++++ hw/kdrive/ephyr/hostx.c 2007-07-20 00:16:17.020852526 +0200 +@@ -40,6 +40,7 @@ + #include + #include + #include ++#include + + /* + * All xlib calls go here, which gets built as its own .a . +@@ -79,7 +80,8 @@ + + extern KeySym EphyrKeymap[]; + +-extern KeySym kdKeymap[]; ++extern CARD32 kdKeymap[]; /* really KeySym, but Xlib & Xserver ++ use different sizes for that */ + extern int kdMinScanCode; + extern int kdMaxScanCode; + extern int kdMinKeyCode; diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes index cc116fa..5d42b10 100644 --- a/xorg-x11-server.changes +++ b/xorg-x11-server.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri Jul 20 00:20:18 CEST 2007 - sndirsch@suse.de + +- xephyr-sig11-fix.diff: + * long vs. CARD32 mismatch in KeySym definitions between client + and server code - this patch seems to fix it (and the input + rework in head fixed it as well in a different way) + (Bug #235320) + ------------------------------------------------------------------- Sat Jul 14 13:18:56 CEST 2007 - sndirsch@suse.de diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 05cae79..057a430 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -21,7 +21,7 @@ BuildRequires: libjpeg-devel URL: http://xorg.freedesktop.org/ %define EXPERIMENTAL 0 Version: 7.2 -Release: 104 +Release: 106 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -89,6 +89,7 @@ Patch64: support_mesa6.5.3.patch Patch65: remove__GLinterface.patch Patch66: commit-c09e68c Patch67: xorg-docs.diff +Patch68: xephyr-sig11-fix.diff Patch334: p_pci-domain.diff Patch357: p_pci-ce-x.diff @@ -201,6 +202,7 @@ popd pushd xorg-docs-* %patch67 popd +%patch68 %build pushd xorg-docs-* @@ -538,6 +540,12 @@ exit 0 %endif %changelog +* Fri Jul 20 2007 - sndirsch@suse.de +- xephyr-sig11-fix.diff: + * long vs. CARD32 mismatch in KeySym definitions between client + and server code - this patch seems to fix it (and the input + rework in head fixed it as well in a different way) + (Bug #235320) * Sat Jul 14 2007 - sndirsch@suse.de - fixed build on s390(x) * Tue Jul 03 2007 - sndirsch@suse.de