From bccdf7b1d57b1ccf33cbf5f165f7731174b18c8c3a858698029020f0f80fab21 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 28 Nov 2011 08:20:11 +0000 Subject: [PATCH] Accepting request 93749 from home:dimstar:branches:GNOME:Factory Update to 3.3.2 - Now it even builds OBS-URL: https://build.opensuse.org/request/show/93749 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/mutter?expand=0&rev=75 --- mutter-3.2.1.tar.bz2 | 3 --- mutter-3.3.2.tar.bz2 | 3 +++ mutter-clutter-1.10.patch | 29 +++++++++++++++++++++++++++++ mutter.changes | 26 ++++++++++++++++++++++++++ mutter.spec | 26 +++++++++++++------------- 5 files changed, 71 insertions(+), 16 deletions(-) delete mode 100644 mutter-3.2.1.tar.bz2 create mode 100644 mutter-3.3.2.tar.bz2 create mode 100644 mutter-clutter-1.10.patch diff --git a/mutter-3.2.1.tar.bz2 b/mutter-3.2.1.tar.bz2 deleted file mode 100644 index 08f6657..0000000 --- a/mutter-3.2.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9fda6e11b7671e64e414b75a1f0df1ac006f102931d0dcdf938202426a9a9cb3 -size 2012023 diff --git a/mutter-3.3.2.tar.bz2 b/mutter-3.3.2.tar.bz2 new file mode 100644 index 0000000..dca9c66 --- /dev/null +++ b/mutter-3.3.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:37f66b17d6a0a479082a46fc9e2385fed5fc0342c8fd21c30c0df09be4efe2a0 +size 2010808 diff --git a/mutter-clutter-1.10.patch b/mutter-clutter-1.10.patch new file mode 100644 index 0000000..669049f --- /dev/null +++ b/mutter-clutter-1.10.patch @@ -0,0 +1,29 @@ +From de2d55412f7645ddcf918b33d45dc73aba9cdab1 Mon Sep 17 00:00:00 2001 +From: "Jasper St. Pierre" +Date: Mon, 21 Nov 2011 13:46:29 -0500 +Subject: [PATCH] Do not use the default stage + +https://bugzilla.gnome.org/show_bug.cgi?id=664028 +--- + src/compositor/compositor.c | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +diff --git a/src/compositor/compositor.c b/src/compositor/compositor.c +index a185657..468667f 100644 +--- a/src/compositor/compositor.c ++++ b/src/compositor/compositor.c +@@ -515,10 +515,11 @@ meta_compositor_manage_screen (MetaCompositor *compositor, + + meta_screen_set_cm_selection (screen); + +- info->stage = clutter_stage_get_default (); ++ info->stage = clutter_stage_new (); + + meta_screen_get_size (screen, &width, &height); + clutter_actor_set_size (info->stage, width, height); ++ clutter_actor_realize (info->stage); + + xwin = clutter_x11_get_stage_window (CLUTTER_STAGE (info->stage)); + +-- +1.7.7.3 diff --git a/mutter.changes b/mutter.changes index 1dc4888..7ad4356 100644 --- a/mutter.changes +++ b/mutter.changes @@ -1,3 +1,29 @@ +------------------------------------------------------------------- +Tue Nov 22 09:43:50 UTC 2011 - dimstar@opensuse.org + +- Update to version 3.3.2: + + Move from GConf to GSettings for preferences [bgo#635378] + + meta_display_add_keybinding()/meta_display_remove_keybinding() + added to allow creating new keybindings at runtime [bgo#663428] + + Add suport for new _NET_WM_STATE_FOCUSED atom in _NET_WM_STATE + to allow applications to draw unfocused windows differently + [bgo#661427] + + Add meta_window_move_resize_frame() to allow specifying the + size and position of a window via the outside dimensions of the + window frame. + + Don't activate window tiling when moving in snap mode + [bgo#662270] + + Remove the ability to resize a window from the inner edge of + the titlebar [bgo#660129] + + Fix for deprecations in GTK+ [bgo#662574, bgo#662895] + + Bugs fixed: bgo#662895, bgo#642652, bgo#660941, bgo#662225 + + Updated translations. +- Drop gconf-devel BuildRequires. Migration to GSettings completed. +- Add pkgconfig(gsettings-desktop-schemas) BuildRequires. New + dependency. +- Add mutter-clutter-1.10.patch: Fix build with clutter 1.10. +- Add %glib2_gsettings_schema_* macros. + ------------------------------------------------------------------- Tue Oct 18 07:41:05 UTC 2011 - dimstar@opensuse.org diff --git a/mutter.spec b/mutter.spec index f6d8c46..a4a3a53 100644 --- a/mutter.spec +++ b/mutter.spec @@ -21,31 +21,33 @@ Name: mutter BuildRequires: clutter-devel BuildRequires: fdupes -BuildRequires: gconf2-devel BuildRequires: gnome-doc-utils-devel BuildRequires: gobject-introspection-devel -BuildRequires: gtk3-devel +BuildRequires: gtk3-devel >= 3.3.3 BuildRequires: intltool BuildRequires: startup-notification-devel BuildRequires: translation-update-upstream BuildRequires: update-desktop-files BuildRequires: zenity +BuildRequires: pkgconfig(gsettings-desktop-schemas) >= 3.3.0 BuildRequires: pkgconfig(libcanberra-gtk3) %if 0%{?BUILD_FROM_VCS} BuildRequires: gnome-common %endif License: GPLv2+ Group: System/GUI/GNOME -Version: 3.2.1 +Version: 3.3.2 Release: 1 Summary: Window and compositing manager based on Clutter -Source: http://download.gnome.org/sources/mutter/3.2/%{name}-%{version}.tar.bz2 +Source: http://download.gnome.org/sources/mutter/3.3/%{name}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM mutter-clutter-1.10.patch bgo#664028 dimstar@opensuse.org -- Fix build with clutter 1.10 +Patch0: mutter-clutter-1.10.patch Url: http://www.gnome.org BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: zenity Recommends: %{name}-lang Provides: windowmanager -%gconf_schemas_prereq +%glib2_gsettings_schema_requires %description Mutter is a window and compositing manager based on Clutter, forked @@ -65,6 +67,7 @@ to develop applications that require these. %lang_package %prep %setup -q +%patch0 -p1 translation-update-upstream %if 0%{?BUILD_FROM_VCS} @@ -89,27 +92,22 @@ translation-update-upstream %suse_update_desktop_file %{name} %suse_update_desktop_file %{buildroot}%{_datadir}/gnome/wm-properties/mutter-wm.desktop %find_lang %{name} %{?no_lang_C} -%find_gconf_schemas %fdupes %{buildroot} %clean rm -rf %{buildroot} -%pre -f %{name}.schemas_pre - %post /sbin/ldconfig %desktop_database_post - -%posttrans -f %{name}.schemas_posttrans - -%preun -f %{name}.schemas_preun +%glib2_gsettings_schema_post %postun /sbin/ldconfig %desktop_database_postun +%glib2_gsettings_schema_postun -%files -f %{name}.schemas_list +%files %defattr (-, root, root) %doc AUTHORS COPYING ChangeLog NEWS rationales.txt README %{_bindir}/* @@ -123,6 +121,8 @@ rm -rf %{buildroot} %dir %{_datadir}/gnome/wm-properties %{_datadir}/gnome/wm-properties/mutter-wm.desktop %doc %{_mandir}/man*/* +%{_datadir}/GConf/gsettings/mutter-schemas.convert +%{_datadir}/glib-2.0/schemas/org.gnome.mutter.gschema.xml %files lang -f %{name}.lang