rpms/xorg-x11-server/devel xorg-x11-server-1.0.99.901-cow-fix.patch, NONE, 1.1 xorg-x11-server.spec, 1.53, 1.54
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Apr 12 20:42:43 UTC 2006
Author: krh
Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25124
Modified Files:
xorg-x11-server.spec
Added Files:
xorg-x11-server-1.0.99.901-cow-fix.patch
Log Message:
* Wed Apr 12 2006 Kristian Høgsberg <krh at redhat.com> 1.0.99.901-3
- Add xorg-x11-server-1.0.99.901-cow-fix.patch to fix crash when
releasing the COW.
xorg-x11-server-1.0.99.901-cow-fix.patch:
compext.c | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE xorg-x11-server-1.0.99.901-cow-fix.patch ---
diff -u -r1.6 -r1.6.2.1
--- composite/compext.c 2006/03/13 21:59:55 1.6
+++ composite/compext.c 2006/04/10 15:01:30 1.6.2.1
@@ -501,7 +501,7 @@
return BadMatch;
}
- deleteCompOverlayClient(pOc, pOc->pScreen);
+ FreeResource(pOc->resource, 0);
cs = GetCompScreen(pScreen);
if (cs->pOverlayClients == NULL) {
Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- xorg-x11-server.spec 12 Apr 2006 00:14:32 -0000 1.53
+++ xorg-x11-server.spec 12 Apr 2006 20:42:41 -0000 1.54
@@ -4,7 +4,7 @@
Summary: X.Org X11 X server
Name: xorg-x11-server
Version: 1.0.99.901
-Release: 2
+Release: 3
URL: http://www.x.org
License: MIT/X11
Group: User Interface/X
@@ -22,8 +22,9 @@
Patch6: xserver-1.0.1-randr-sdk.patch
# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=181292. hacky patch
Patch7: xorg-x11-server-1.0.1-fpic-libxf86config.patch
-# REMOVE ME FOR 1.0.99.3
-#Patch8: xorg-x11-server-1.0.99.2-no-kdrive-dri.patch
+
+# REMOVE ME FOR 1.0.99.902
+Patch8: xorg-x11-server-1.0.99.901-cow-fix.patch
# Spiffiffity feature/optimization patches.
Patch100: xorg-server-1.0.99.2-spiffiffity.patch
@@ -258,7 +259,7 @@
%patch4 -p0 -b .composite-fastpath-fdo4320
%patch6 -p1 -b .randrsdk
%patch7 -p1 -b .xf86configfpic
-#%patch8 -p0 -b .no-kdrive-dri
+%patch8 -p0 -b .cow-fix
%patch100 -p0 -b .spiffiffity
@@ -565,6 +566,10 @@
# -------------------------------------------------------------------
%changelog
+* Wed Apr 12 2006 Kristian Høgsberg <krh at redhat.com> 1.0.99.901-3
+- Add xorg-x11-server-1.0.99.901-cow-fix.patch to fix crash when
+ releasing the COW.
+
* Tue Apr 11 2006 Kristian Høgsberg <krh at redhat.com> 1.0.99.901-2
- Bump for fc5 build.
More information about the fedora-cvs-commits
mailing list