commit 92cddab35f827059d3c76b392caeb33bc61a1971
Author: Jakub Bogusz <[email protected]>
Date: Sun Sep 2 13:10:32 2018 +0200
- updated to 2.13.1
- added win32 patch (handle uuid and mkdir incompatibilities)
crossmingw32-fontconfig.spec | 8 ++++---
fontconfig-win32.patch | 55 ++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 60 insertions(+), 3 deletions(-)
---
diff --git a/crossmingw32-fontconfig.spec b/crossmingw32-fontconfig.spec
index 6f75800..7c8651f 100644
--- a/crossmingw32-fontconfig.spec
+++ b/crossmingw32-fontconfig.spec
@@ -2,13 +2,14 @@
Summary: Font configuration and customization tools - cross MinGW32
versoin
Summary(pl.UTF-8): Narzędzia do konfigurowania fontów - wersja skrośna dla
MinGW32
Name: crossmingw32-%{realname}
-Version: 2.13.0
-Release: 2
+Version: 2.13.1
+Release: 1
License: MIT
Group: Development/Libraries
Source0:
https://www.freedesktop.org/software/fontconfig/release/%{realname}-%{version}.tar.bz2
-# Source0-md5: 60d2394a79d3b2e5db2daea55193fa47
+# Source0-md5: 36cdea1058ef13cbbfdabe6cb019dc1c
Patch0: %{realname}-bitstream-cyberbit.patch
+Patch1: %{realname}-win32.patch
URL: http://fontconfig.org/
BuildRequires: autoconf >= 2.61
BuildRequires: automake >= 1:1.11
@@ -87,6 +88,7 @@ Biblioteka DLL freetype dla Windows.
%prep
%setup -q -n %{realname}-%{version}
%patch0 -p1
+%patch1 -p1
# uses POSIX-specific dirent interfaces
%{__sed} -i -e 's/test-migration//' test/Makefile.am
diff --git a/fontconfig-win32.patch b/fontconfig-win32.patch
new file mode 100644
index 0000000..49e067c
--- /dev/null
+++ b/fontconfig-win32.patch
@@ -0,0 +1,55 @@
+--- fontconfig-2.13.1/test/test-hash.c.orig 2018-07-19 05:14:39.000000000
+0200
++++ fontconfig-2.13.1/test/test-hash.c 2018-09-02 12:55:21.463538823 +0200
+@@ -47,12 +47,18 @@
+ static FcBool
+ test_add (Test *test, FcChar8 *key, FcBool replace)
+ {
++#ifdef _WIN32
++ char *uuid = "foo";
++#else
+ uuid_t uuid;
++#endif
+ void *u;
+ FcBool (*hash_add) (FcHashTable *, void *, void *);
+ FcBool ret = FcFalse;
+
++#ifndef _WIN32
+ uuid_generate_random (uuid);
++#endif
+ if (replace)
+ hash_add = FcHashTableReplace;
+ else
+@@ -61,7 +67,11 @@
+ return FcFalse;
+ if (!FcHashTableFind (test->table, key, &u))
+ return FcFalse;
++#ifdef _WIN32
++ ret = FcTrue;
++#else
+ ret = (uuid_compare (uuid, u) == 0);
++#endif
+ FcHashUuidFree (u);
+
+ return ret;
+@@ -87,7 +97,6 @@
+ main (void)
+ {
+ Test *test;
+- uuid_t uuid;
+ int ret = 0;
+
+ test = init ();
+--- fontconfig-2.13.1/test/test-bz106632.c.orig 2018-08-29
11:55:14.000000000 +0200
++++ fontconfig-2.13.1/test/test-bz106632.c 2018-09-02 12:56:54.126871068
+0200
+@@ -44,6 +44,11 @@
+ #undef FcPatternDestroy
+ #include <fontconfig/fontconfig.h>
+
++#ifdef WIN32
++#include <direct.h>
++#define mkdir(path,mode) _mkdir(path)
++#endif
++
+ #ifdef HAVE_MKDTEMP
+ #define fc_mkdtemp mkdtemp
+ #else
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/crossmingw32-fontconfig.git/commitdiff/92cddab35f827059d3c76b392caeb33bc61a1971
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
