[packages/crossmingw32-cairo] - updated to 1.14.0 - added exeext-specific fix to mingw32 patch

qboosh qboosh at pld-linux.org
Wed Oct 15 20:02:47 CEST 2014


commit 2414ec55d619d0fa3f0a930e72ef095faf0af31d
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Wed Oct 15 20:03:19 2014 +0200

    - updated to 1.14.0
    - added exeext-specific fix to mingw32 patch

 cairo-mingw32.patch     | 15 +++++++++++++++
 crossmingw32-cairo.spec | 20 ++++++++++----------
 2 files changed, 25 insertions(+), 10 deletions(-)
---
diff --git a/crossmingw32-cairo.spec b/crossmingw32-cairo.spec
index 24dceb1..bf396be 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.16
-Release:	2
+Version:	1.14.0
+Release:	1
 License:	LGPL v2.1 or MPL v1.1
 Group:		Development/Libraries
 Source0:	http://cairographics.org/releases/%{realname}-%{version}.tar.xz
-# Source0-md5:	a1304edcdc99282f478b995ee5f8f854
+# Source0-md5:	fc3a5edeba703f906f2241b394f0cced
 Patch0:		cairo-link.patch
 Patch1:		cairo-mingw32.patch
 URL:		http://cairographics.org/
@@ -15,16 +15,16 @@ BuildRequires:	autoconf >= 2.63
 BuildRequires:	automake >= 1:1.11
 BuildRequires:	crossmingw32-fontconfig >= 2.2.95
 BuildRequires:	crossmingw32-freetype >= 2.3.0
-BuildRequires:	crossmingw32-glib2 >= 2.0
+BuildRequires:	crossmingw32-glib2 >= 2.14
 BuildRequires:	crossmingw32-libpng
-BuildRequires:	crossmingw32-pixman >= 0.22.0
+BuildRequires:	crossmingw32-pixman >= 0.30.0
 BuildRequires:	crossmingw32-zlib
 BuildRequires:	libtool >= 2:2.2
-BuildRequires:	pkgconfig >= 1:0.15
+BuildRequires:	pkgconfig >= 1:0.18
 Requires:	crossmingw32-fontconfig >= 2.2.95
 Requires:	crossmingw32-freetype >= 2.3.0
 Requires:	crossmingw32-libpng
-Requires:	crossmingw32-pixman >= 0.22.0
+Requires:	crossmingw32-pixman >= 0.30.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		no_install_post_strip	1
@@ -103,7 +103,7 @@ Group:		Applications/Emulators
 Requires:	crossmingw32-fontconfig-dll >= 2.2.95
 Requires:	crossmingw32-freetype-dll >= 2.3.0
 Requires:	crossmingw32-libpng-dll
-Requires:	crossmingw32-pixman-dll >= 0.22.0
+Requires:	crossmingw32-pixman-dll >= 0.30.0
 
 %description dll
 DLL Cairo library for Windows.
@@ -116,7 +116,7 @@ Summary:	Cairo GObject functions library - cross MinGW32 version
 Summary(pl.UTF-8):	Biblioteka funkcji Cairo GObject - wersja skrośna MinGW32 
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	crossmingw32-glib2 >= 2.0
+Requires:	crossmingw32-glib2 >= 2.14
 
 %description gobject
 Cairo GObject functions library - cross MinGW32 version.
@@ -141,7 +141,7 @@ Summary:	DLL Cairo GObject library for Windows
 Summary(pl.UTF-8):	Biblioteka DLL Cairo GObject dla Windows
 Group:		Applications/Emulators
 Requires:	%{name}-dll = %{version}-%{release}
-Requires:	crossmingw32-glib2-dll >= 2.0
+Requires:	crossmingw32-glib2-dll >= 2.14
 
 %description gobject-dll
 DLL Cairo GObject library for Windows.
diff --git a/cairo-mingw32.patch b/cairo-mingw32.patch
index 9043b3e..e280465 100644
--- a/cairo-mingw32.patch
+++ b/cairo-mingw32.patch
@@ -9,3 +9,18 @@
  #define WIN32_LEAN_AND_MEAN
  #include <windows.h>
  
+--- cairo-1.14.0/build/aclocal.float.m4.orig	2014-10-14 03:46:33.000000000 +0200
++++ cairo-1.14.0/build/aclocal.float.m4	2014-10-15 18:52:32.272398963 +0200
+@@ -31,10 +31,10 @@
+ 
+ ]])], [
+ 
+-if strings - conftest | grep noonsees >/dev/null ; then
++if strings - conftest$ac_exeext | grep noonsees >/dev/null ; then
+   ax_cv_c_float_words_bigendian=yes
+ fi
+-if strings - conftest | grep seesnoon >/dev/null ; then
++if strings - conftest$ac_exeext | grep seesnoon >/dev/null ; then
+   if test "$ax_cv_c_float_words_bigendian" = unknown; then
+     ax_cv_c_float_words_bigendian=no
+   else
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/crossmingw32-cairo.git/commitdiff/2414ec55d619d0fa3f0a930e72ef095faf0af31d



More information about the pld-cvs-commit mailing list