[packages/crossmingw32-harfbuzz] - updated to 1.4.5 - added hack for LONG typedef conflict to win32 patch
qboosh
qboosh at pld-linux.org
Sun Apr 9 14:35:25 CEST 2017
commit 4abaa9c0ad4ad8bb0d14f82a88fd8b81a10c963b
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sun Apr 9 14:35:30 2017 +0200
- updated to 1.4.5
- added hack for LONG typedef conflict to win32 patch
crossmingw32-harfbuzz.spec | 4 ++--
harfbuzz-win32.patch | 11 +++++++++++
2 files changed, 13 insertions(+), 2 deletions(-)
---
diff --git a/crossmingw32-harfbuzz.spec b/crossmingw32-harfbuzz.spec
index d682a18..b912bfb 100644
--- 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.3.4
+Version: 1.4.5
Release: 1
License: MIT
Group: Development/Libraries
Source0: https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-%{version}.tar.bz2
-# Source0-md5: 065843caf247687b94126773285bc70f
+# Source0-md5: 635126eeab703d1729df9391ffb7983c
Patch0: harfbuzz-win32.patch
URL: https://www.freedesktop.org/wiki/HarfBuzz
BuildRequires: autoconf >= 2.64
diff --git a/harfbuzz-win32.patch b/harfbuzz-win32.patch
index d1d9587..0524bf7 100644
--- a/harfbuzz-win32.patch
+++ b/harfbuzz-win32.patch
@@ -10,3 +10,14 @@
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))
+
+ #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))
+
+
+ #elif !defined(HB_NO_MT) && defined(__APPLE__)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/crossmingw32-harfbuzz.git/commitdiff/4abaa9c0ad4ad8bb0d14f82a88fd8b81a10c963b
More information about the pld-cvs-commit
mailing list