From 509e97884f0c69679f911461c724d0a80855c137 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Thu, 11 Feb 2010 14:30:02 +0000 Subject: [PATCH] - Add patch to fix 64bit build --- clutter-fix64.patch | 29 +++++++++++++++++++++++++++++ clutter.spec | 8 ++++++-- 2 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 clutter-fix64.patch diff --git a/clutter-fix64.patch b/clutter-fix64.patch new file mode 100644 index 0000000..175f1e6 --- /dev/null +++ b/clutter-fix64.patch @@ -0,0 +1,29 @@ +From ecc5ffe91ace38c9d288251807e721a4cd71b052 Mon Sep 17 00:00:00 2001 +From: Bastian Winkler +Date: Tue, 09 Feb 2010 14:19:03 +0000 +Subject: cogl-buffer: Use correct argument types in cogl_buffer_set_data_EXP + +offset and size arguments are gsize in cogl-buffer.h + +http://bugzilla.openedhand.com/show_bug.cgi?id=1980 + +Signed-off-by: Emmanuele Bassi +--- +diff --git a/clutter/cogl/cogl/cogl-buffer.c b/clutter/cogl/cogl/cogl-buffer.c +index 89e0a05..a74879d 100644 +--- a/clutter/cogl/cogl/cogl-buffer.c ++++ b/clutter/cogl/cogl/cogl-buffer.c +@@ -272,9 +272,9 @@ cogl_buffer_unmap_EXP (CoglHandle handle) + + gboolean + cogl_buffer_set_data_EXP (CoglHandle handle, +- guint offset, ++ gsize offset, + const guchar *data, +- guint size) ++ gsize size) + { + CoglBuffer *buffer; + +-- +cgit v0.7.2-85-gd188 diff --git a/clutter.spec b/clutter.spec index 385c2ce..0d00fe9 100644 --- a/clutter.spec +++ b/clutter.spec @@ -1,12 +1,13 @@ Name: clutter Version: 1.1.10 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Open Source software library for creating rich graphical user interfaces Group: Development/Libraries License: LGPLv2+ URL: http://www.clutter-project.org/ Source0: http://www.clutter-project.org/sources/%{name}/1.0/%{name}-%{version}.tar.bz2 +Patch0: clutter-fix64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: gobject-introspection @@ -55,9 +56,9 @@ We hope however it can be used for a lot more. This package contains documentation for clutter. - %prep %setup -q +%patch0 -p1 -b .fix64 %build %configure --enable-gtk-doc --enable-introspection --enable-xinput @@ -98,6 +99,9 @@ rm -rf %{buildroot} %{_datadir}/gtk-doc/html/cogl %changelog +* Wed Feb 11 2010 Peter Robinson 1.1.10-2 +- Add patch to fix 64bit build + * Wed Feb 11 2010 Peter Robinson 1.1.10-1 - Update to 1.1.10