pool/xorg-x11-server
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- commit-5c6a2f9.diff

Browse Source 
* retain obsolete pixmapPrivate, just for ABI compatibility
  * reenable patch

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=296
This commit is contained in:
Stefan Dirsch 2010-10-25 12:23:57 +00:00 committed by Git OBS Bridge
parent 106fc56b84
commit a01f5bc410
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
commit-5c6a2f9.diff
View File

@ -50,11 +50,12 @@ diff --git a/hw/xfree86/common/xf86str.h b/hw/xfree86/common/xf86str.h
index c9b261d..b979884 100644 index c9b261d..b979884 100644
--- a/hw/xfree86/common/xf86str.h --- a/hw/xfree86/common/xf86str.h
+++ b/hw/xfree86/common/xf86str.h +++ b/hw/xfree86/common/xf86str.h
@@ -765,7 +765,6 @@ typedef struct _ScrnInfoRec { @@ -765,7 +765,7 @@ typedef struct _ScrnInfoRec {
/* Allow screens to be enabled/disabled individually */ /* Allow screens to be enabled/disabled individually */
Bool vtSema; Bool vtSema;
- DevUnion pixmapPrivate; /* saved devPrivate from pixmap */ - DevUnion pixmapPrivate; /* saved devPrivate from pixmap */
+ DevUnion pixmapPrivate; /* XXX obsoleted; just for ABI compatibility */
/* hw cursor moves at SIGIO time */ /* hw cursor moves at SIGIO time */
Bool silkenMouse; Bool silkenMouse;

7
xorg-x11-server.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Oct 25 12:16:17 UTC 2010 - sndirsch@novell.com
- commit-5c6a2f9.diff
* retain obsolete pixmapPrivate, just for ABI compatibility
* reenable patch
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Oct 24 09:53:06 UTC 2010 - sndirsch@novell.com Sun Oct 24 09:53:06 UTC 2010 - sndirsch@novell.com

2
xorg-x11-server.spec
View File

@ -241,7 +241,7 @@ popd
%patch217 -p1 %patch217 -p1
%patch218 -p1 %patch218 -p1
%patch220 -p1 %patch220 -p1
#%patch221 -p1 %patch221 -p1
%if %moblin %if %moblin
%patch300 -p1 %patch300 -p1
%endif %endif