From 8a43cd2e1bbc35c0baf6ba35c44c97a304f7f18f76c7c745b05426c7f4d03360 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 23 Oct 2008 10:34:24 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-server?expand=0&rev=100 --- miPointerUpdate-crashfix.diff | 29 +++++++++++++++++++++++++++++ xorg-x11-server.changes | 7 +++++++ xorg-x11-server.spec | 8 +++++++- 3 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 miPointerUpdate-crashfix.diff diff --git a/miPointerUpdate-crashfix.diff b/miPointerUpdate-crashfix.diff new file mode 100644 index 0000000..159ea5e --- /dev/null +++ b/miPointerUpdate-crashfix.diff @@ -0,0 +1,29 @@ +--- mi/mipointer.c.orig 2008-10-17 15:46:26.000000000 +0200 ++++ mi/mipointer.c 2008-10-17 15:47:11.000000000 +0200 +@@ -252,7 +252,7 @@ miPointerWarpCursor (pScreen, x, y) + { + miPointer.devx = x; + miPointer.devy = y; +- if(!miPointer.pCursor->bits->emptyMask) ++ if(miPointer.pCursor && !miPointer.pCursor->bits->emptyMask) + (*pScreenPriv->spriteFuncs->MoveCursor) (pScreen, x, y); + } + miPointer.x = x; +@@ -345,7 +345,7 @@ miPointerUpdateSprite (DeviceIntPtr pDev + { + miPointer.devx = x; + miPointer.devy = y; +- if(!miPointer.pCursor->bits->emptyMask) ++ if(miPointer.pCursor && !miPointer.pCursor->bits->emptyMask) + (*pScreenPriv->spriteFuncs->MoveCursor) (pScreen, x, y); + } + } +@@ -416,7 +416,7 @@ miPointerMoved (DeviceIntPtr pDev, Scree + { + miPointer.devx = x; + miPointer.devy = y; +- if(!miPointer.pCursor->bits->emptyMask) ++ if(miPointer.pCursor && !miPointer.pCursor->bits->emptyMask) + (*pScreenPriv->spriteFuncs->MoveCursor) (pScreen, x, y); + } + diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes index 00374b5..15531d5 100644 --- a/xorg-x11-server.changes +++ b/xorg-x11-server.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Oct 17 15:52:27 CEST 2008 - sndirsch@suse.de + +- miPointerUpdate-crashfix.diff + * fixes Xserver crash at startup with ELO touchscreen + (bnc #436435) + ------------------------------------------------------------------- Sat Oct 11 23:42:48 CEST 2008 - sndirsch@suse.de diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index dd0442c..b72e1f4 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -29,7 +29,7 @@ BuildRequires: libjpeg-devel Url: http://xorg.freedesktop.org/ %define EXPERIMENTAL 0 Version: 7.4 -Release: 8 +Release: 9 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -99,6 +99,7 @@ Patch116: ppc.diff Patch117: acpi-warning.diff Patch118: exa-greedy.diff Patch120: dga_cleanup.diff +Patch121: miPointerUpdate-crashfix.diff %description This package contains the X.Org Server. @@ -218,6 +219,7 @@ popd %patch117 %patch118 -p1 %patch120 -p1 +%patch121 -p0 %build pushd xorg-docs-* @@ -533,6 +535,10 @@ exit 0 %endif %changelog +* Fri Oct 17 2008 sndirsch@suse.de +- miPointerUpdate-crashfix.diff + * fixes Xserver crash at startup with ELO touchscreen + (bnc #436435) * Sun Oct 12 2008 sndirsch@suse.de - xorg-server 1.5.2 * int10: Remove useless check.