diff --git a/xorg-x11-server-1.1.1-graphics-expose.patch b/xorg-x11-server-1.1.1-graphics-expose.patch index 449f41f..cd82832 100644 --- a/xorg-x11-server-1.1.1-graphics-expose.patch +++ b/xorg-x11-server-1.1.1-graphics-expose.patch @@ -1,5 +1,5 @@ ---- xorg-server-1.1.1/miext/cw/cw_ops.c.graphics-expose 2006-10-04 20:46:11.000000000 -0400 -+++ xorg-server-1.1.1/miext/cw/cw_ops.c 2006-10-04 20:52:32.000000000 -0400 +--- xorg-server-1.1.1/miext/cw/cw_ops.c.graphics-expose 2006-07-05 20:23:57.000000000 -0400 ++++ xorg-server-1.1.1/miext/cw/cw_ops.c 2006-10-04 22:01:13.000000000 -0400 @@ -30,6 +30,7 @@ #include "gcstruct.h" #include "pixmapstr.h" @@ -8,7 +8,7 @@ #define SETUP_BACKING_DST(_pDst, _pGC) \ cwGCPtr pGCPrivate = getCwGC (_pGC); \ -@@ -184,56 +185,40 @@ +@@ -184,56 +185,46 @@ cwCopyArea(DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC, int srcx, int srcy, int w, int h, int dstx, int dsty) { @@ -21,8 +21,8 @@ - odstx = dstx; - odsty = dsty; -- CW_OFFSET_XY_DST(dstx, dsty); -- CW_OFFSET_XY_SRC(srcx, srcy); + CW_OFFSET_XY_DST(dstx, dsty); + CW_OFFSET_XY_SRC(srcx, srcy); - - exposed = (*pBackingGC->ops->CopyArea)(pBackingSrc, pBackingDst, - pBackingGC, srcx, srcy, w, h, @@ -30,6 +30,7 @@ - - if (exposed != NULL) - REGION_TRANSLATE(pDst->pScreen, exposed, odstx - dstx, odsty - dsty); ++ + (*pBackingGC->ops->CopyArea)(pBackingSrc, pBackingDst, + pBackingGC, srcx, srcy, w, h, + dstx, dsty); @@ -55,8 +56,8 @@ - odstx = dstx; - odsty = dsty; -- CW_OFFSET_XY_DST(dstx, dsty); -- CW_OFFSET_XY_SRC(srcx, srcy); + CW_OFFSET_XY_DST(dstx, dsty); + CW_OFFSET_XY_SRC(srcx, srcy); - - exposed = (*pBackingGC->ops->CopyPlane)(pBackingSrc, pBackingDst, - pBackingGC, srcx, srcy, w, h, @@ -68,6 +69,7 @@ - EPILOGUE(pGC); - - return exposed; ++ + (*pBackingGC->ops->CopyPlane)(pBackingSrc, pBackingDst, + pBackingGC, srcx, srcy, w, h, + dstx, dsty, plane); diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 3151576..88dee48 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -3,7 +3,7 @@ Summary: X.Org X11 X server Name: xorg-x11-server Version: 1.1.1 -Release: 45%{?dist} +Release: 46%{?dist} URL: http://www.x.org License: MIT/X11 Group: User Interface/X @@ -721,6 +721,9 @@ rm -rf $RPM_BUILD_ROOT # ------------------------------------------------------------------- %changelog +* Wed Oct 4 2006 Soren Sandmann - 1.1.1-46.fc6 +- Fix over-zealous code deletion in graphics-expose.patch. + * Wed Oct 4 2006 Soren Sandmann - 1.1.1-45.fc6 - xorg-x11-server-1.1.1-graphics-expose.patch: call miHandleExposures() in CopyArea/CopyPlane explicitly in cw to