From d54aeb8de7713a558afbd5afaaa6089ff2a5c1c8 Mon Sep 17 00:00:00 2001 From: Adel Gadllah Date: Wed, 17 Nov 2010 23:26:54 +0100 Subject: [PATCH] Backport fix for corruption bug (RH #614542) --- compiz-0.8.6-pixmap-size-calculation.patch | 25 ++++++++++++++++++++++ compiz.spec | 7 +++++- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 compiz-0.8.6-pixmap-size-calculation.patch diff --git a/compiz-0.8.6-pixmap-size-calculation.patch b/compiz-0.8.6-pixmap-size-calculation.patch new file mode 100644 index 0000000..af2b710 --- /dev/null +++ b/compiz-0.8.6-pixmap-size-calculation.patch @@ -0,0 +1,25 @@ +From 0f95c41a0aa175ddf7947ba18b01f746c95594a9 Mon Sep 17 00:00:00 2001 +From: Paul Donohue +Date: Sun, 17 Oct 2010 16:24:14 +0000 +Subject: Fix pixmap size calculation, server drawn borders are also included in + +the pixmap. +--- +diff --git a/src/window.c b/src/window.c +index a925288..6674643 100644 +--- a/src/window.c ++++ b/src/window.c +@@ -1446,8 +1446,8 @@ bindWindow (CompWindow *w) + } + + w->pixmap = XCompositeNameWindowPixmap (dpy, w->id); +- w->width = attr.width; +- w->height = attr.height; ++ w->width = attr.width + attr.border_width * 2; ++ w->height = attr.height + attr.border_width * 2; + + XUngrabServer (dpy); + } +-- +cgit v0.8.3.1-30-gff3a + diff --git a/compiz.spec b/compiz.spec index 26ac590..3596dbc 100644 --- a/compiz.spec +++ b/compiz.spec @@ -11,7 +11,7 @@ URL: http://www.go-compiz.org License: GPLv2+ and LGPLv2+ and MIT Group: User Interface/Desktops Version: 0.8.6 -Release: 5%{?dist} +Release: 6%{?dist} Summary: OpenGL window and compositing manager BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -63,6 +63,8 @@ Patch115: compiz-0.8.6-focus-denied-stacking-fix.patch #upstream patches #http://gitweb.compiz.org/?p=compiz/core;a=commit;h=5ea5e2130c56d405fcccd63932918fc49ca1f1b9 Patch116: gdk_display_deprecated.patch +# 0f95c41a0aa175ddf7947ba18b01f746c95594a9 +Patch117: compiz-0.8.6-pixmap-size-calculation.patch %description Compiz is one of the first OpenGL-accelerated compositing window @@ -288,6 +290,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Nov 17 2010 Adel Gadllah - 0.8.6-6 +- Backport fix for corruption bug (RH #614542) + * Thu Oct 14 2010 leigh scott - 0.8.6-5 - Don't rely on deprecated gdk symbol gdk_display. - Add Br libxslt-devel