From a01f5bc4108dc640bf9a353bdff11ecd573dae2cb3b3ee1c921df4ffc9ff2928 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Mon, 25 Oct 2010 12:23:57 +0000 Subject: [PATCH] - commit-5c6a2f9.diff * 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 --- commit-5c6a2f9.diff | 3 ++- xorg-x11-server.changes | 7 +++++++ xorg-x11-server.spec | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/commit-5c6a2f9.diff b/commit-5c6a2f9.diff index c9abbbd..10ebda8 100644 --- a/commit-5c6a2f9.diff +++ b/commit-5c6a2f9.diff @@ -50,11 +50,12 @@ diff --git a/hw/xfree86/common/xf86str.h b/hw/xfree86/common/xf86str.h index c9b261d..b979884 100644 --- a/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 */ Bool vtSema; - DevUnion pixmapPrivate; /* saved devPrivate from pixmap */ ++ DevUnion pixmapPrivate; /* XXX obsoleted; just for ABI compatibility */ /* hw cursor moves at SIGIO time */ Bool silkenMouse; diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes index 3d16bae..c605b96 100644 --- a/xorg-x11-server.changes +++ b/xorg-x11-server.changes @@ -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 diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 656b1e8..8a27b48 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -241,7 +241,7 @@ popd %patch217 -p1 %patch218 -p1 %patch220 -p1 -#%patch221 -p1 +%patch221 -p1 %if %moblin %patch300 -p1 %endif