1
0
OBS User unknown 2007-07-21 16:12:52 +00:00 committed by Git OBS Bridge
parent 8119991572
commit 69984df6c9
3 changed files with 38 additions and 1 deletions

20
xephyr-sig11-fix.diff Normal file
View File

@ -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 <X11/Xatom.h>
#include <X11/keysym.h>
#include <X11/extensions/XShm.h>
+#include <X11/Xmd.h>
/*
* 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;

View File

@ -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 Sat Jul 14 13:18:56 CEST 2007 - sndirsch@suse.de

View File

@ -21,7 +21,7 @@ BuildRequires: libjpeg-devel
URL: http://xorg.freedesktop.org/ URL: http://xorg.freedesktop.org/
%define EXPERIMENTAL 0 %define EXPERIMENTAL 0
Version: 7.2 Version: 7.2
Release: 104 Release: 106
License: X11/MIT License: X11/MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Servers/XF86_4 Group: System/X11/Servers/XF86_4
@ -89,6 +89,7 @@ Patch64: support_mesa6.5.3.patch
Patch65: remove__GLinterface.patch Patch65: remove__GLinterface.patch
Patch66: commit-c09e68c Patch66: commit-c09e68c
Patch67: xorg-docs.diff Patch67: xorg-docs.diff
Patch68: xephyr-sig11-fix.diff
Patch334: p_pci-domain.diff Patch334: p_pci-domain.diff
Patch357: p_pci-ce-x.diff Patch357: p_pci-ce-x.diff
@ -201,6 +202,7 @@ popd
pushd xorg-docs-* pushd xorg-docs-*
%patch67 %patch67
popd popd
%patch68
%build %build
pushd xorg-docs-* pushd xorg-docs-*
@ -538,6 +540,12 @@ exit 0
%endif %endif
%changelog %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 * Sat Jul 14 2007 - sndirsch@suse.de
- fixed build on s390(x) - fixed build on s390(x)
* Tue Jul 03 2007 - sndirsch@suse.de * Tue Jul 03 2007 - sndirsch@suse.de