- updated to 1.8.0

- updated win32 patch

diff --git a/crossmingw32-harfbuzz.spec b/crossmingw32-harfbuzz.spec
index 666eb8e9811f946cef1b9585680168088d5b1b59..40dcf3378a532da2c8eb08a695b8292aa2982355 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:       1.7.6
-Release:       2
+Version:       1.8.0
+Release:       1
 License:       MIT
 Group:         Development/Libraries
 Source0:       https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-%{version}.tar.bz2
-# Source0-md5: ffb94cf2942327344ac31330d07036ba
+# Source0-md5: 1023806c6a25a3fb11af0bcee8d0dc7c
 Patch0:                harfbuzz-win32.patch
 URL:           https://www.freedesktop.org/wiki/HarfBuzz
 BuildRequires: autoconf >= 2.64
@@ -193,6 +193,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/harfbuzz/hb-font.h
 %{_includedir}/harfbuzz/hb-ft.h
 %{_includedir}/harfbuzz/hb-glib.h
+%{_includedir}/harfbuzz/hb-map.h
 %{_includedir}/harfbuzz/hb-ot-font.h
 %{_includedir}/harfbuzz/hb-ot-layout.h
 %{_includedir}/harfbuzz/hb-ot-math.h

diff --git a/harfbuzz-win32.patch b/harfbuzz-win32.patch
index aee062a9760751849d95bbbc13db9b32d50d3627..6a4f18983e7d307fb97786cf8e8357c337bc8dc3 100644 (file)
--- a/harfbuzz-win32.patch
+++ b/harfbuzz-win32.patch
@@ -21,32 +21,32 @@
  
  
  #elif !defined(HB_NO_MT) && defined(__APPLE__)
---- harfbuzz-1.7.6/src/hb-private.hh.orig      2018-02-18 20:36:12.000000000 +0100
-+++ harfbuzz-1.7.6/src/hb-private.hh   2018-03-14 18:34:31.433228662 +0100
+--- harfbuzz-1.8.0/src/hb-private.hh.orig      2018-06-08 22:23:00.670122650 +0200
++++ harfbuzz-1.8.0/src/hb-private.hh   2018-06-08 22:28:25.200118946 +0200
 @@ -51,7 +51,7 @@
  #include <stdio.h>
  #include <stdarg.h>
  
--#if defined(_MSC_VER) || defined(__MINGW32__)
-+#if defined(_MSC_VER)
+-#if (defined(_MSC_VER) && _MSC_VER >= 1500) || defined(__MINGW32__)
++#if (defined(_MSC_VER) && _MSC_VER >= 1500)
  #include <intrin.h>
  #endif
  
-@@ -380,7 +380,7 @@
+@@ -389,7 +389,7 @@
      return sizeof (unsigned long long) * 8 - __builtin_clzll (v);
  #endif
  
--#if defined(_MSC_VER) || defined(__MINGW32__)
-+#if defined(_MSC_VER)
+-#if (defined(_MSC_VER) && _MSC_VER >= 1500) || defined(__MINGW32__)
++#if (defined(_MSC_VER) && _MSC_VER >= 1500)
    if (sizeof (T) <= sizeof (unsigned int))
    {
      unsigned long where;
-@@ -453,7 +453,7 @@
+@@ -462,7 +462,7 @@
      return __builtin_ctzll (v);
  #endif
  
--#if defined(_MSC_VER) || defined(__MINGW32__)
-+#if defined(_MSC_VER)
+-#if (defined(_MSC_VER) && _MSC_VER >= 1500) || defined(__MINGW32__)
++#if (defined(_MSC_VER) && _MSC_VER >= 1500)
    if (sizeof (T) <= sizeof (unsigned int))
    {
      unsigned long where;