SHA256
1
0
forked from pool/mutter
OBS User unknown 2009-08-04 22:02:17 +00:00 committed by Git OBS Bridge
parent 453947caac
commit 6cc464fdd0
3 changed files with 50 additions and 1 deletions

41
mutter-clutter-1.0.patch Normal file
View File

@ -0,0 +1,41 @@
Index: mutter-2.27.1/configure.in
===================================================================
--- mutter-2.27.1.orig/configure.in
+++ mutter-2.27.1/configure.in
@@ -228,7 +228,7 @@ else
fi
CLUTTER_VERSION=0.9.3
-CLUTTER_PACKAGE=clutter-0.9
+CLUTTER_PACKAGE=clutter-1.0
AC_SUBST(CLUTTER_PACKAGE)
if $PKG_CONFIG --atleast-version $CLUTTER_VERSION $CLUTTER_PACKAGE ; then
MUTTER_PC_MODULES="$MUTTER_PC_MODULES $CLUTTER_PACKAGE "
Index: mutter-2.27.1/configure
===================================================================
--- mutter-2.27.1.orig/configure
+++ mutter-2.27.1/configure
@@ -18893,7 +18893,7 @@ $as_echo "$as_me: error: no. Mutter requ
fi
CLUTTER_VERSION=0.9.3
-CLUTTER_PACKAGE=clutter-0.9
+CLUTTER_PACKAGE=clutter-1.0
if $PKG_CONFIG --atleast-version $CLUTTER_VERSION $CLUTTER_PACKAGE ; then
MUTTER_PC_MODULES="$MUTTER_PC_MODULES $CLUTTER_PACKAGE "
Index: mutter-2.27.1/src/Makefile.am
===================================================================
--- mutter-2.27.1.orig/src/Makefile.am
+++ mutter-2.27.1/src/Makefile.am
@@ -210,8 +210,8 @@ Meta-$(api_version).gir: $(G_IR_SCANNER)
--include=GObject-2.0 \
--include=Gdk-2.0 \
--include=Gtk-2.0 \
- --include=Clutter-0.9 \
- --pkg=clutter-0.9 \
+ --include=Clutter-1.0 \
+ --pkg=clutter-1.0 \
--pkg=gtk+-2.0 \
--include=xfixes-4.0 \
--program=$$pwd/mutter \

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Aug 3 12:04:51 CEST 2009 - vuntz@novell.com
- Add mutter-clutter-1.0.patch to fix build with clutter 1.0.
-------------------------------------------------------------------
Tue Jul 21 21:12:15 CEST 2009 - vuntz@novell.com

View File

@ -35,11 +35,13 @@ BuildRequires: gnome-common
License: GPL v2 or later
Group: System/GUI/GNOME
Version: 2.27.1
Release: 1
Release: 2
Summary: Window and compositing manager based on Clutter
Source: %{name}-%{version}.tar.bz2
# PATCH-FIX-UPSTREAM mutter-build-fix.patch vuntz@novell.com -- Taken from git
Patch0: mutter-build-fix.patch
# PATCH-FIX-UPSTREAM mutter-clutter-1.0.patch vuntz@novell.com -- Requires clutter-1.0 instead of clutter-0.9
Patch1: mutter-clutter-1.0.patch
Url: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: zenity
@ -68,6 +70,7 @@ to develop applications that require these.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%build
NOCONFIGURE=1 gnome-autogen.sh