pool/mutter
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 211797 from openSUSE:Factory:Staging:upower

Browse Source 
- 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
This commit is contained in:
Dominique Leuenberger 2013-12-23 17:54:36 +00:00 committed by Git OBS Bridge
parent c745842fbd
commit ac19817504
3 changed files with 70 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
mutter-use-new-upower-api.patch Normal file
View File

@ -0,0 +1,60 @@
From a9a10aaa2070d726c255b035f4664079373f733a Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
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
"

6
mutter.changes
View File

@ -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

5
mutter.spec
View File

@ -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 \