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