[pyclutter] pyclutter-1.3.2-clutter-1.9.2-compat.patch: Fix FTBFS against new clutter
Adam Jackson
ajax at fedoraproject.org
Mon Nov 28 19:11:13 UTC 2011
commit 8d5339b2965a8009ab3f596992360dd0c5dffe0e
Author: Adam Jackson <ajax at redhat.com>
Date: Mon Nov 28 19:10:14 2011 -0500
pyclutter-1.3.2-clutter-1.9.2-compat.patch: Fix FTBFS against new clutter
pyclutter-1.3.2-clutter-1.9.2-compat.patch | 26 ++++++++++++++++++++++++++
pyclutter.spec | 7 ++++++-
2 files changed, 32 insertions(+), 1 deletions(-)
---
diff --git a/pyclutter-1.3.2-clutter-1.9.2-compat.patch b/pyclutter-1.3.2-clutter-1.9.2-compat.patch
new file mode 100644
index 0000000..481e021
--- /dev/null
+++ b/pyclutter-1.3.2-clutter-1.9.2-compat.patch
@@ -0,0 +1,26 @@
+This is merely what's required to get it to build, and caribou (the one
+thing in Fedora that requires pyclutter) doesn't use this type, so it
+should be safe. But please do drop this patch once pyclutter upstream
+catches up with new clutter. - ajax 2011-11-28
+
+diff -up pyclutter-1.3.2/clutter/clutter-base-types.defs.jx pyclutter-1.3.2/clutter/clutter-base-types.defs
+--- pyclutter-1.3.2/clutter/clutter-base-types.defs.jx 2010-10-24 19:00:14.000000000 -0400
++++ pyclutter-1.3.2/clutter/clutter-base-types.defs 2011-11-28 19:08:19.038001440 -0500
+@@ -357,17 +357,6 @@
+ )
+ )
+
+-(define-enum ShaderError
+- (in-module "Clutter")
+- (c-name "ClutterShaderError")
+- (gtype-id "CLUTTER_TYPE_SHADER_ERROR")
+- (values
+- '("no-asm" "CLUTTER_SHADER_ERROR_NO_ASM")
+- '("no-glsl" "CLUTTER_SHADER_ERROR_NO_GLSL")
+- '("compile" "CLUTTER_SHADER_ERROR_COMPILE")
+- )
+-)
+-
+ (define-enum ScriptError
+ (in-module "Clutter")
+ (c-name "ClutterScriptError")
diff --git a/pyclutter.spec b/pyclutter.spec
index 77d3fe9..8ad4ecb 100644
--- a/pyclutter.spec
+++ b/pyclutter.spec
@@ -3,13 +3,14 @@
Name: pyclutter
Version: 1.3.2
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Python modules that allow you to use the Clutter toolkit
Group: Development/Languages
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
BuildRequires: pygtk2-devel
BuildRequires: gtk2-devel
@@ -31,6 +32,7 @@ Pyclutter
%prep
%setup -q
+%patch0 -p1 -b .compat
%build
%configure --enable-docs
@@ -55,6 +57,9 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
%{_libdir}/pkgconfig/pyclutter-1.0.pc
%changelog
+* Mon Nov 28 2011 Adam Jackson <ajax at redhat.com> 1.3.2-5
+- pyclutter-1.3.2-clutter-1.9.2-compat.patch: Fix FTBFS against new clutter
+
* Thu Nov 24 2011 Matthias Clasen <mclasen at redhat.com> 1.3.2-4
- Rebuild against new clutter
More information about the scm-commits
mailing list