xorg-server: Changes to 'ubuntu'
debian/changelog | 8 +
debian/patches/511_Update_border_clip_in_compAllocPixmap.patch | 42 ++++++++++
debian/patches/series | 1
3 files changed, 51 insertions(+)
New commits:
commit 67710826db2c51a0eb45937806d64262e3b0b09d
Author: Steve Langasek <steve.langasek@ubuntu.com>
Date: Fri Oct 21 23:05:03 2011 -0700
releasing version 2:1.10.4-1ubuntu5
diff --git a/debian/changelog b/debian/changelog
index 9bb04b7..1f81471 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-xorg-server (2:1.10.4-1ubuntu4.3) UNRELEASED; urgency=low
+xorg-server (2:1.10.4-1ubuntu5) oneiric; urgency=low
* debian/patches/511_Update_border_clip_in_compAllocPixmap.patch:
patch from upstream to fix window border traces left behind when
switching windows in metacity. LP: #759203.
- -- Steve Langasek <steve.langasek@ubuntu.com> Fri, 21 Oct 2011 23:03:10 -0700
+ -- Steve Langasek <steve.langasek@ubuntu.com> Fri, 21 Oct 2011 23:04:54 -0700
xorg-server (2:1.10.4-1ubuntu4.2) oneiric-proposed; urgency=low
commit f3f1b811c87336ab54a90365577f0a69d0caabaf
Author: Steve Langasek <steve.langasek@ubuntu.com>
Date: Fri Oct 21 23:04:51 2011 -0700
debian/patches/511_Update_border_clip_in_compAllocPixmap.patch: patch from upstream to fix window border traces left behind when switching windows in metacity. LP: #759203.
diff --git a/debian/changelog b/debian/changelog
index 1270348..9bb04b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg-server (2:1.10.4-1ubuntu4.3) UNRELEASED; urgency=low
+
+ * debian/patches/511_Update_border_clip_in_compAllocPixmap.patch:
+ patch from upstream to fix window border traces left behind when
+ switching windows in metacity. LP: #759203.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com> Fri, 21 Oct 2011 23:03:10 -0700
+
xorg-server (2:1.10.4-1ubuntu4.2) oneiric-proposed; urgency=low
* Fix crash on accepting a touch grab from an indirect device (LP: #877825)
diff --git a/debian/patches/511_Update_border_clip_in_compAllocPixmap.patch b/debian/patches/511_Update_border_clip_in_compAllocPixmap.patch
new file mode 100644
index 0000000..73cf33e
--- /dev/null
+++ b/debian/patches/511_Update_border_clip_in_compAllocPixmap.patch
@@ -0,0 +1,42 @@
+From: Ville Syrjala <syrjala@sci.fi>
+Subject: [PATCH xserver] composite: Update borderClip in compAllocPixmap()
+ Previously the parent constrained borderClip was copied over
+ when compRedirectWindow() is called. That is insufficient eg. in
+ case the window was already redirected, but not yet realized. So
+ copy the borderClip over in compAllocPixmap() instead.
+
+ Example:
+ Window 1 is below an automatically redirect window 2. Window 2 is
+ unmapped and moved outside the extents of window 1. Window 2 is
+ then mapped again, and MarkOverlappedWindows() uses the up to
+ date borderSize of window 2 to mark windows, which leaves
+ window 1 unmarked. Then exposures are calculated using the stale
+ borderClip of window 2, which causes the window below window 2,
+ to be exposed through an apparent hole in window 1.
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/759203
+
+Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=22566
+
+Signed-off-by: Ville Syrjala <syrjala at sci.fi>
+---
+ composite/compalloc.c | 11 +++++++----
+ 1 files changed, 7 insertions(+), 4 deletions(-)
+
+Index: xorg-server-1.10.4/composite/compalloc.c
+===================================================================
+--- xorg-server-1.10.4.orig/composite/compalloc.c
++++ xorg-server-1.10.4/composite/compalloc.c
+@@ -617,6 +617,13 @@
+ DamageRegister (&pWin->drawable, cw->damage);
+ cw->damageRegistered = TRUE;
+ }
++
++ /* Make sure our borderClip is up to date */
++ RegionUninit(&cw->borderClip);
++ RegionCopy(&cw->borderClip, &pWin->borderClip);
++ cw->borderClipX = pWin->drawable.x;
++ cw->borderClipY = pWin->drawable.y;
++
+ return TRUE;
+ }
+
diff --git a/debian/patches/series b/debian/patches/series
index f2f3289..8816531 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -43,3 +43,4 @@
508_CVE-2011-4028.patch
509_CVE-2011-4029.patch
510_fix_touchpad_touch_event_removal.patch
+511_Update_border_clip_in_compAllocPixmap.patch
Reply to: