[packages/crossmingw32-fontconfig] - updated to 2.14.0 - removed obsolete win32 patch

qboosh qboosh at pld-linux.org
Thu Apr 7 20:58:14 CEST 2022


commit 42dd7eaa0d164925698f5c07a3df9b07eef89d7c
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Thu Apr 7 20:58:00 2022 +0200

    - updated to 2.14.0
    - removed obsolete win32 patch

 crossmingw32-fontconfig.spec        | 13 +++------
 fontconfig-bitstream-cyberbit.patch |  2 +-
 fontconfig-win32.patch              | 55 -------------------------------------
 3 files changed, 5 insertions(+), 65 deletions(-)
---
diff --git a/crossmingw32-fontconfig.spec b/crossmingw32-fontconfig.spec
index 1fccb42..3b9b6b4 100644
--- a/crossmingw32-fontconfig.spec
+++ b/crossmingw32-fontconfig.spec
@@ -2,14 +2,13 @@
 Summary:	Font configuration and customization tools - cross MinGW32 version
 Summary(pl.UTF-8):	Narzędzia do konfigurowania fontów - wersja skrośna dla MinGW32
 Name:		crossmingw32-%{realname}
-Version:	2.13.1
-Release:	2
+Version:	2.14.0
+Release:	1
 License:	MIT
 Group:		Development/Libraries
-Source0:	https://www.freedesktop.org/software/fontconfig/release/%{realname}-%{version}.tar.bz2
-# Source0-md5:	36cdea1058ef13cbbfdabe6cb019dc1c
+Source0:	https://www.freedesktop.org/software/fontconfig/release/%{realname}-%{version}.tar.xz
+# Source0-md5:	e12700a9d522bdfec06b6b7e72646987
 Patch0:		%{realname}-bitstream-cyberbit.patch
-Patch1:		%{realname}-win32.patch
 URL:		http://fontconfig.org/
 BuildRequires:	autoconf >= 2.61
 BuildRequires:	automake >= 1:1.11
@@ -88,10 +87,6 @@ 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
 
 %build
 export PKG_CONFIG_LIBDIR=%{_prefix}/lib/pkgconfig
diff --git a/fontconfig-bitstream-cyberbit.patch b/fontconfig-bitstream-cyberbit.patch
index fb606d1..33749d3 100644
--- a/fontconfig-bitstream-cyberbit.patch
+++ b/fontconfig-bitstream-cyberbit.patch
@@ -6,5 +6,5 @@
  			<family>FreeSerif</family>
 +			<family>Bitstream Cyberbit</family>
  			<family>Code2000</family>
+			<family>Code2001</family> <!-- plane1 and beyond -->
  		</prefer>
- 	</alias>
diff --git a/fontconfig-win32.patch b/fontconfig-win32.patch
deleted file mode 100644
index 49e067c..0000000
--- a/fontconfig-win32.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- 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/42dd7eaa0d164925698f5c07a3df9b07eef89d7c



More information about the pld-cvs-commit mailing list