- updated to 0.9.39

- updated mingw32 patch

diff --git a/crossmingw32-harfbuzz.spec b/crossmingw32-harfbuzz.spec
index 3da3b0480df79c1b83b5662558c110e8490cbdff..b2744f3b7201fd3970633c6022f8837d17d2ca2e 100644 (file)
--- a/crossmingw32-harfbuzz.spec
+++ b/crossmingw32-harfbuzz.spec
@@ -1,12 +1,12 @@
 Summary:       HarfBuzz - internationalized text shaping library - MinGW32 cross version
 Summary(pl.UTF-8):     Rasteryzer fontów TrueType - wersja skrośna dla MinGW32
 Name:          crossmingw32-harfbuzz
-Version:       0.9.38
+Version:       0.9.39
 Release:       1
 License:       MIT
 Group:         Development/Libraries
 Source0:       http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-%{version}.tar.bz2
-# Source0-md5: 8839e574be8089c0de83768798bf7916
+# Source0-md5: be4dfeb3d0bc91ac4fa0ccad13b80517
 Patch0:                harfbuzz-mingw32.patch
 URL:           http://www.freedesktop.org/wiki/HarfBuzz
 BuildRequires: autoconf >= 2.64

diff --git a/harfbuzz-mingw32.patch b/harfbuzz-mingw32.patch
index 4c0bd7b459ac1c217a425dbd59213cfa5a42828c..9ba98b68257fa8a9edbe6832fdecf81589b2121b 100644 (file)
--- a/harfbuzz-mingw32.patch
+++ b/harfbuzz-mingw32.patch
@@ -1,22 +1,11 @@
---- harfbuzz-0.9.15/src/hb-private.hh.orig     2013-03-19 12:04:53.000000000 +0100
-+++ harfbuzz-0.9.15/src/hb-private.hh  2013-04-07 13:28:22.647401427 +0200
-@@ -33,6 +33,10 @@
- #include "config.h"
- #endif
- 
-+#ifndef _WIN32_WINNT
-+#define _WIN32_WINNT 0x0600
-+#endif
-+
- #include "hb.h"
- #define HB_H_IN
- #ifdef HAVE_OT
-@@ -184,7 +184,7 @@
- #endif
- 
- 
--#if (defined(__WIN32__) && !defined(__WINE__)) || defined(_MSC_VER)
-+#if defined(_MSC_VER)
- #define snprintf _snprintf
- #endif
- 
+--- harfbuzz-0.9.39/src/hb-private.hh.orig     2015-02-26 22:59:13.689932225 +0100
++++ harfbuzz-0.9.39/src/hb-private.hh  2015-03-05 21:56:05.906340574 +0100
+@@ -127,7 +127,7 @@
+ #  elif defined(WINAPI_FAMILY) && (WINAPI_FAMILY==WINAPI_FAMILY_PC_APP || WINAPI_FAMILY==WINAPI_FAMILY_PHONE_APP)
+ #    define getenv(Name) NULL
+ #  endif
+-#  if (defined(__WIN32__) && !defined(__WINE__)) || defined(_MSC_VER)
++#  if (defined(__WIN32__) && !defined(__WINE__)) && defined(_MSC_VER)
+ #    define snprintf _snprintf
+      /* Windows CE only has _strdup, while rest of Windows has both. */
+ #    define strdup _strdup