- updated to 2.0.0

- updated win32 patch

diff --git a/crossmingw32-harfbuzz.spec b/crossmingw32-harfbuzz.spec
index 30308bd0a89fe9bb9d4da4eb7d27089b86ca903e..0fd377cec8e384ba75ff13ea7b4d50f582504fd3 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.9.0
+Version:       2.0.0
 Release:       1
 License:       MIT
 Group:         Development/Libraries
 Source0:       https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-%{version}.tar.bz2
-# Source0-md5: 263a3f1cb014e3ad2e4123c238a9bfc5
+# Source0-md5: 6d1373dba3e8540c448c6a562f2e0a00
 Patch0:                harfbuzz-win32.patch
 URL:           https://www.freedesktop.org/wiki/HarfBuzz
 BuildRequires: autoconf >= 2.64
@@ -200,6 +200,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/harfbuzz/hb-ot-font.h
 %{_includedir}/harfbuzz/hb-ot-layout.h
 %{_includedir}/harfbuzz/hb-ot-math.h
+%{_includedir}/harfbuzz/hb-ot-name.h
 %{_includedir}/harfbuzz/hb-ot-shape.h
 %{_includedir}/harfbuzz/hb-ot-tag.h
 %{_includedir}/harfbuzz/hb-ot-var.h

diff --git a/harfbuzz-win32.patch b/harfbuzz-win32.patch
index 950fc6201295b0a7cc21e03b6506a369a1836b41..4cff9918c18e01f3f69fdaee9bc23c9ef21024dd 100644 (file)
--- a/harfbuzz-win32.patch
+++ b/harfbuzz-win32.patch
@@ -10,17 +10,6 @@
  
  static inline uint16_t hb_uint16_swap (const uint16_t v)
  { return (v >> 8) | (v << 8); }
---- harfbuzz-1.9.0/src/hb-atomic.hh.orig       2018-08-02 20:46:35.868562237 +0200
-+++ harfbuzz-1.9.0/src/hb-atomic.hh    2018-08-02 21:02:03.521884980 +0200
-@@ -104,7 +104,7 @@
- typedef LONG hb_atomic_int_impl_t;
- #define hb_atomic_int_impl_add(AI, V)         InterlockedExchangeAdd ((AI), (V))
- 
--#define hb_atomic_ptr_impl_cmpexch(P,O,N)     (InterlockedCompareExchangePointer ((void **) (P), (void *) (N), (void *) (O)) == (void *) (O))
-+#define hb_atomic_ptr_impl_cmpexch(P,O,N)     (((void*)InterlockedCompareExchangePointer ((long volatile*)(void **) (P), (long)(void *) (N), (long)(void *) (O)) == (void *) (O))
- 
- 
- #elif !defined(HB_NO_MT) && defined(HAVE_INTEL_ATOMIC_PRIMITIVES)
 --- harfbuzz-1.9.0/src/hb.hh.orig      2018-06-08 22:23:00.670122650 +0200
 +++ harfbuzz-1.9.0/src/hb.hh   2018-06-08 22:28:25.200118946 +0200
 @@ -51,7 +51,7 @@