From a01f5bc4108dc640bf9a353bdff11ecd573dae2cb3b3ee1c921df4ffc9ff2928 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Mon, 25 Oct 2010 12:23:57 +0000 Subject: [PATCH 1/2] - 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 From 53528a1d239db12b2c55d382c7cb22e6e9f8621199da4e18d64314daaa843677 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Mon, 1 Nov 2010 23:57:45 +0000 Subject: [PATCH 2/2] - xorg-server 1.9.2 * This is a brown-bag release to address an issue with the xorg-server-1.9.1 tarball. The version of util-macros used to build the 1.9.1 tarball was modified and could cause problems due to the absence of the -fno-strict-aliasing CFLAG. This tarball was packaged using the unmodified util-macros. This additionally contains a fix for a regression in XQuartz found by Christof Wolf. OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=297 --- xorg-server-1.9.1.tar.bz2 | 3 --- xorg-server-1.9.2.tar.bz2 | 3 +++ xorg-x11-server.changes | 12 ++++++++++++ xorg-x11-server.spec | 2 +- 4 files changed, 16 insertions(+), 4 deletions(-) delete mode 100644 xorg-server-1.9.1.tar.bz2 create mode 100644 xorg-server-1.9.2.tar.bz2 diff --git a/xorg-server-1.9.1.tar.bz2 b/xorg-server-1.9.1.tar.bz2 deleted file mode 100644 index 7003592..0000000 --- a/xorg-server-1.9.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:33e7624a52a21762c9dfdabde7b7bd1221c5298fd1b429f7c6b683145710114e -size 5219517 diff --git a/xorg-server-1.9.2.tar.bz2 b/xorg-server-1.9.2.tar.bz2 new file mode 100644 index 0000000..37722b3 --- /dev/null +++ b/xorg-server-1.9.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8b30800004c98fc7a8e6ff31a339f28451be5132e774443be22bf226e1791e34 +size 5274463 diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes index c605b96..c39df4a 100644 --- a/xorg-x11-server.changes +++ b/xorg-x11-server.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Mon Nov 1 23:47:32 UTC 2010 - sndirsch@novell.com + +- xorg-server 1.9.2 + * This is a brown-bag release to address an issue with the + xorg-server-1.9.1 tarball. The version of util-macros used to + build the 1.9.1 tarball was modified and could cause problems + due to the absence of the -fno-strict-aliasing CFLAG. This + tarball was packaged using the unmodified util-macros. + This additionally contains a fix for a regression in XQuartz + found by Christof Wolf. + ------------------------------------------------------------------- Mon Oct 25 12:16:17 UTC 2010 - sndirsch@novell.com diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 8a27b48..4f42cba 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -20,7 +20,7 @@ %define moblin 0 Name: xorg-x11-server -%define dirsuffix 1.9.1 +%define dirsuffix 1.9.2 %define vnc 0 BuildRequires: Mesa-devel bison flex fontconfig-devel freetype2-devel ghostscript-library libdrm-devel libopenssl-devel pkgconfig xorg-x11 xorg-x11-devel xorg-x11-fonts-devel xorg-x11-libICE-devel xorg-x11-libSM-devel xorg-x11-libX11-devel xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-libXext-devel xorg-x11-libXfixes-devel xorg-x11-libXmu-devel xorg-x11-libXp-devel xorg-x11-libXpm-devel xorg-x11-libXprintUtil-devel xorg-x11-libXrender-devel xorg-x11-libXt-devel xorg-x11-libXv-devel xorg-x11-libfontenc-devel xorg-x11-libxkbfile-devel xorg-x11-proto-devel xorg-x11-xtrans-devel ### udev support (broken on openSUSE 11.2, see also bnc #589997)