- updated to 1.8.10

Changed files:
    cairo-link.patch -> 1.6
    crossmingw32-cairo.spec -> 1.20

diff --git a/cairo-link.patch b/cairo-link.patch
index b1bb20dbfb60d7a2ea8630e56fef53c5c40fa9be..e9353575734f0ae8423b5f559462dbaabadd9852 100644 (file)
--- a/cairo-link.patch
+++ b/cairo-link.patch
@@ -1,6 +1,6 @@
---- cairo-1.2.2/configure.ac.orig      2006-08-08 23:05:54.000000000 +0000
-+++ cairo-1.2.2/configure.ac   2006-08-09 07:42:54.315971000 +0000
-@@ -227,7 +227,7 @@
+--- cairo-1.8.10/configure.ac.orig     2010-02-19 19:38:03.000000000 +0100
++++ cairo-1.8.10/configure.ac  2010-02-23 08:25:04.000000000 +0100
+@@ -43,7 +43,7 @@
                     if test "x$no_x" = xyes; then
                       use_xlib="no (requires X development libraries)"
                     else
@@ -9,3 +9,12 @@
                       xlib_NONPKGCONFIG_CFLAGS=$X_CFLAGS
                     fi])
  ])
+@@ -161,7 +161,7 @@
+   AC_ARG_VAR([png_REQUIRES], [module name for libpng to search for using pkg-config])
+   if test "x$png_REQUIRES" = x; then
+     # libpng13 is GnuWin32's libpng-1.2.8 :-(
+-    for l in libpng12 libpng13 libpng10 libpng; do
++    for l in libpng libpng14 libpng12 libpng13 libpng10 ; do
+       if $PKG_CONFIG --exists $l ; then
+         png_REQUIRES=$l
+         use_png=yes

diff --git a/crossmingw32-cairo.spec b/crossmingw32-cairo.spec
index 6bba519eb533e279230f5cad326db1e9482e2293..a4c9a318ea48b4ce43f0ae7b9743c454bfa9ee45 100644 (file)
--- a/crossmingw32-cairo.spec
+++ b/crossmingw32-cairo.spec
@@ -6,12 +6,12 @@ Summary:      Cairo - multi-platform 2D graphics library - cross Mingw32 version
 Summary(pl.UTF-8):     Cairo - wieloplatformowa biblioteka graficzna 2D - skrośna wersja Mingw32
 %define                realname   cairo
 Name:          crossmingw32-%{realname}
-Version:       1.8.6
+Version:       1.8.10
 Release:       1
 License:       LGPL v2.1 or MPL v1.1
 Group:         Development/Libraries
 Source0:       http://cairographics.org/releases/%{realname}-%{version}.tar.gz
-# Source0-md5: 4e64139ef6f668df24450f3b81dd0771
+# Source0-md5: b60a82f405f9400bbfdcf850b1728d25
 Patch0:                cairo-link.patch
 URL:           http://cairographics.org/
 BuildRequires: autoconf >= 2.58