diff --git a/0001-Require-stable-versions-of-clutter-and-clutter-gtk.patch b/0001-Require-stable-versions-of-clutter-and-clutter-gtk.patch new file mode 100644 index 0000000..f9b1ecb --- /dev/null +++ b/0001-Require-stable-versions-of-clutter-and-clutter-gtk.patch @@ -0,0 +1,51 @@ +From 152a29c7d25ff84ab363ccb2b176b565930b1a7d Mon Sep 17 00:00:00 2001 +From: Bastien Nocera +Date: Thu, 30 Jul 2009 14:15:54 +0100 +Subject: [PATCH] Require stable versions of clutter and clutter-gtk + +The previous code made assumptions that the clutter and clutter-gtk +API versions would be the same, that's not true. +--- + configure.in | 20 ++++---------------- + 1 files changed, 4 insertions(+), 16 deletions(-) + +diff --git a/configure.in b/configure.in +index 04888be..ab87d19 100644 +--- a/configure.in ++++ b/configure.in +@@ -642,28 +642,16 @@ AM_CONDITIONAL([HAVE_RSVG],[test "$have_rsvg" = "yes"]) + # Check for Clutter + + if test "$need_clutter" = "yes"; then +- CLUTTER_API_VERSION= +- AC_MSG_CHECKING([for clutter API version]) +- for API_VERSION in 0.9; do +- PKG_CHECK_EXISTS([clutter-$API_VERSION clutter-gtk-$API_VERSION], +- [CLUTTER_API_VERSION=$API_VERSION; break],[]) +- done +- if test -z "$CLUTTER_API_VERSION"; then +- AC_MSG_ERROR([no clutter found]) +- fi +- AC_MSG_RESULT([$CLUTTER_API_VERSION]) +- AC_SUBST([CLUTTER_API_VERSION]) +- +- CLUTTER_REQUIRED=0.9.6 +- CLUTTER_GTK_REQUIRED=0.9.2 ++ CLUTTER_REQUIRED=1.0.0 ++ CLUTTER_GTK_REQUIRED=0.10.2 + + PKG_CHECK_MODULES([CLUTTER],[ +- clutter-$CLUTTER_API_VERSION >= $CLUTTER_REQUIRED]) ++ clutter-1.0 >= $CLUTTER_REQUIRED]) + AC_SUBST([CLUTTER_CFLAGS]) + AC_SUBST([CLUTTER_LIBS]) + + PKG_CHECK_MODULES([CLUTTER_GTK],[ +- clutter-gtk-$CLUTTER_API_VERSION >= $CLUTTER_GTK_REQUIRED]) ++ clutter-gtk-0.10 >= $CLUTTER_GTK_REQUIRED]) + AC_SUBST([CLUTTER_GTK_CFLAGS]) + AC_SUBST([CLUTTER_GTK_LIBS]) + fi +-- +1.6.2.5 + diff --git a/gnome-games.spec b/gnome-games.spec index 5a5ad8b..a5916a4 100644 --- a/gnome-games.spec +++ b/gnome-games.spec @@ -52,6 +52,8 @@ Source: http://download.gnome.org/sources/gnome-games/2.27/gnome-games-%{version # http://bugzilla.gnome.org/show_bug.cgi?id=551455 Patch0: ggz-api-changes.patch Patch1: gnome-games-2.19.4-gnometris-rebrand.patch +# http://git.gnome.org/cgit/gnome-games/commit/?id=152a29c7d25ff84ab363ccb2b176b565930b1a7d +Patch2: 0001-Require-stable-versions-of-clutter-and-clutter-gtk.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Obsoletes: gnome-games-devel @@ -135,6 +137,8 @@ sed -i -e 's/Gnometris/GnomeFallingBlocks/g' \ #cp -f gnometris/sounds/gameover.wav gnobots2/bad.wav #cp -f gnometris/sounds/gameover.wav gnibbles/sounds/pop.wav +%patch2 -p1 -b .clutter + %build autoconf