From: Jakub Bogusz Date: Sun, 7 Oct 2012 11:56:16 +0000 (+0200) Subject: - updated to 1.12.4 X-Git-Tag: auto/th/crossmingw32-cairo-1.12.4-1 X-Git-Url: http://git.pld-linux.org/?p=packages%2Fcrossmingw32-cairo.git;a=commitdiff_plain;h=d8d1430be223de55d65be7b53696331097d846a3 - updated to 1.12.4 - enabled tee and xml surface backends --- diff --git a/cairo-link.patch b/cairo-link.patch index 39c36aa..8bce68a 100644 --- a/cairo-link.patch +++ b/cairo-link.patch @@ -1,11 +1,11 @@ ---- 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 @@ +--- cairo-1.12.4/configure.ac~ 2012-09-13 13:38:21.000000000 +0200 ++++ cairo-1.12.4/configure.ac 2012-10-07 07:13:25.814449494 +0200 +@@ -71,7 +71,7 @@ CAIRO_ENABLE_SURFACE_BACKEND(xlib, Xlib, if test "x$no_x" = xyes; then use_xlib="no (requires X development libraries)" else -- xlib_NONPKGCONFIG_LIBS="$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS" -+ xlib_NONPKGCONFIG_LIBS="$X_LIBS -lX11 $X_EXTRA_LIBS" +- xlib_NONPKGCONFIG_LIBS="$X_PRE_LIBS $X_LIBS -lX11 -lXext $X_EXTRA_LIBS" ++ xlib_NONPKGCONFIG_LIBS="$X_LIBS -lX11 -lXext $X_EXTRA_LIBS" xlib_NONPKGCONFIG_CFLAGS=$X_CFLAGS fi]) ]) diff --git a/crossmingw32-cairo.spec b/crossmingw32-cairo.spec index 98e2c7f..fa5a362 100644 --- a/crossmingw32-cairo.spec +++ b/crossmingw32-cairo.spec @@ -2,12 +2,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.12.2 +Version: 1.12.4 Release: 1 License: LGPL v2.1 or MPL v1.1 Group: Development/Libraries Source0: http://cairographics.org/releases/%{realname}-%{version}.tar.xz -# Source0-md5: 87649eb75789739d517c743e94879e51 +# Source0-md5: a64bb8774a1e476e5cdd69e635794dfb Patch0: cairo-link.patch Patch1: cairo-mingw32.patch URL: http://cairographics.org/ @@ -172,7 +172,9 @@ export PKG_CONFIG_LIBDIR=%{_prefix}/lib/pkgconfig --enable-pdf \ --enable-png \ --enable-ps \ - --enable-windows + --enable-tee \ + --enable-windows \ + --enable-xml %{__make} @@ -213,8 +215,10 @@ rm -rf $RPM_BUILD_ROOT %{_pkgconfigdir}/cairo-ps.pc %{_pkgconfigdir}/cairo-script.pc %{_pkgconfigdir}/cairo-svg.pc +%{_pkgconfigdir}/cairo-tee.pc %{_pkgconfigdir}/cairo-win32.pc %{_pkgconfigdir}/cairo-win32-font.pc +%{_pkgconfigdir}/cairo-xml.pc %files static %defattr(644,root,root,755)