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

[Taichi Haradaguchi (via logerrit)]

 download.lst                                  |    4 ++--
 external/harfbuzz/UnpackedTarball_harfbuzz.mk |    2 --
 external/harfbuzz/tdf137553.patch.1           |   16 ----------------
 3 files changed, 2 insertions(+), 20 deletions(-)

New commits:
commit 21d0534d8ca6ec5362848fb29b6f1ead7d1643d6
Author:     Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Sun Jul 9 13:56:23 2023 +0900
Commit:     Taichi Haradaguchi <20001...@ymail.ne.jp>
CommitDate: Wed Jul 12 02:20:53 2023 +0200

    Upgrade Harfbuzz to 8.0.0
    
    Change-Id: I04d81509c50f0335d201b5286460989f526b58f9
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154233
    Tested-by: Jenkins
    Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>

diff --git a/download.lst b/download.lst
index 903cae0237e8..0d5deef073aa 100644
--- a/download.lst
+++ b/download.lst
@@ -222,8 +222,8 @@ GRAPHITE_TARBALL := graphite2-minimal-1.3.14.tgz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-HARFBUZZ_SHA256SUM := 
20770789749ac9ba846df33983dbda22db836c70d9f5d050cb9aa5347094a8fb
-HARFBUZZ_TARBALL := harfbuzz-7.3.0.tar.xz
+HARFBUZZ_SHA256SUM := 
1f98b5e3d06a344fe667d7e8210094ced458791499839bddde98c167ce6a7c79
+HARFBUZZ_TARBALL := harfbuzz-8.0.0.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/harfbuzz/UnpackedTarball_harfbuzz.mk 
b/external/harfbuzz/UnpackedTarball_harfbuzz.mk
index b2e1f5145dc7..9bc9e326b426 100644
--- a/external/harfbuzz/UnpackedTarball_harfbuzz.mk
+++ b/external/harfbuzz/UnpackedTarball_harfbuzz.mk
@@ -15,9 +15,7 @@ $(eval $(call 
gb_UnpackedTarball_update_autoconf_configs,harfbuzz))
 
 $(eval $(call gb_UnpackedTarball_set_patchlevel,harfbuzz,0))
 
-# https://github.com/harfbuzz/harfbuzz/pull/4314
 $(eval $(call gb_UnpackedTarball_add_patches,harfbuzz, \
-       external/harfbuzz/tdf137553.patch.1 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/harfbuzz/tdf137553.patch.1 
b/external/harfbuzz/tdf137553.patch.1
deleted file mode 100644
index 807001e497b2..000000000000
--- a/external/harfbuzz/tdf137553.patch.1
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ur harfbuzz.org/src/hb-graphite2.cc harfbuzz/src/hb-graphite2.cc
---- harfbuzz.org/src/hb-graphite2.cc   2023-07-08 12:33:00
-+++ harfbuzz/src/hb-graphite2.cc       2023-07-08 12:37:46
-@@ -363,9 +363,10 @@
-       }
-       else
-       {
-+      auto origin_X = gr_slot_origin_X (is) * xscale;
-       c->advance = 0;
--      clusters[ci].advance += gr_slot_origin_X(is) * xscale - curradv;
--      curradv += clusters[ci].advance;
-+      clusters[ci].advance += origin_X - curradv;
-+      curradv = origin_X;
-       }
-       ci++;
-     }