From bccdf7b1d57b1ccf33cbf5f165f7731174b18c8c3a858698029020f0f80fab21 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 28 Nov 2011 08:20:11 +0000 Subject: [PATCH 1/4] 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 From 3ad6fe9b58b96c837e6dbcd086b0a7f31a7f858acf13ece45c0af38e25736fee Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 12 Dec 2011 11:48:43 +0000 Subject: [PATCH 2/4] Accepting request 96337 from home:vuntz:branches:GNOME:Factory Drop clutter 1.10 patch OBS-URL: https://build.opensuse.org/request/show/96337 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/mutter?expand=0&rev=76 --- mutter-clutter-1.10.patch | 29 ----------------------------- mutter.changes | 8 ++++++++ mutter.spec | 6 ++---- 3 files changed, 10 insertions(+), 33 deletions(-) delete mode 100644 mutter-clutter-1.10.patch diff --git a/mutter-clutter-1.10.patch b/mutter-clutter-1.10.patch deleted file mode 100644 index 669049f..0000000 --- a/mutter-clutter-1.10.patch +++ /dev/null @@ -1,29 +0,0 @@ -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 7ad4356..64c6a3a 100644 --- a/mutter.changes +++ b/mutter.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Dec 12 10:40:37 UTC 2011 - vuntz@opensuse.org + +- Drop mutter-clutter-1.10.patch: this actually breaks mutter as we + need a clutter patch too, which is not ready yet. +- Pass --enable-compile-warnings=maximum to configure: the default + is error, and we don't want to have -Werror in our CFLAGS. + ------------------------------------------------------------------- Tue Nov 22 09:43:50 UTC 2011 - dimstar@opensuse.org diff --git a/mutter.spec b/mutter.spec index a4a3a53..6ee8e9b 100644 --- a/mutter.spec +++ b/mutter.spec @@ -40,8 +40,6 @@ Version: 3.3.2 Release: 1 Summary: Window and compositing manager based on Clutter 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 @@ -67,7 +65,6 @@ to develop applications that require these. %lang_package %prep %setup -q -%patch0 -p1 translation-update-upstream %if 0%{?BUILD_FROM_VCS} @@ -78,7 +75,8 @@ translation-update-upstream %configure \ --libexecdir=%{_libexecdir}/%{name} \ --disable-static \ - --disable-schemas-install + --disable-schemas-install \ + --enable-compile-warnings=maximum %__make %{?jobs:-j%jobs} V=1 %install From 77c5a097db94ea5d2603056ac89cb44b36adfa3338a3737c024e0adfefc39fed Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Wed, 21 Dec 2011 14:56:40 +0000 Subject: [PATCH 3/4] Accepting request 97648 from home:vuntz:branches:GNOME:Factory Cleanup OBS-URL: https://build.opensuse.org/request/show/97648 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/mutter?expand=0&rev=77 --- mutter.changes | 9 +++++---- mutter.spec | 10 +++------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/mutter.changes b/mutter.changes index 64c6a3a..41f26f7 100644 --- a/mutter.changes +++ b/mutter.changes @@ -26,11 +26,12 @@ Tue Nov 22 09:43:50 UTC 2011 - dimstar@opensuse.org + 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. +- Add pkgconfig(gsettings-desktop-schemas) BuildRequires: new + dependency. +- Drop gconf-devel BuildRequires: migration to GSettings completed. +- Replace gconf schema packaging machinery with + %glib2_gsettings_schema_* macros. ------------------------------------------------------------------- Tue Oct 18 07:41:05 UTC 2011 - dimstar@opensuse.org diff --git a/mutter.spec b/mutter.spec index 6ee8e9b..e69b05f 100644 --- a/mutter.spec +++ b/mutter.spec @@ -15,9 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - - Name: mutter BuildRequires: clutter-devel BuildRequires: fdupes @@ -34,11 +31,11 @@ BuildRequires: pkgconfig(libcanberra-gtk3) %if 0%{?BUILD_FROM_VCS} BuildRequires: gnome-common %endif -License: GPLv2+ -Group: System/GUI/GNOME Version: 3.3.2 -Release: 1 +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.bz2 Url: http://www.gnome.org BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -52,7 +49,6 @@ Mutter is a window and compositing manager based on Clutter, forked from Metacity. %package devel -License: GPLv2+ Summary: Include Files and Libraries mandatory for Development Group: Development/Libraries/GNOME Requires: %{name} = %{version} From f932edebd7cec9ef6a9ef237e3d658fbb7a62d6845b7a2b7d05f2482a1b21ca9 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Thu, 5 Jan 2012 09:32:28 +0000 Subject: [PATCH 4/4] Accepting request 98830 from home:vuntz:branches:GNOME:Factory Update to 3.3.3 OBS-URL: https://build.opensuse.org/request/show/98830 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/mutter?expand=0&rev=78 --- mutter-3.3.2.tar.bz2 | 3 --- mutter-3.3.3.tar.xz | 3 +++ mutter.changes | 20 ++++++++++++++++++++ mutter.spec | 13 ++++++++++--- 4 files changed, 33 insertions(+), 6 deletions(-) delete mode 100644 mutter-3.3.2.tar.bz2 create mode 100644 mutter-3.3.3.tar.xz diff --git a/mutter-3.3.2.tar.bz2 b/mutter-3.3.2.tar.bz2 deleted file mode 100644 index dca9c66..0000000 --- a/mutter-3.3.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:37f66b17d6a0a479082a46fc9e2385fed5fc0342c8fd21c30c0df09be4efe2a0 -size 2010808 diff --git a/mutter-3.3.3.tar.xz b/mutter-3.3.3.tar.xz new file mode 100644 index 0000000..db1c9d7 --- /dev/null +++ b/mutter-3.3.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:58079853f8bfa9aa4b7d3deae2c137960b30eafd0009ef83d4d93310009be81c +size 1644884 diff --git a/mutter.changes b/mutter.changes index 41f26f7..c2c0e0f 100644 --- a/mutter.changes +++ b/mutter.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Thu Jan 5 07:34:46 UTC 2012 - vuntz@opensuse.org + +- Update to version 3.3.3: + + Add keybindings for tiling to left or right [bgo#648700] + + Support GTK+'s hide-titlebar-when-maximized hint [bgo#665617] + + Load _DBUS_APPLICATION_ID, _DBUS_UNIQUE_NAME, _DBUS_OBJECT_PATH + property [bgo#664851] + + Handle changes to workspaces-only-on-primary GSetting + [bgo#664853] + + Don't use the Clutter default stage [bgo#664028] + + Fix compilation with --disable-introspection [bgo#661871] + + Fix problem where stage could end up mis-sized on startup with + multiple monitors + + Misc bug fixes [bgo#666015] + + Updated translations. +- Add xz BuildRequires because we can't build a package for a + xz-compressed tarball without explicitly specifying that... See + bnc#697467 for more details. + ------------------------------------------------------------------- Mon Dec 12 10:40:37 UTC 2011 - vuntz@opensuse.org diff --git a/mutter.spec b/mutter.spec index e69b05f..1f0a0c6 100644 --- a/mutter.spec +++ b/mutter.spec @@ -1,7 +1,7 @@ # # spec file for package mutter # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: mutter BuildRequires: clutter-devel BuildRequires: fdupes @@ -25,18 +26,20 @@ BuildRequires: intltool BuildRequires: startup-notification-devel BuildRequires: translation-update-upstream BuildRequires: update-desktop-files +# Only needed because we don't (and won't) support building xz tarballs by default... See bnc#697467 +BuildRequires: xz BuildRequires: zenity BuildRequires: pkgconfig(gsettings-desktop-schemas) >= 3.3.0 BuildRequires: pkgconfig(libcanberra-gtk3) %if 0%{?BUILD_FROM_VCS} BuildRequires: gnome-common %endif -Version: 3.3.2 +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.bz2 +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 @@ -114,6 +117,10 @@ rm -rf %{buildroot} %dir %{_datadir}/gnome %dir %{_datadir}/gnome/wm-properties %{_datadir}/gnome/wm-properties/mutter-wm.desktop +# Do not depend on g-c-c just for a directory +%dir %{_datadir}/gnome-control-center +%dir %{_datadir}/gnome-control-center/keybindings +%{_datadir}/gnome-control-center/keybindings/50-mutter-windows.xml %doc %{_mandir}/man*/* %{_datadir}/GConf/gsettings/mutter-schemas.convert %{_datadir}/glib-2.0/schemas/org.gnome.mutter.gschema.xml