summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/harfbuzz-2-memory-barrier.patch22
-rw-r--r--src/harfbuzz.mk2
2 files changed, 1 insertions, 23 deletions
diff --git a/src/harfbuzz-2-memory-barrier.patch b/src/harfbuzz-2-memory-barrier.patch
deleted file mode 100644
index 93f708a..0000000
--- a/src/harfbuzz-2-memory-barrier.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-This file is part of MXE.
-See index.html for further information.
-
-Beware! This patch must be removed when winnt.h is updated to a version that
-includes the MemoryBarrier() macro.
-
-diff -ur harfbuzz-0.9.14.orig/src/hb-atomic-private.hh harfbuzz-0.9.14/src/hb-atomic-private.hh
---- harfbuzz-0.9.14.orig/src/hb-atomic-private.hh 2013-03-19 12:04:53.000000000 +0100
-+++ harfbuzz-0.9.14/src/hb-atomic-private.hh 2013-03-27 05:32:38.407335037 +0100
-@@ -44,6 +44,12 @@
-
- #elif !defined(HB_NO_MT) && (defined(_WIN32) || defined(__CYGWIN__))
-
-+static inline void MemoryBarrier(void)
-+{
-+ long Barrier = 0;
-+ __asm__ __volatile__ ("xchgl %%eax,%0 " : "=r" (Barrier));
-+}
-+
- #define WIN32_LEAN_AND_MEAN
- #include <windows.h>
-
diff --git a/src/harfbuzz.mk b/src/harfbuzz.mk
index e129921..648e178 100644
--- a/src/harfbuzz.mk
+++ b/src/harfbuzz.mk
@@ -3,7 +3,7 @@
PKG := harfbuzz
$(PKG)_IGNORE :=
-$(PKG)_CHECKSUM := e12eb5a494453909deb7ec57700fa667c02332da
+$(PKG)_CHECKSUM := 242d39b30d613dae45c4eb5fc85d96b955b26ebc
$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2
$(PKG)_URL := http://www.freedesktop.org/software/$(PKG)/release/$($(PKG)_FILE)