From ac19817504f890604962873cfa191db44a264f4125499aac7f1ab37e3ec25e7c Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 23 Dec 2013 17:54:36 +0000 Subject: [PATCH 1/3] Accepting request 211797 from openSUSE:Factory:Staging:upower - Add mutter-use-new-upower-api.patch -- Support UPower 0.99, from upstream. - Up upower-glib dependency. OBS-URL: https://build.opensuse.org/request/show/211797 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/mutter?expand=0&rev=141 --- mutter-use-new-upower-api.patch | 60 +++++++++++++++++++++++++++++++++ mutter.changes | 6 ++++ mutter.spec | 5 ++- 3 files changed, 70 insertions(+), 1 deletion(-) create mode 100644 mutter-use-new-upower-api.patch diff --git a/mutter-use-new-upower-api.patch b/mutter-use-new-upower-api.patch new file mode 100644 index 0000000..edae291 --- /dev/null +++ b/mutter-use-new-upower-api.patch @@ -0,0 +1,60 @@ +From a9a10aaa2070d726c255b035f4664079373f733a Mon Sep 17 00:00:00 2001 +From: Bastien Nocera +Date: Mon, 21 Oct 2013 13:07:36 +0200 +Subject: [PATCH] MonitorConfig: Use new UPower API + +The "changed" signal was removed. Use "notify" instead +to track just the lid-is-closed state. +--- + configure.ac | 2 +- + src/core/monitor-config.c | 12 +++++++----- + 2 files changed, 8 insertions(+), 6 deletions(-) + +diff --git a/src/core/monitor-config.c b/src/core/monitor-config.c +index 82ea0b1..62c4042 100644 +--- a/src/core/monitor-config.c ++++ b/src/core/monitor-config.c +@@ -99,8 +99,9 @@ static gboolean meta_monitor_config_assign_crtcs (MetaConfiguration *config, + GPtrArray *crtcs, + GPtrArray *outputs); + +-static void power_client_changed_cb (UpClient *client, +- gpointer user_data); ++static void power_client_changed_cb (UpClient *client, ++ GParamSpec *pspec, ++ gpointer user_data); + + static void + free_output_key (MetaOutputKey *key) +@@ -232,7 +233,7 @@ meta_monitor_config_init (MetaMonitorConfig *self) + self->up_client = up_client_new (); + self->lid_is_closed = up_client_get_lid_is_closed (self->up_client); + +- g_signal_connect_object (self->up_client, "changed", ++ g_signal_connect_object (self->up_client, "notify::lid-is-closed", + G_CALLBACK (power_client_changed_cb), self, 0); + } + +@@ -1344,8 +1345,9 @@ turn_off_laptop_display (MetaMonitorConfig *self, + } + + static void +-power_client_changed_cb (UpClient *client, +- gpointer user_data) ++power_client_changed_cb (UpClient *client, ++ GParamSpec *pspec, ++ gpointer user_data) + { + MetaMonitorManager *manager = meta_monitor_manager_get (); + MetaMonitorConfig *self = user_data; +--- mutter-3.10.2.orig/configure 2013-11-14 07:28:34.000000000 -0500 ++++ mutter-3.10.2/configure 2013-12-18 11:54:07.321058050 -0500 +@@ -14360,7 +14360,7 @@ + xcomposite >= 0.2 xfixes xrender xdamage xi >= 1.6.0 + $CLUTTER_PACKAGE >= 1.15.90 + cogl-1.0 >= 1.15.6 +- upower-glib > 0.9.11 ++ upower-glib >= 0.99.0 + gnome-desktop-3.0 + " + diff --git a/mutter.changes b/mutter.changes index ec91058..b369236 100644 --- a/mutter.changes +++ b/mutter.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Dec 10 23:15:20 UTC 2013 - mgorse@suse.com + +- Add mutter-use-new-upower-api.patch -- Support UPower 0.99, from upstream. +- Up upower-glib dependency. + ------------------------------------------------------------------- Thu Nov 14 17:31:34 UTC 2013 - dimstar@opensuse.org diff --git a/mutter.spec b/mutter.spec index 2839493..6455ce4 100644 --- a/mutter.spec +++ b/mutter.spec @@ -24,6 +24,8 @@ License: GPL-2.0+ Group: System/GUI/GNOME Url: http://www.gnome.org Source: http://download.gnome.org/sources/mutter/3.10/%{name}-%{version}.tar.xz +# PATCH-FEATURE-UPSTREAM mutter-use-new-upower-api.patch mgorse@suse.com -- Port to new uUPower API. +Patch0: mutter-use-new-upower-api.patch BuildRequires: fdupes BuildRequires: gobject-introspection-devel >= 0.9.5 BuildRequires: intltool @@ -45,7 +47,7 @@ BuildRequires: pkgconfig(gtk+-3.0) >= 3.9.11 BuildRequires: pkgconfig(libcanberra-gtk3) BuildRequires: pkgconfig(libstartup-notification-1.0) BuildRequires: pkgconfig(pango) >= 1.2.0 -BuildRequires: pkgconfig(upower-glib) > 0.9.11 +BuildRequires: pkgconfig(upower-glib) >= 0.99 BuildRequires: pkgconfig(xcomposite) >= 0.2 BuildRequires: pkgconfig(xcursor) BuildRequires: pkgconfig(xdamage) @@ -112,6 +114,7 @@ to develop applications that require these. %prep %setup -q translation-update-upstream +%patch0 -p1 %build %configure \ From 2e7780431f3246e879e0ff66ff615b534fdc6ff0756bd2d2d72821ecda27a678 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 23 Dec 2013 17:56:25 +0000 Subject: [PATCH 2/3] tweak OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/mutter?expand=0&rev=142 --- mutter.changes | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/mutter.changes b/mutter.changes index b369236..339866e 100644 --- a/mutter.changes +++ b/mutter.changes @@ -1,8 +1,7 @@ ------------------------------------------------------------------- Tue Dec 10 23:15:20 UTC 2013 - mgorse@suse.com -- Add mutter-use-new-upower-api.patch -- Support UPower 0.99, from upstream. -- Up upower-glib dependency. +- Add mutter-use-new-upower-api.patch: Support UPower 0.99. ------------------------------------------------------------------- Thu Nov 14 17:31:34 UTC 2013 - dimstar@opensuse.org From c49b8e0600802adbae68cdbb50ae0be9ef7f5ce0fdbd239b584e584ba1dd1dfc Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sat, 18 Jan 2014 14:22:29 +0000 Subject: [PATCH 3/3] Accepting request 214333 from home:Zaitor:branches:GNOME:Factory Update to ver 3.10.3 OBS-URL: https://build.opensuse.org/request/show/214333 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/mutter?expand=0&rev=143 --- mutter-3.10.2.tar.xz | 3 --- mutter-3.10.3.tar.xz | 3 +++ mutter.changes | 15 +++++++++++++++ mutter.spec | 4 ++-- 4 files changed, 20 insertions(+), 5 deletions(-) delete mode 100644 mutter-3.10.2.tar.xz create mode 100644 mutter-3.10.3.tar.xz diff --git a/mutter-3.10.2.tar.xz b/mutter-3.10.2.tar.xz deleted file mode 100644 index ded0b45..0000000 --- a/mutter-3.10.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:438163bc7fbab88366b589cab895a1df79eeac389e012c6e26ec559316651100 -size 1728700 diff --git a/mutter-3.10.3.tar.xz b/mutter-3.10.3.tar.xz new file mode 100644 index 0000000..f82dfd7 --- /dev/null +++ b/mutter-3.10.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7b19eda620d11e0638e3be33455998d65bdee3ff6556b562df937978efb8830c +size 1732780 diff --git a/mutter.changes b/mutter.changes index 339866e..e09914a 100644 --- a/mutter.changes +++ b/mutter.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Sat Jan 18 12:22:59 UTC 2014 - zaitor@opensuse.org + +- Update to version 3.10.3: + + xrandr: Use "hotplug_mode_update" property (bgo#711216). + + Don't focus the no-focus-window for globally active windows + (bgo#710296). + + Fix window group paint volume (bgo#719669). + + Fix checks for KeyPress/ButtonPress (bgo#720545). + + Fix problems with focus tracking (bgo#720558). + + Don't leave focus on windows that are being unmanaged + (bgo#711618). + + Reduce server grabs (bgo#721345, bgo#721709). + + Updated translations. + ------------------------------------------------------------------- Tue Dec 10 23:15:20 UTC 2013 - mgorse@suse.com diff --git a/mutter.spec b/mutter.spec index 6455ce4..636f990 100644 --- a/mutter.spec +++ b/mutter.spec @@ -1,7 +1,7 @@ # # spec file for package mutter # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 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 @@ -17,7 +17,7 @@ Name: mutter -Version: 3.10.2 +Version: 3.10.3 Release: 0 Summary: Window and compositing manager based on Clutter License: GPL-2.0+