[Libreoffice-commits] core.git: download.lst external/harfbuzz

[Julien Nabet (via logerrit)]

 download.lst                                               |    4 +-
 external/harfbuzz/UnpackedTarball_harfbuzz.mk              |   12 -------
 external/harfbuzz/Wunused-but-set-variable.patch           |   12 -------
 external/harfbuzz/icu-65-api-macros-with-semicolon.patch.1 |   12 -------
 external/harfbuzz/ubsan.patch                              |   20 -------------
 5 files changed, 2 insertions(+), 58 deletions(-)

New commits:
commit ed29da546754d0d11aa0cffd4dfe649cc95df722
Author:     Julien Nabet <serval2412 at yahoo.fr>
AuthorDate: Mon Jul 19 20:40:14 2021 +0200
Commit:     Julien Nabet <serval2412 at yahoo.fr>
CommitDate: Tue Jul 20 18:05:43 2021 +0200

    tdf#143429: update harfbuzz to 2.8.2 version
    
    Change-Id: I263dc6da5be3ea55205076a1f4e263fe5bba31fe
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119232
    Tested-by: Jenkins
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>

diff --git a/download.lst b/download.lst
index 30fd66f58351..57b27e1f3f67 100644
--- a/download.lst
+++ b/download.lst
@@ -104,8 +104,8 @@ export GPGME_SHA256SUM := c4e30b227682374c23cddc7fdb9324a99694d907e79242a25a4dee
 export GPGME_TARBALL := gpgme-1.13.1.tar.bz2
 export GRAPHITE_SHA256SUM := b8e892d8627c41888ff121e921455b9e2d26836978f2359173d19825da62b8fc
 export GRAPHITE_TARBALL := graphite2-minimal-1.3.14.tgz
-export HARFBUZZ_SHA256SUM := 9cf7d117548265f95ca884e2f4c9fafaf4e17d45a67b11107147b79eed76c966
-export HARFBUZZ_TARBALL := harfbuzz-2.6.0.tar.xz
+export HARFBUZZ_SHA256SUM := d58461395ce28b9dc03903254374dd70c38c8c28c5046db123c08f7ab9417be7
+export HARFBUZZ_TARBALL := harfbuzz-2.8.2.tar.xz
 export HSQLDB_SHA256SUM := d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370
 export HSQLDB_TARBALL := 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
 export HUNSPELL_SHA256SUM := 57be4e03ae9dd62c3471f667a0d81a14513e314d4d92081292b90435944ff951
diff --git a/external/harfbuzz/UnpackedTarball_harfbuzz.mk b/external/harfbuzz/UnpackedTarball_harfbuzz.mk
index cff8d91369e2..a99f116d80ad 100644
--- a/external/harfbuzz/UnpackedTarball_harfbuzz.mk
+++ b/external/harfbuzz/UnpackedTarball_harfbuzz.mk
@@ -15,16 +15,4 @@ $(eval $(call gb_UnpackedTarball_update_autoconf_configs,harfbuzz))
 
 $(eval $(call gb_UnpackedTarball_set_patchlevel,harfbuzz,0))
 
-# icu-65-api-macros-with-semicolon.patch.1
-#   See http://site.icu-project.org/download/65  Migration Issues
-# Wunused-but-set-variable.patch
-#   Independently fixed upstream in a similar way with
-#   <https://github.com/harfbuzz/harfbuzz/commit/d6a83abd6a0c684bd9a27f593d5be388819022b7> "Define
-#   HB_UNUSED for clang"
-$(eval $(call gb_UnpackedTarball_add_patches,harfbuzz, \
-    external/harfbuzz/ubsan.patch \
-    external/harfbuzz/icu-65-api-macros-with-semicolon.patch.1 \
-    external/harfbuzz/Wunused-but-set-variable.patch \
-))
-
 # vim: set noet sw=4 ts=4:
diff --git a/external/harfbuzz/Wunused-but-set-variable.patch b/external/harfbuzz/Wunused-but-set-variable.patch
deleted file mode 100644
index 2150c737e489..000000000000
--- a/external/harfbuzz/Wunused-but-set-variable.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/hb.hh
-+++ src/hb.hh
-@@ -242,7 +242,7 @@
- #define HB_CONST_FUNC
- #define HB_PRINTF_FUNC(format_idx, arg_idx)
- #endif
--#if defined(__GNUC__) && (__GNUC__ >= 4)
-+#if defined(__GNUC__) && (__GNUC__ >= 4) || defined __clang__
- #define HB_UNUSED	__attribute__((unused))
- #elif defined(_MSC_VER) /* https://github.com/harfbuzz/harfbuzz/issues/635 */
- #define HB_UNUSED __pragma(warning(suppress: 4100 4101))
-
diff --git a/external/harfbuzz/icu-65-api-macros-with-semicolon.patch.1 b/external/harfbuzz/icu-65-api-macros-with-semicolon.patch.1
deleted file mode 100644
index 55344bc632ba..000000000000
--- a/external/harfbuzz/icu-65-api-macros-with-semicolon.patch.1
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur harfbuzz.org/src/hb-icu.cc harfbuzz/src/hb-icu.cc
---- harfbuzz.org/src/hb-icu.cc	2019-06-26 22:30:55.000000000 +0200
-+++ harfbuzz/src/hb-icu.cc	2019-10-28 23:21:42.198460246 +0100
-@@ -53,7 +53,7 @@
- 
- /* ICU doesn't do-while(0) around their statements.  Ugh!
-  * https://unicode-org.atlassian.net/browse/CLDR-13027 */
--#define HB_ICU_STMT(S) do { S } while (0)
-+#define HB_ICU_STMT(S) do { S; } while (0)
- 
- hb_script_t
- hb_icu_script_to_script (UScriptCode script)
diff --git a/external/harfbuzz/ubsan.patch b/external/harfbuzz/ubsan.patch
deleted file mode 100644
index a9d1b72ef1a2..000000000000
--- a/external/harfbuzz/ubsan.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/hb-ot-layout-gsubgpos.hh
-+++ src/hb-ot-layout-gsubgpos.hh
-@@ -387,7 +387,7 @@
- 	     skip == matcher_t::SKIP_NO))
- 	{
- 	  num_items--;
--	  match_glyph_data++;
-+	  if (match_glyph_data != nullptr) match_glyph_data++;
- 	  return true;
- 	}
- 
-@@ -414,7 +414,7 @@
- 	     skip == matcher_t::SKIP_NO))
- 	{
- 	  num_items--;
--	  match_glyph_data++;
-+	  if (match_glyph_data != nullptr) match_glyph_data++;
- 	  return true;
- 	}
-