diff options
| author | Khaled Hosny <khaledhosny@eglug.org> | 2019-08-20 10:33:40 +0200 |
|---|---|---|
| committer | Aron Budea <aron.budea@collabora.com> | 2021-03-24 16:19:02 +0100 |
| commit | c3a4248a4e82b576cf169c1de22cdc85bc754439 (patch) | |
| tree | ec17fd4cea8050bc571b0828ff9aceaa4136f306 | |
| parent | Upgrade to latest HarfBuzz 2.3.1 (diff) | |
| download | core-c3a4248a4e82b576cf169c1de22cdc85bc754439.tar.gz core-c3a4248a4e82b576cf169c1de22cdc85bc754439.zip | |
Update HarfBbuzz to 2.6.0
Reviewed-on: https://gerrit.libreoffice.org/77790
Tested-by: Jenkins
Reviewed-by: Khaled Hosny <khaledhosny@eglug.org>
(cherry picked from commit 352924a64750bb99aec54feea3af0121603c12a8)
Change-Id: I7983dd10fe6599a2473caf0da04a0df3e63e9b2a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112482
Tested-by: Aron Budea <aron.budea@collabora.com>
Reviewed-by: Aron Budea <aron.budea@collabora.com>
| -rw-r--r-- | download.lst | 4 | ||||
| -rw-r--r-- | external/harfbuzz/ExternalProject_harfbuzz.mk | 1 | ||||
| -rw-r--r-- | external/harfbuzz/UnpackedTarball_harfbuzz.mk | 4 | ||||
| -rw-r--r-- | external/harfbuzz/msvc.patch | 17 |
4 files changed, 2 insertions, 24 deletions
diff --git a/download.lst b/download.lst index 389a98716bc3..7906d0e16800 100644 --- a/download.lst +++ b/download.lst @@ -118,8 +118,8 @@ export GPGME_SHA256SUM := 1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e64 export GPGME_TARBALL := gpgme-1.9.0.tar.bz2 export GRAPHITE_SHA256SUM := aa5e58356cd084000609ebbd93fef456a1bc0ab9e46fea20e81552fb286232a9 export GRAPHITE_TARBALL := graphite2-minimal-1.3.10.tgz -export HARFBUZZ_SHA256SUM := f205699d5b91374008d6f8e36c59e419ae2d9a7bb8c5d9f34041b9a5abcae468 -export HARFBUZZ_TARBALL := harfbuzz-2.3.1.tar.bz2 +export HARFBUZZ_SHA256SUM := 9cf7d117548265f95ca884e2f4c9fafaf4e17d45a67b11107147b79eed76c966 +export HARFBUZZ_TARBALL := harfbuzz-2.6.0.tar.xz export HSQLDB_SHA256SUM := d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370 export HSQLDB_TARBALL := 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip export HUNSPELL_SHA256SUM := 57be4e03ae9dd62c3471f667a0d81a14513e314d4d92081292b90435944ff951 diff --git a/external/harfbuzz/ExternalProject_harfbuzz.mk b/external/harfbuzz/ExternalProject_harfbuzz.mk index ad5c187ba4c5..98de3e161e54 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 $(filter iOS MACOSX,$(OS)),--with-coretext=yes) \ $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ diff --git a/external/harfbuzz/UnpackedTarball_harfbuzz.mk b/external/harfbuzz/UnpackedTarball_harfbuzz.mk index 48d7b450bc3a..a99f116d80ad 100644 --- a/external/harfbuzz/UnpackedTarball_harfbuzz.mk +++ b/external/harfbuzz/UnpackedTarball_harfbuzz.mk @@ -15,8 +15,4 @@ $(eval $(call gb_UnpackedTarball_update_autoconf_configs,harfbuzz)) $(eval $(call gb_UnpackedTarball_set_patchlevel,harfbuzz,0)) -$(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) |