- updated to 1.8.5

- updated win32 patch

diff --git a/crossmingw32-harfbuzz.spec b/crossmingw32-harfbuzz.spec
index b24a26aaee730cfc546d90ceb8c0423d6c5776d3..2394dadd43ba9ee4c607d067ec4f80de7cc1ad60 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.8.1
+Version:       1.8.5
 Release:       1
 License:       MIT
 Group:         Development/Libraries
 Source0:       https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-%{version}.tar.bz2
-# Source0-md5: 97cb89c6e2a914c05c8b7e858703885f
+# Source0-md5: a8f07d797a750a9f0d29a1b872dee1f3
 Patch0:                harfbuzz-win32.patch
 URL:           https://www.freedesktop.org/wiki/HarfBuzz
 BuildRequires: autoconf >= 2.64
@@ -172,6 +172,7 @@ install -d $RPM_BUILD_ROOT%{_dlldir}
 %{target}-strip -g -R.comment -R.note $RPM_BUILD_ROOT%{_libdir}/*.a
 %endif
 
+%{__rm} -r $RPM_BUILD_ROOT%{_libdir}/cmake/harfbuzz
 %{__rm} $RPM_BUILD_ROOT%{_bindir}/hb*.exe
 %{__rm} -rf $RPM_BUILD_ROOT%{_gtkdocdir}
 

diff --git a/harfbuzz-win32.patch b/harfbuzz-win32.patch
index 6a4f18983e7d307fb97786cf8e8357c337bc8dc3..54270f94ba61e220da86b8492770f0054e72c940 100644 (file)
--- a/harfbuzz-win32.patch
+++ b/harfbuzz-win32.patch
@@ -10,17 +10,17 @@
  
  static inline uint16_t hb_uint16_swap (const uint16_t v)
  { return (v >> 8) | (v << 8); }
---- harfbuzz-1.4.5/src/hb-atomic-private.hh.orig       2016-07-13 04:09:47.000000000 +0200
-+++ harfbuzz-1.4.5/src/hb-atomic-private.hh    2017-04-09 14:28:37.769359459 +0200
-@@ -67,7 +67,7 @@
- #define hb_atomic_int_impl_add(AI, V)         InterlockedExchangeAdd (&(AI), (V))
+--- harfbuzz-1.8.5/src/hb-atomic-private.hh.orig       2018-08-02 20:46:35.868562237 +0200
++++ harfbuzz-1.8.5/src/hb-atomic-private.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_get(P)             (_HBMemoryBarrier (), (void *) *(P))
 -#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*)InterlockedCompareExchange((long volatile*)(void **) (P), (long)(void *) (N), (long)(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(__APPLE__)
+ #elif !defined(HB_NO_MT) && defined(HAVE_INTEL_ATOMIC_PRIMITIVES)
 --- 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 @@
@@ -32,7 +32,9 @@
  #include <intrin.h>
  #endif
  
-@@ -389,7 +389,7 @@
+--- harfbuzz-1.8.5/src/hb-dsalgs.hh.orig       2018-07-17 16:29:54.000000000 +0200
++++ harfbuzz-1.8.5/src/hb-dsalgs.hh    2018-08-02 21:15:43.988542278 +0200
+@@ -98,7 +98,7 @@
      return sizeof (unsigned long long) * 8 - __builtin_clzll (v);
  #endif
  
@@ -41,7 +43,7 @@
    if (sizeof (T) <= sizeof (unsigned int))
    {
      unsigned long where;
-@@ -462,7 +462,7 @@
+@@ -172,7 +172,7 @@
      return __builtin_ctzll (v);
  #endif