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

Accepting request 96337 from home:vuntz:branches:GNOME:Factory

Browse Source 
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
This commit is contained in:
Dominique Leuenberger 2011-12-12 11:48:43 +00:00 committed by Git OBS Bridge
parent bccdf7b1d5
commit 3ad6fe9b58
3 changed files with 10 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
mutter-clutter-1.10.patch
View File

@ -1,29 +0,0 @@
From de2d55412f7645ddcf918b33d45dc73aba9cdab1 Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
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

8
mutter.changes
View File

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

6
mutter.spec
View File

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