From d8a433a261323ee703e0d520101bdc7afe9367b151f74cd01916ae7bb0d4e1c8 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 18 Jan 2012 17:02:17 +0000 Subject: [PATCH 1/2] Accepting request 100549 from home:vuntz:branches:GNOME:Factory Add patch to fix build with GTK+ 3.3.8; better to get things building asap OBS-URL: https://build.opensuse.org/request/show/100549 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/mutter?expand=0&rev=80 --- mutter-fix-build-latest-gtk3.patch | 36 ++++++++++++++++++++++++++++++ mutter.changes | 6 +++++ mutter.spec | 19 +++++++++------- 3 files changed, 53 insertions(+), 8 deletions(-) create mode 100644 mutter-fix-build-latest-gtk3.patch diff --git a/mutter-fix-build-latest-gtk3.patch b/mutter-fix-build-latest-gtk3.patch new file mode 100644 index 0000000..30c378c --- /dev/null +++ b/mutter-fix-build-latest-gtk3.patch @@ -0,0 +1,36 @@ +From e8209e7b221a4a108c132fa3a8ad27e9a8018a6d Mon Sep 17 00:00:00 2001 +From: Owen W. Taylor +Date: Tue, 10 Jan 2012 00:03:07 +0000 +Subject: Handle rename of GTK+'s window-unfocused state to backdrop + +GTK_STATE_FLAG_WINDOW_UNFOCUSED was renamed to +GTK_STATE_FLAG_BACKDROP. +--- +diff --git a/src/ui/theme.c b/src/ui/theme.c +index 6e15d21..604505f 100644 +--- a/src/ui/theme.c ++++ b/src/ui/theme.c +@@ -6403,8 +6403,8 @@ meta_gtk_state_from_string (const char *str) + return GTK_STATE_FLAG_INCONSISTENT; + else if (g_ascii_strcasecmp ("focused", str) == 0) + return GTK_STATE_FLAG_FOCUSED; +- else if (g_ascii_strcasecmp ("window-unfocused", str) == 0) +- return GTK_STATE_FLAG_WINDOW_UNFOCUSED; ++ else if (g_ascii_strcasecmp ("backdrop", str) == 0) ++ return GTK_STATE_FLAG_BACKDROP; + else + return -1; /* hack */ + } +@@ -6428,8 +6428,8 @@ meta_gtk_state_to_string (GtkStateFlags state) + return "INCONSISTENT"; + case GTK_STATE_FLAG_FOCUSED: + return "FOCUSED"; +- case GTK_STATE_FLAG_WINDOW_UNFOCUSED: +- return "WINDOW_UNFOCUSED"; ++ case GTK_STATE_FLAG_BACKDROP: ++ return "BACKDROP"; + } + + return ""; +-- +cgit v0.9.0.2 diff --git a/mutter.changes b/mutter.changes index c2c0e0f..c2c50f9 100644 --- a/mutter.changes +++ b/mutter.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jan 18 11:28:48 UTC 2012 - vuntz@opensuse.org + +- Add mutter-fix-build-latest-gtk3.patch: fix build caused by an + API change in GTK+ 3.3.8. + ------------------------------------------------------------------- Thu Jan 5 07:34:46 UTC 2012 - vuntz@opensuse.org diff --git a/mutter.spec b/mutter.spec index 1f0a0c6..506389e 100644 --- a/mutter.spec +++ b/mutter.spec @@ -17,6 +17,15 @@ Name: mutter +Version: 3.3.3 +Release: 0 +Summary: Window and compositing manager based on Clutter +License: GPL-2.0+ +Group: System/GUI/GNOME +Url: http://www.gnome.org +Source: http://download.gnome.org/sources/mutter/3.3/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM mutter-fix-build-latest-gtk3.patch vuntz@opensuse.org -- Fix build with gtk+ 3.3.8, taken from git +Patch0: mutter-fix-build-latest-gtk3.patch BuildRequires: clutter-devel BuildRequires: fdupes BuildRequires: gnome-doc-utils-devel @@ -34,17 +43,10 @@ BuildRequires: pkgconfig(libcanberra-gtk3) %if 0%{?BUILD_FROM_VCS} BuildRequires: gnome-common %endif -Version: 3.3.3 -Release: 0 -Summary: Window and compositing manager based on Clutter -License: GPL-2.0+ -Group: System/GUI/GNOME -Source: http://download.gnome.org/sources/mutter/3.3/%{name}-%{version}.tar.xz -Url: http://www.gnome.org -BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: zenity Recommends: %{name}-lang Provides: windowmanager +BuildRoot: %{_tmppath}/%{name}-%{version}-build %glib2_gsettings_schema_requires %description @@ -65,6 +67,7 @@ to develop applications that require these. %prep %setup -q translation-update-upstream +%patch0 -p1 %if 0%{?BUILD_FROM_VCS} [ -x ./autogen.sh ] && NOCONFIGURE=1 ./autogen.sh From d94aacb3775ba7d1ebacf5cb30a55ae349e0d094c13d0e8a4f0d33fe52112bfd Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Tue, 24 Jan 2012 11:19:56 +0000 Subject: [PATCH 2/2] Accepting request 100971 from home:vuntz:branches:GNOME:Factory Update to 3.3.4 OBS-URL: https://build.opensuse.org/request/show/100971 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/mutter?expand=0&rev=81 --- mutter-3.3.3.tar.xz | 3 --- mutter-3.3.4.tar.xz | 3 +++ mutter-fix-build-latest-gtk3.patch | 36 ------------------------------ mutter.changes | 13 +++++++++++ mutter.spec | 6 +---- 5 files changed, 17 insertions(+), 44 deletions(-) delete mode 100644 mutter-3.3.3.tar.xz create mode 100644 mutter-3.3.4.tar.xz delete mode 100644 mutter-fix-build-latest-gtk3.patch diff --git a/mutter-3.3.3.tar.xz b/mutter-3.3.3.tar.xz deleted file mode 100644 index db1c9d7..0000000 --- a/mutter-3.3.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:58079853f8bfa9aa4b7d3deae2c137960b30eafd0009ef83d4d93310009be81c -size 1644884 diff --git a/mutter-3.3.4.tar.xz b/mutter-3.3.4.tar.xz new file mode 100644 index 0000000..d669f23 --- /dev/null +++ b/mutter-3.3.4.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:00238a58ad5b4a0fe5036afbe38ee4860ac2a77efa0998e4d1cc57ef1ffaecee +size 1645568 diff --git a/mutter-fix-build-latest-gtk3.patch b/mutter-fix-build-latest-gtk3.patch deleted file mode 100644 index 30c378c..0000000 --- a/mutter-fix-build-latest-gtk3.patch +++ /dev/null @@ -1,36 +0,0 @@ -From e8209e7b221a4a108c132fa3a8ad27e9a8018a6d Mon Sep 17 00:00:00 2001 -From: Owen W. Taylor -Date: Tue, 10 Jan 2012 00:03:07 +0000 -Subject: Handle rename of GTK+'s window-unfocused state to backdrop - -GTK_STATE_FLAG_WINDOW_UNFOCUSED was renamed to -GTK_STATE_FLAG_BACKDROP. ---- -diff --git a/src/ui/theme.c b/src/ui/theme.c -index 6e15d21..604505f 100644 ---- a/src/ui/theme.c -+++ b/src/ui/theme.c -@@ -6403,8 +6403,8 @@ meta_gtk_state_from_string (const char *str) - return GTK_STATE_FLAG_INCONSISTENT; - else if (g_ascii_strcasecmp ("focused", str) == 0) - return GTK_STATE_FLAG_FOCUSED; -- else if (g_ascii_strcasecmp ("window-unfocused", str) == 0) -- return GTK_STATE_FLAG_WINDOW_UNFOCUSED; -+ else if (g_ascii_strcasecmp ("backdrop", str) == 0) -+ return GTK_STATE_FLAG_BACKDROP; - else - return -1; /* hack */ - } -@@ -6428,8 +6428,8 @@ meta_gtk_state_to_string (GtkStateFlags state) - return "INCONSISTENT"; - case GTK_STATE_FLAG_FOCUSED: - return "FOCUSED"; -- case GTK_STATE_FLAG_WINDOW_UNFOCUSED: -- return "WINDOW_UNFOCUSED"; -+ case GTK_STATE_FLAG_BACKDROP: -+ return "BACKDROP"; - } - - return ""; --- -cgit v0.9.0.2 diff --git a/mutter.changes b/mutter.changes index c2c50f9..f2d6a39 100644 --- a/mutter.changes +++ b/mutter.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Fri Jan 20 19:39:38 UTC 2012 - vuntz@opensuse.org + +- Update to version 3.3.4: + + Adapt to changes in GtkStateFlags + + Redo properties for applications menu corresponding to GTK+ + changes - they are now _GTK_* not DBUS_*. + + Fix crash on gnome-shell restart when a modal dialog is open + [bgo#668299] + + Code cleanup [bgo#666039] + + Updated translations. +- Drop mutter-fix-build-latest-gtk3.patch: fixed upstream. + ------------------------------------------------------------------- Wed Jan 18 11:28:48 UTC 2012 - vuntz@opensuse.org diff --git a/mutter.spec b/mutter.spec index 506389e..c755ed4 100644 --- a/mutter.spec +++ b/mutter.spec @@ -15,17 +15,14 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - Name: mutter -Version: 3.3.3 +Version: 3.3.4 Release: 0 Summary: Window and compositing manager based on Clutter License: GPL-2.0+ Group: System/GUI/GNOME Url: http://www.gnome.org Source: http://download.gnome.org/sources/mutter/3.3/%{name}-%{version}.tar.xz -# PATCH-FIX-UPSTREAM mutter-fix-build-latest-gtk3.patch vuntz@opensuse.org -- Fix build with gtk+ 3.3.8, taken from git -Patch0: mutter-fix-build-latest-gtk3.patch BuildRequires: clutter-devel BuildRequires: fdupes BuildRequires: gnome-doc-utils-devel @@ -67,7 +64,6 @@ to develop applications that require these. %prep %setup -q translation-update-upstream -%patch0 -p1 %if 0%{?BUILD_FROM_VCS} [ -x ./autogen.sh ] && NOCONFIGURE=1 ./autogen.sh