[mingw-cairo: 14/29] Update to 1.10.0

[epienbro]

commit 217b0c7e691a7954bd67c4f4209ea9bf63c716c9
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Fri Sep 24 16:08:50 2010 +0200

    Update to 1.10.0
    
    - Update to 1.10.0
    - Added the GObject library
    - Fixed a small rpmlint warning

 .gitignore                              |    1 +
 mingw32-cairo-fix-ffs-declaration.patch |   13 +++++++++++++
 mingw32-cairo.spec                      |   29 ++++++++++++++++++++++++-----
 sources                                 |    2 +-
 4 files changed, 39 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b71b01f..e82e063 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 cairo-1.8.10.tar.gz
+/cairo-1.10.0.tar.gz
diff --git a/mingw32-cairo-fix-ffs-declaration.patch b/mingw32-cairo-fix-ffs-declaration.patch
new file mode 100644
index 0000000..00f6507
--- /dev/null
+++ b/mingw32-cairo-fix-ffs-declaration.patch
@@ -0,0 +1,13 @@
+--- src/cairo.c.orig	2010-09-24 16:01:58.899988587 +0200
++++ src/cairo.c	2010-09-24 16:02:13.313170255 +0200
+@@ -149,6 +149,10 @@
+ };
+ #include <assert.h>
+ 
++#ifdef __MINGW32__
++#define ffs __builtin_ffs
++#endif
++
+ /**
+  * _cairo_error:
+  * @status: a status value indicating an error, (eg. not
diff --git a/mingw32-cairo.spec b/mingw32-cairo.spec
index ffc7170..7ae4197 100644
--- a/mingw32-cairo.spec
+++ b/mingw32-cairo.spec
@@ -6,8 +6,8 @@
 %define __debug_install_post %{_mingw32_debug_install_post}
 
 Name:           mingw32-cairo
-Version:        1.8.10
-Release:        2%{?dist}
+Version:        1.10.0
+Release:        1%{?dist}
 Summary:        MinGW Windows Cairo library
 
 License:        LGPLv2 or MPLv1.1
@@ -16,6 +16,10 @@ Source0:        http://cairographics.org/releases/cairo-%{version}.tar.gz
 Group:          Development/Libraries
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# The file cairo.c refers to a function called ffs(), but it
+# isn't declared in any of the mingw headers. work around this
+Patch0:         mingw32-cairo-fix-ffs-declaration.patch
+
 BuildArch:      noarch
 
 BuildRequires:  mingw32-filesystem >= 52
@@ -50,11 +54,12 @@ Group:          Development/Libraries
 Static version of the MinGW Windows Cairo library.
 
 
-%{_mingw32_debug_package}
+%{?_mingw32_debug_package}
 
 
 %prep
 %setup -q -n cairo-%{version}
+%patch0 -p0
 
 
 %build
@@ -65,7 +70,8 @@ Static version of the MinGW Windows Cairo library.
   --enable-png \
   --enable-static \
   --disable-pthread \
-  --disable-ft
+  --disable-ft \
+  --enable-gobject
 make %{?_smp_mflags}
 
 
@@ -85,9 +91,16 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc COPYING COPYING-LGPL-2.1 COPYING-MPL-1.1
 %{_mingw32_bindir}/libcairo-2.dll
+%{_mingw32_bindir}/libcairo-gobject-2.dll
+%{_mingw32_bindir}/libcairo-script-interpreter-2.dll
 %{_mingw32_includedir}/cairo/
 %{_mingw32_libdir}/libcairo.dll.a
 %{_mingw32_libdir}/libcairo.la
+%{_mingw32_libdir}/libcairo-gobject.dll.a
+%{_mingw32_libdir}/libcairo-gobject.la
+%{_mingw32_libdir}/libcairo-script-interpreter.dll.a
+%{_mingw32_libdir}/libcairo-script-interpreter.la
+%{_mingw32_libdir}/pkgconfig/cairo-gobject.pc
 %{_mingw32_libdir}/pkgconfig/cairo-pdf.pc
 %{_mingw32_libdir}/pkgconfig/cairo-png.pc
 %{_mingw32_libdir}/pkgconfig/cairo-ps.pc
@@ -96,13 +109,19 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw32_libdir}/pkgconfig/cairo-win32.pc
 %{_mingw32_libdir}/pkgconfig/cairo.pc
 
-
 %files static
 %defattr(-,root,root,-)
 %{_mingw32_libdir}/libcairo.a
+%{_mingw32_libdir}/libcairo-gobject.a
+%{_mingw32_libdir}/libcairo-script-interpreter.a
 
 
 %changelog
+* Fri Sep 24 2010 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.10.0-1
+- Update to 1.10.0
+- Added the GObject library
+- Fixed a small rpmlint warning
+
 * Sun Jul  4 2010 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.8.10-2
 - Rebuild for libpng 1.4
 
diff --git a/sources b/sources
index 232b71e..085a6b2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b60a82f405f9400bbfdcf850b1728d25  cairo-1.8.10.tar.gz
+70a2ece66cf473d976e2db0f75bf199e  cairo-1.10.0.tar.gz