diff options
| author | Khaled Hosny <khaledhosny@eglug.org> | 2019-08-20 10:33:40 +0200 |
|---|---|---|
| committer | Khaled Hosny <khaledhosny@eglug.org> | 2019-08-20 20:08:59 +0200 |
| commit | 352924a64750bb99aec54feea3af0121603c12a8 (patch) | |
| tree | f05eb861696d89aa0188215b53628f0b308e2e98 /external | |
| parent | d3c8973f54037f915e12cd038a6a76501d237ea4 (diff) | |
Update HarfBbuzz to 2.6.0
Change-Id: I7983dd10fe6599a2473caf0da04a0df3e63e9b2a
Reviewed-on: https://gerrit.libreoffice.org/77790
Tested-by: Jenkins
Reviewed-by: Khaled Hosny <khaledhosny@eglug.org>
Diffstat (limited to 'external')
| -rw-r--r-- | external/harfbuzz/ExternalProject_harfbuzz.mk | 1 | ||||
| -rw-r--r-- | external/harfbuzz/UnpackedTarball_harfbuzz.mk | 6 | ||||
| -rw-r--r-- | external/harfbuzz/msvc.patch | 17 |
3 files changed, 0 insertions, 24 deletions
diff --git a/external/harfbuzz/ExternalProject_harfbuzz.mk b/external/harfbuzz/ExternalProject_harfbuzz.mk index 6a8b46f722ea..9bb2f5b9bc71 100644 --- a/external/harfbuzz/ExternalProject_harfbuzz.mk +++ b/external/harfbuzz/ExternalProject_harfbuzz.mk @@ -36,7 +36,6 @@ $(call gb_ExternalProject_get_state_target,harfbuzz,build) : --with-fontconfig=no \ --with-cairo=no \ --with-glib=no \ - --with-ucdn=no \ --with-graphite2=yes \ $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ --libdir=$(call gb_UnpackedTarball_get_dir,harfbuzz/src/.libs) \ diff --git a/external/harfbuzz/UnpackedTarball_harfbuzz.mk b/external/harfbuzz/UnpackedTarball_harfbuzz.mk index 8101f244f4df..a99f116d80ad 100644 --- a/external/harfbuzz/UnpackedTarball_harfbuzz.mk +++ b/external/harfbuzz/UnpackedTarball_harfbuzz.mk @@ -15,10 +15,4 @@ $(eval $(call gb_UnpackedTarball_update_autoconf_configs,harfbuzz)) $(eval $(call gb_UnpackedTarball_set_patchlevel,harfbuzz,0)) -# * external/harfbuzz/msvc.patch sent upstream as <https://github.com/harfbuzz/harfbuzz/pull/1605> -# "Fix hb_atomic_* variants based on C++11 atomics": -$(eval $(call gb_UnpackedTarball_add_patches,harfbuzz, \ - external/harfbuzz/msvc.patch \ -)) - # vim: set noet sw=4 ts=4: diff --git a/external/harfbuzz/msvc.patch b/external/harfbuzz/msvc.patch deleted file mode 100644 index f6796a99bf8e..000000000000 --- a/external/harfbuzz/msvc.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- src/hb-atomic.hh -+++ src/hb-atomic.hh -@@ -85,11 +85,11 @@ - #define hb_atomic_int_impl_add(AI, V) (reinterpret_cast<std::atomic<int> *> (AI)->fetch_add ((V), std::memory_order_acq_rel)) - #define hb_atomic_int_impl_set_relaxed(AI, V) (reinterpret_cast<std::atomic<int> *> (AI)->store ((V), std::memory_order_relaxed)) - #define hb_atomic_int_impl_set(AI, V) (reinterpret_cast<std::atomic<int> *> (AI)->store ((V), std::memory_order_release)) --#define hb_atomic_int_impl_get_relaxed(AI) (reinterpret_cast<std::atomic<int> *> (AI)->load (std::memory_order_relaxed)) --#define hb_atomic_int_impl_get(AI) (reinterpret_cast<std::atomic<int> *> (AI)->load (std::memory_order_acquire)) -+#define hb_atomic_int_impl_get_relaxed(AI) (reinterpret_cast<std::atomic<int> const *> (AI)->load (std::memory_order_relaxed)) -+#define hb_atomic_int_impl_get(AI) (reinterpret_cast<std::atomic<int> const *> (AI)->load (std::memory_order_acquire)) - - #define hb_atomic_ptr_impl_set_relaxed(P, V) (reinterpret_cast<std::atomic<void*> *> (P)->store ((V), std::memory_order_relaxed)) --#define hb_atomic_ptr_impl_get_relaxed(P) (reinterpret_cast<std::atomic<void*> *> (P)->load (std::memory_order_relaxed)) -+#define hb_atomic_ptr_impl_get_relaxed(P) (reinterpret_cast<std::atomic<void*> const *> (P)->load (std::memory_order_relaxed)) - #define hb_atomic_ptr_impl_get(P) (reinterpret_cast<std::atomic<void*> *> (P)->load (std::memory_order_acquire)) - static inline bool - _hb_atomic_ptr_impl_cmplexch (const void **P, const void *O_, const void *N) |