Attachment 315704 Details for Bug 451286 – RPM diff to backport window cascading fix from upstream

[patch] RPM diff to backport window cascading fix from upstream

metacity-2.22.0-4.fc9.src.rpm.diff (text/plain), 2.71 KB, created by Dan Nicholson on 2008-09-03 22:29:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dan Nicholson

Created: 2008-09-03 22:29:19 UTC

Size: 2.71 KB

patch

obsolete

>diff -r -Npu metacity-2.22.0-3.fc9/metacity-2.22.0-cascade.patch metacity-2.22.0-4.fc9/metacity-2.22.0-cascade.patch
>--- metacity-2.22.0-3.fc9/metacity-2.22.0-cascade.patch	1969-12-31 16:00:00.000000000 -0800
>+++ metacity-2.22.0-4.fc9/metacity-2.22.0-cascade.patch	2008-09-03 15:17:04.000000000 -0700
>@@ -0,0 +1,21 @@
>+Fix to restore cascading of windows. Fixes:
>+
>+http://bugzilla.gnome.org/show_bug.cgi?id=529925
>+https://bugzilla.redhat.com/show_bug.cgi?id=451286
>+
>+diff -pNur metacity-2.22.0.orig/src/core/place.c metacity-2.22.0/src/core/place.c
>+--- metacity-2.22.0.orig/src/core/place.c	2008-03-09 14:49:15.000000000 -0700
>++++ metacity-2.22.0/src/core/place.c	2008-09-03 15:15:40.000000000 -0700
>+@@ -871,6 +871,12 @@ meta_window_place (MetaWindow        *wi
>+         }
>+     }
>+ 
>++  /* If no placement has been done, revert to cascade to avoid 
>++   * fully overlapping window (e.g. starting multiple terminals)
>++   * */
>++  if (x == xi->rect.x && y == xi->rect.y)  
>++    find_next_cascade (window, fgeom, windows, x, y, &x, &y);
>++
>+  done_check_denied_focus:
>+   /* If the window is being denied focus and isn't a transient of the
>+    * focus window, we do NOT want it to overlap with the focus window
>diff -r -Npu metacity-2.22.0-3.fc9/metacity.spec metacity-2.22.0-4.fc9/metacity.spec
>--- metacity-2.22.0-3.fc9/metacity.spec	2008-04-23 22:11:09.000000000 -0700
>+++ metacity-2.22.0-4.fc9/metacity.spec	2008-09-03 15:02:03.000000000 -0700
>@@ -1,7 +1,7 @@
> Summary: Metacity window manager
> Name: metacity
> Version: 2.22.0
>-Release: 3%{?dist}
>+Release: 4%{?dist}
> URL: http://download.gnome.org/sources/metacity/
> Source0: http://download.gnome.org/sources/metacity/2.22/metacity-%{version}.tar.bz2
> Patch0: default-theme.patch
>@@ -13,6 +13,9 @@ Patch3: metacity-2.21.13-dont-move-windo
> Patch4: metacity-2.22.0-keepabove.patch
> # fixed in upstream svn
> Patch5: metacity-theme-crash.patch
>+# http://bugzilla.gnome.org/show_bug.cgi?id=529925
>+# https://bugzilla.redhat.com/show_bug.cgi?id=451286
>+Patch6: metacity-2.22.0-cascade.patch
> 
> License: GPLv2+
> Group: User Interface/Desktops
>@@ -72,6 +75,7 @@ API. This package exists purely for tech
> %patch3 -p0 -b .dont-move-windows
> %patch4 -p0 -b .keepabove
> %patch5 -p0 -b .theme-crash
>+%patch6 -p1 -b .cascade
> 
> %build
> rm -rf $RPM_BUILD_ROOT
>@@ -158,6 +162,11 @@ fi
> %{_mandir}/man1/metacity-window-demo.1.gz
> 
> %changelog
>+* Wed Sep  3 2008 Dan Nicholson <dbn.lists@gmail.com> - 2.22.0-4
>+- Add patch to restore cascading of windows
>+  http://bugzilla.gnome.org/show_bug.cgi?id=529925
>+  https://bugzilla.redhat.com/show_bug.cgi?id=451286
>+
> * Thu Apr 24 2008 Matthias Clasen <mclasen@redhat.com> - 2.22.0-3
> - Fix a possible crash in the appearance capplet with
>   invalid metacity themes (launchpad #199402)

Actions: View | Diff

Attachments on bug 451286: 315704 | 321314