Accepting request 154957 from home:badshah400:branches:GNOME:Factory

Add patch from upstream git to fix a window redirecting issue (bgo#693042).

OBS-URL: https://build.opensuse.org/request/show/154957
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/mutter?expand=0&rev=109
This commit is contained in:
Dominique Leuenberger 2013-02-09 13:17:31 +00:00 committed by Git OBS Bridge
parent d0bab8955b
commit 79d6e93656
3 changed files with 36 additions and 0 deletions

View File

@ -0,0 +1,26 @@
From 5ad3260bb8ef6f08e0c8426d42990e3bdcf52c52 Mon Sep 17 00:00:00 2001
From: Adel Gadllah <adel.gadllah@gmail.com>
Date: Sat, 02 Feb 2013 09:27:35 +0000
Subject: meta-window-actor: Correctly create a new pixmap when redirecting a window again
We should call meta_window_actor_detach not
meta_window_actor_queue_create_pixmap to create a new pixmap when we redirect a
previously unredirected window again.
https://bugzilla.gnome.org/show_bug.cgi?id=693042
---
diff --git a/src/compositor/meta-window-actor.c b/src/compositor/meta-window-actor.c
index 371233f..1490b9c 100644
--- a/src/compositor/meta-window-actor.c
+++ b/src/compositor/meta-window-actor.c
@@ -1237,7 +1237,7 @@ meta_window_actor_set_redirected (MetaWindowActor *self, gboolean state)
meta_error_trap_push (display);
XCompositeRedirectWindow (xdisplay, xwin, CompositeRedirectManual);
meta_error_trap_pop (display);
- meta_window_actor_queue_create_pixmap (self);
+ meta_window_actor_detach (self);
self->priv->unredirected = FALSE;
}
else
--
cgit v0.9.0.2

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Feb 8 22:04:46 UTC 2013 - badshah400@gmail.com
- Add mutter-correctly-create-new-pixmap.patch to correctly create
a new pixmap when redirecting a window again; patch taken from
upstream git. Fixes bgo#693042.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jan 21 23:43:46 UTC 2013 - zaitor@opensuse.org Mon Jan 21 23:43:46 UTC 2013 - zaitor@opensuse.org

View File

@ -26,6 +26,8 @@ Url: http://www.gnome.org
Source: http://download.gnome.org/sources/mutter/3.6/%{name}-%{version}.tar.xz Source: http://download.gnome.org/sources/mutter/3.6/%{name}-%{version}.tar.xz
# PATCH-FIX-UPSTREAM mutter-stop-jumping-windows.patch bgo#556696 zaitor@opensuse.org -- Stop windows from jumping spontaneously from one monitor to another. # PATCH-FIX-UPSTREAM mutter-stop-jumping-windows.patch bgo#556696 zaitor@opensuse.org -- Stop windows from jumping spontaneously from one monitor to another.
Patch0: mutter-stop-jumping-windows.patch Patch0: mutter-stop-jumping-windows.patch
# PATCH-FIX-UPSTREAM mutter-correctly-create-new-pixmap.patch bgo#693042 badshah400@gmail.com -- Correctly create a new pixmap when redirecting a window again; patch taken from upstream git
Patch1: mutter-correctly-create-new-pixmap.patch
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: gobject-introspection-devel >= 0.9.5 BuildRequires: gobject-introspection-devel >= 0.9.5
BuildRequires: intltool BuildRequires: intltool
@ -125,6 +127,7 @@ to develop applications that require these.
%prep %prep
%setup -q %setup -q
%patch0 -p1 %patch0 -p1
%patch1 -p1
translation-update-upstream translation-update-upstream
%if 0%{?BUILD_FROM_VCS} %if 0%{?BUILD_FROM_VCS}