- updated to 2.10.92

- removed obsolete mkstemp patch

diff --git a/crossmingw32-fontconfig.spec b/crossmingw32-fontconfig.spec
index 1361b14e151d5277fdc01b1872cd95ab2c6f4ecb..48b82404ebd6b6e2a1d51cdc643950529e547d59 100644 (file)
--- a/crossmingw32-fontconfig.spec
+++ b/crossmingw32-fontconfig.spec
@@ -2,15 +2,13 @@
 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.10.91
+Version:       2.10.92
 Release:       1
 License:       MIT
 Group:         Development/Libraries
 Source0:       http://fontconfig.org/release/%{realname}-%{version}.tar.bz2
-# Source0-md5: c795bb39fab3a656e5dff8bad6a199f6
-Patch0:                %{realname}-blacklist.patch
-Patch1:                %{realname}-bitstream-cyberbit.patch
-Patch2:                %{realname}-mkstemp.patch
+# Source0-md5: d69aa42da134038d2145d8f31a085620
+Patch0:                %{realname}-bitstream-cyberbit.patch
 URL:           http://fontconfig.org/
 BuildRequires: autoconf >= 2.61
 BuildRequires: automake
@@ -85,8 +83,6 @@ Biblioteka DLL freetype dla Windows.
 %prep
 %setup -q -n %{realname}-%{version}
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %build
 export PKG_CONFIG_LIBDIR=%{_prefix}/lib/pkgconfig

diff --git a/fontconfig-blacklist.patch b/fontconfig-blacklist.patch
deleted file mode 100644 (file)
index 1ae4893..0000000
--- a/fontconfig-blacklist.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- fontconfig-2.2.98/src/fcdir.c.orig 2004-12-06 20:25:19.000000000 +0100
-+++ fontconfig-2.2.98/src/fcdir.c      2005-01-22 21:26:06.141980024 +0100
-@@ -166,6 +166,40 @@
-     return FcFileScanConfig (set, dirs, cache, blanks, file, force, 0);
- }
- 
-+static FcBool
-+FcBlackListed (const char *name)
-+{
-+    static const char * const black_listed_names[] = {
-+      "hrger.pfa",
-+      "hrgrr.pfa",
-+      "hritr.pfa",
-+      "hrpld.pfa",
-+      "hrpldi.pfa",
-+      "hrplt.pfa",
-+      "hrplti.pfa",
-+      "hrscc.pfa",
-+      "hrscs.pfa",
-+      "u003043t.gsf",
-+      "u004006t.gsf"
-+    };
-+
-+    int low = 0;
-+    int high = sizeof(black_listed_names) / sizeof(black_listed_names[0]) - 1;
-+
-+    while (low <= high) {
-+      int mid = (low + high) / 2;
-+      int res = strcmp (name, black_listed_names[mid]);
-+      if (res == 0)
-+          return FcTrue;
-+      else if (res < 0)
-+          high = mid - 1;
-+      else
-+          low = mid + 1;
-+    }
-+
-+    return FcFalse;
-+}
-+
- /*
-  * Scan 'dir', adding font files to 'set' and
-  * subdirectories to 'dirs'
-@@ -232,7 +266,8 @@
-     }
-     while (ret && (e = readdir (d)))
-     {
--      if (e->d_name[0] != '.' && strlen (e->d_name) < FC_MAX_FILE_LEN)
-+      if (e->d_name[0] != '.' && strlen (e->d_name) < FC_MAX_FILE_LEN &&
-+          !FcBlackListed (e->d_name))
-       {
-           strcpy ((char *) base, (char *) e->d_name);
-           ret = FcFileScanConfig (set, dirs, cache, blanks, file, force, config);

diff --git a/fontconfig-mkstemp.patch b/fontconfig-mkstemp.patch
deleted file mode 100644 (file)
index 58c2b8a..0000000
--- a/fontconfig-mkstemp.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From dffb69ed8c7cf2e707bc692f94b51108b772d9d8 Mon Sep 17 00:00:00 2001
-From: Akira TAGOH <akira@tagoh.org>
-Date: Tue, 15 Jan 2013 08:26:27 +0000
-Subject: Fix the build fail on MinGW
-
-Reported at http://lists.freedesktop.org/archives/fontconfig/2013-January/004601.html
-
-just warn at the runtime instead of the compile time. it somewhat works
-on even MinGW since FcMakeTempfile() isn't used on Win32 so far.
----
-diff --git a/src/fccompat.c b/src/fccompat.c
-index 169cab9..2aa29dd 100644
---- a/src/fccompat.c
-+++ b/src/fccompat.c
-@@ -100,7 +100,11 @@ FcMakeTempfile (char *template)
-        return -1;
-    fd = FcOpen(template, O_RDWR | O_EXCL | O_CREAT, 0600);
- #else
--#error no secure functions to create a temporary file
-+   /* warn at the runtime for just debugging purpose why something may
-+    * goes wrong. mingw may not have one, but it shouldn't be reached since
-+    * this function isn't used so far.
-+    */
-+   fprintf(stderr, "Fontconfig warning: No secure functions to create a temporary file\n");
- #endif
- 
-     return fd;
---
-cgit v0.9.0.2-2-gbebe