[pyclutter/f17] Patch to fix build with clutter 1.9.14
Kalev Lember
kalev at fedoraproject.org
Thu Mar 15 18:49:29 UTC 2012
commit 9ee1c5cfbc9354d92a26fcbc5883515d8ebefb57
Author: Kalev Lember <kalevlember at gmail.com>
Date: Thu Mar 15 20:40:40 2012 +0200
Patch to fix build with clutter 1.9.14
pyclutter-1.3.2-clutter-1.9.14-compat.patch | 31 +++++++++++++++++++++++++++
pyclutter.spec | 7 +++++-
2 files changed, 37 insertions(+), 1 deletions(-)
---
diff --git a/pyclutter-1.3.2-clutter-1.9.14-compat.patch b/pyclutter-1.3.2-clutter-1.9.14-compat.patch
new file mode 100644
index 0000000..5be609a
--- /dev/null
+++ b/pyclutter-1.3.2-clutter-1.9.14-compat.patch
@@ -0,0 +1,31 @@
+Fix clutter to build against recent clutter in F17. We don't have any pyclutter
+users left in Fedora, so there's not much risk of breaking any client apps.
+Furthermore, the relevant clutter git commit message also says that nothing
+should be using ClutterStageWindow:
+
+ commit b248fbd010d428ec103f2b5cde906403d1eac3f0
+ Author: Emmanuele Bassi <ebassi at gnome.org>
+ Date: Thu Mar 1 11:06:04 2012 +0000
+
+ Make clutter-stage-window.h a private header
+
+ It should have never been public in the first place; nothing can
+ implement the ClutterStageWindow interface and use it, so this is
+ not a break.
+
+--- pyclutter-1.3.2/clutter/clutter-base-types.defs.compat 2010-10-25 02:00:14.000000000 +0300
++++ pyclutter-1.3.2/clutter/clutter-base-types.defs 2012-03-15 20:17:28.606222439 +0200
+@@ -29,13 +29,6 @@
+ (vtable "ClutterAnimatableIface")
+ )
+
+-(define-interface StageWindow
+- (in-module "Clutter")
+- (c-name "ClutterStageWindow")
+- (gtype-id "CLUTTER_TYPE_STAGE_WINDOW")
+- (vtable "ClutterStageWindowIface")
+-)
+-
+ ; boxed types...
+
+ (define-boxed Color
diff --git a/pyclutter.spec b/pyclutter.spec
index 8aacef4..b510884 100644
--- a/pyclutter.spec
+++ b/pyclutter.spec
@@ -3,7 +3,7 @@
Name: pyclutter
Version: 1.3.2
-Release: 9%{?dist}
+Release: 10%{?dist}
Summary: Python modules that allow you to use the Clutter toolkit
Group: Development/Languages
@@ -11,6 +11,7 @@ License: LGPLv2+
URL: http://www.clutter-project.org/
Source0: http://www.clutter-project.org/sources/%{name}/1.3/%{name}-%{version}.tar.bz2
Patch0: pyclutter-1.3.2-clutter-1.9.2-compat.patch
+Patch1: pyclutter-1.3.2-clutter-1.9.14-compat.patch
BuildRequires: pygtk2-devel
BuildRequires: gtk2-devel
@@ -33,6 +34,7 @@ Pyclutter
%prep
%setup -q
%patch0 -p1 -b .compat
+%patch1 -p1 -b .compat_1.9.14
%build
%configure --enable-docs CFLAGS=-DCLUTTER_DISABLE_DEPRECATION_WARNINGS
@@ -57,6 +59,9 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
%{_libdir}/pkgconfig/pyclutter-1.0.pc
%changelog
+* Thu Mar 15 2012 Kalev Lember <kalevlember at gmail.com> - 1.3.2-10
+- Patch to fix build with clutter 1.9.14
+
* Sat Mar 10 2012 Matthias Clasen <mclasen at redhat.com> - 1.3.2-9
- Rebuild against new cogl
More information about the scm-commits
mailing list