rpm/xorg-x11-server
SHA256
1
0
Fork 0
forked from pool/xorg-x11-server
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-server?expand=0&rev=100

Browse Source
This commit is contained in:
OBS User unknown 2008-10-23 10:34:24 +00:00 committed by Git OBS Bridge
parent d1c1f439be
commit 8a43cd2e1b
3 changed files with 43 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
miPointerUpdate-crashfix.diff Normal file
View File

@ -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);
}

7
xorg-x11-server.changes
View File

@ -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

8
xorg-x11-server.spec
View File

@ -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.