summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--metacity-2.20.1-dont-move-windows.patch4
-rw-r--r--metacity.spec3
-rw-r--r--skip-taskbar-tab.patch6
3 files changed, 5 insertions, 8 deletions
diff --git a/metacity-2.20.1-dont-move-windows.patch b/metacity-2.20.1-dont-move-windows.patch
index 64db44e..1d53802 100644
--- a/metacity-2.20.1-dont-move-windows.patch
+++ b/metacity-2.20.1-dont-move-windows.patch
@@ -1,5 +1,5 @@
---- metacity-2.20.1/src/window.c 2007-11-17 15:11:01.000000000 -0500
-+++ metacity-2.20.1.patched/src/window.c 2007-11-28 11:43:28.000000000 -0500
+--- metacity-2.20.1/src/core/window.c 2007-11-17 15:11:01.000000000 -0500
++++ metacity-2.20.1.patched/src/core/window.c 2007-11-28 11:43:28.000000000 -0500
@@ -74,6 +74,9 @@
static void meta_window_show (MetaWindow *window);
static void meta_window_hide (MetaWindow *window);
diff --git a/metacity.spec b/metacity.spec
index 89b6906..a73ae42 100644
--- a/metacity.spec
+++ b/metacity.spec
@@ -11,8 +11,6 @@ Release: 1%{?dist}
URL: http://download.gnome.org/sources/metacity/
Source0: http://download.gnome.org/sources/metacity/2.21/%{metacity_filename}.tar.bz2
Patch0: default-theme.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=482354
-Patch1: metacity-2.20.1-dont-move-windows.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=106249
Patch2: skip-taskbar-tab.patch
License: GPLv2+
@@ -69,7 +67,6 @@ API. This package exists purely for technical reasons.
%prep
%setup -q -n %{metacity_filename}
%patch0 -p1 -b .default-theme
-%patch1 -p1 -b .dont-move-windows
%patch2 -p1 -b .skip-taskbar-tab
%build
diff --git a/skip-taskbar-tab.patch b/skip-taskbar-tab.patch
index 57253e6..8fb4aba 100644
--- a/skip-taskbar-tab.patch
+++ b/skip-taskbar-tab.patch
@@ -1,6 +1,6 @@
-diff -up metacity-2.21.5/src/window.h.skip-taskbar-tab metacity-2.21.5/src/window.h
---- metacity-2.21.5/src/window.h.skip-taskbar-tab 2008-02-03 01:21:30.000000000 -0500
-+++ metacity-2.21.5/src/window.h 2008-02-03 01:21:34.000000000 -0500
+diff -up metacity-2.21.5/src/core/window.h.skip-taskbar-tab metacity-2.21.5/src/core/window.h
+--- metacity-2.21.5/src/core/window.h.skip-taskbar-tab 2008-02-03 01:21:30.000000000 -0500
++++ metacity-2.21.5/src/core/window.h 2008-02-03 01:21:34.000000000 -0500
@@ -558,7 +558,7 @@ gboolean meta_window_same_application (M
#define META_WINDOW_IN_NORMAL_TAB_CHAIN(w) \
(((w)->input || (w)->take_focus ) && META_WINDOW_IN_NORMAL_TAB_CHAIN_TYPE (w) && (!(w)->skip_taskbar))