[packages/crossmingw32-cairo] - one more mingw32 specific change; release 2

qboosh qboosh at pld-linux.org
Thu Sep 27 21:42:11 CEST 2018


commit 8eea0d41efb4e1111a60d533f4f4c9d975b950f4
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Thu Sep 27 21:45:25 2018 +0200

    - one more mingw32 specific change; release 2

 cairo-mingw32.patch     | 11 +++++++++++
 crossmingw32-cairo.spec |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)
---
diff --git a/crossmingw32-cairo.spec b/crossmingw32-cairo.spec
index 8d7dc8c..0728e83 100644
--- a/crossmingw32-cairo.spec
+++ b/crossmingw32-cairo.spec
@@ -3,7 +3,7 @@ Summary(pl.UTF-8):	Cairo - wieloplatformowa biblioteka graficzna 2D - skrośna w
 %define		realname   cairo
 Name:		crossmingw32-%{realname}
 Version:	1.14.12
-Release:	1
+Release:	2
 License:	LGPL v2.1 or MPL v1.1
 Group:		Development/Libraries
 Source0:	https://www.cairographics.org/releases/%{realname}-%{version}.tar.xz
diff --git a/cairo-mingw32.patch b/cairo-mingw32.patch
index d7cab86..f38cd09 100644
--- a/cairo-mingw32.patch
+++ b/cairo-mingw32.patch
@@ -19,3 +19,14 @@
  #include <cairo-win32.h>
  
  static const cairo_user_data_key_t win32_closure_key;
+--- cairo-1.14.12/src/cairo-compiler-private.h.orig	2017-12-04 23:24:46.000000000 +0100
++++ cairo-1.14.12/src/cairo-compiler-private.h	2018-09-27 21:39:54.869047194 +0200
+@@ -195,7 +195,7 @@
+ #define __attribute__(x)
+ #endif
+ 
+-#if (defined(__WIN32__) && !defined(__WINE__)) || defined(_MSC_VER)
++#if (defined(__WIN32__) && !defined(__WINE__) && !defined(__MINGW32__)) || defined(_MSC_VER)
+ #define access _access
+ #define fdopen _fdopen
+ #define hypot _hypot
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/crossmingw32-cairo.git/commitdiff/8eea0d41efb4e1111a60d533f4f4c9d975b950f4



More information about the pld-cvs-commit mailing list