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

2023-07-11 Thread 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..
--- 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++;
- }

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

2023-06-30 Thread Taichi Haradaguchi (via logerrit) 
 download.lst |4 ++--
 external/harfbuzz/README |6 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 8492195582a546b607bb15bc61adb64dcd74b904
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Wed Jun 28 19:03:16 2023 +0900
Commit: Taichi Haradaguchi <20001...@ymail.ne.jp>
CommitDate: Sat Jul 1 07:10:25 2023 +0200

Upgrade Harfbuzz to 7.3.0

Release Notes:
https://github.com/harfbuzz/harfbuzz/releases/tag/7.2.0 (v7.2.0)
https://github.com/harfbuzz/harfbuzz/releases/tag/7.3.0 (v7.3.0)

Change-Id: I4f57b7e829f2356b5e2b442ff00df555121c0e66
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153729
Tested-by: Taichi Haradaguchi <20001...@ymail.ne.jp>
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>

diff --git a/download.lst b/download.lst
index 8504c86a4d87..9b3b7692c869 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 := 
f135a61cd464c9ed6bc9823764c188f276c3850a8dc904628de2a87966b7077b
-HARFBUZZ_TARBALL := harfbuzz-7.1.0.tar.xz
+HARFBUZZ_SHA256SUM := 
20770789749ac9ba846df33983dbda22db836c70d9f5d050cb9aa5347094a8fb
+HARFBUZZ_TARBALL := harfbuzz-7.3.0.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/harfbuzz/README b/external/harfbuzz/README
index 149da5566ab9..557c0a724ce8 100644
--- a/external/harfbuzz/README
+++ b/external/harfbuzz/README
@@ -1 +1,5 @@
-HarfBuzz is an OpenType text shaping engine. From 
[https://harfbuzz.github.io/].
+HarfBuzz is an OpenType text shaping engine.
+
+From [https://harfbuzz.github.io/].
+
+Release archives at [https://github.com/harfbuzz/harfbuzz/releases].

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

2023-03-23 Thread Taichi Haradaguchi (via logerrit) 
 download.lst|4 ++--
 external/harfbuzz/README|2 +-
 vcl/source/font/LogicalFontInstance.cxx |4 
 3 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit b80e0165affb81bcc6bf343b54c17b9a9b4c0d0e
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Sat Mar 11 12:42:40 2023 +0900
Commit: خالد حسني 
CommitDate: Thu Mar 23 11:55:58 2023 +

Upgrade Harfbuzz to 7.1.0

* Fixes CVE-2023-25193.
* if Harfbuzz >= 7.0.0, uses hb_font_draw_glyph()
  instead of hb_font_get_glyph_shape().
* Update URL in README.

Change-Id: Id234c2b459c40ddac340731b44889b104e03a1e8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148743
Tested-by: Jenkins
Reviewed-by: خالد حسني 

diff --git a/download.lst b/download.lst
index 4f2a9169d40f..86759b35fa9b 100644
--- a/download.lst
+++ b/download.lst
@@ -217,8 +217,8 @@ GRAPHITE_TARBALL := graphite2-minimal-1.3.14.tgz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-HARFBUZZ_SHA256SUM := 
1d1010a1751d076d5291e433c138502a794d679a7498d1268ee21e2d4a140eb4
-HARFBUZZ_TARBALL := harfbuzz-6.0.0.tar.xz
+HARFBUZZ_SHA256SUM := 
f135a61cd464c9ed6bc9823764c188f276c3850a8dc904628de2a87966b7077b
+HARFBUZZ_TARBALL := harfbuzz-7.1.0.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/harfbuzz/README b/external/harfbuzz/README
index d2af8b559ad1..149da5566ab9 100644
--- a/external/harfbuzz/README
+++ b/external/harfbuzz/README
@@ -1 +1 @@
-HarfBuzz is an OpenType text shaping engine. From [http://harfbuzz.org/].
+HarfBuzz is an OpenType text shaping engine. From 
[https://harfbuzz.github.io/].
diff --git a/vcl/source/font/LogicalFontInstance.cxx 
b/vcl/source/font/LogicalFontInstance.cxx
index 385fe5ccd624..ee9c01b3881f 100644
--- a/vcl/source/font/LogicalFontInstance.cxx
+++ b/vcl/source/font/LogicalFontInstance.cxx
@@ -306,7 +306,11 @@ basegfx::B2DPolyPolygon 
LogicalFontInstance::GetGlyphOutlineUntransformed(sal_Gl
 }
 
 basegfx::B2DPolyPolygon aPolyPoly;
+#if HB_VERSION_ATLEAST(7, 0, 0)
+hb_font_draw_glyph(GetHbFontUntransformed(), nGlyph, m_pHbDrawFuncs, 
);
+#else
 hb_font_get_glyph_shape(GetHbFontUntransformed(), nGlyph, m_pHbDrawFuncs, 
);
+#endif
 return aPolyPoly;
 }

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

2022-12-17 Thread Khaled Hosny (via logerrit) 
 download.lst   
 |4 
 
external/harfbuzz/0001-PairPos-Another-attempt-at-fixing-unsafe-to-break-wi.patch.1
 |   62 -
 external/harfbuzz/0001-buffer-diff-Fix-check-for-glyph-flag-equality.patch.1   
 |   65 --
 external/harfbuzz/0001-font-Respect-subfont-slant-setting-in-hb-draw.patch.1   
 |  104 --
 external/harfbuzz/0001-hb-view-Fix-cairo-slanting-condition.patch.1
 |   29 --
 external/harfbuzz/3874.patch.1 
 |   47 
 external/harfbuzz/UnpackedTarball_harfbuzz.mk  
 |6 
 7 files changed, 2 insertions(+), 315 deletions(-)

New commits:
commit e272fd31b115e6ea128b593087aeaf4f55119a36
Author: Khaled Hosny 
AuthorDate: Sat Dec 17 23:47:06 2022 +0200
Commit: خالد حسني 
CommitDate: Sat Dec 17 22:44:37 2022 +

Update HarfBuzz to 6.0.0

Change-Id: Id371a53a126f2b95b17e642a9c63adafd5aa3d33
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144394
Tested-by: Jenkins
Reviewed-by: خالد حسني 

diff --git a/download.lst b/download.lst
index f193a571d4ee..4bf163be50c7 100644
--- a/download.lst
+++ b/download.lst
@@ -218,8 +218,8 @@ GRAPHITE_TARBALL := graphite2-minimal-1.3.14.tgz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-HARFBUZZ_SHA256SUM := 
735a94917b47936575acb4d4fa7e7986522f8a89527e4635721474dee2bc942c
-HARFBUZZ_TARBALL := harfbuzz-5.2.0.tar.xz
+HARFBUZZ_SHA256SUM := 
1d1010a1751d076d5291e433c138502a794d679a7498d1268ee21e2d4a140eb4
+HARFBUZZ_TARBALL := harfbuzz-6.0.0.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git 
a/external/harfbuzz/0001-PairPos-Another-attempt-at-fixing-unsafe-to-break-wi.patch.1
 
b/external/harfbuzz/0001-PairPos-Another-attempt-at-fixing-unsafe-to-break-wi.patch.1
deleted file mode 100644
index 0fd429257b8d..
--- 
a/external/harfbuzz/0001-PairPos-Another-attempt-at-fixing-unsafe-to-break-wi.patch.1
+++ /dev/null
@@ -1,62 +0,0 @@
-From 05aa084e67705285941c9acd13151e2a38da8b0f Mon Sep 17 00:00:00 2001
-From: Behdad Esfahbod 
-Date: Thu, 24 Nov 2022 12:13:31 -0700
-Subject: [PATCH] [PairPos] Another attempt at fixing unsafe-to-break with
- ValueFormat2
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fixes https://github.com/harfbuzz/harfbuzz/issues/3888#issuecomment-1326781116
-
-Test:
-$ hb-shape XBRoya34.ttf  ' الأ' --show-flags --script=arab

- src/OT/Layout/GPOS/PairPosFormat2.hh | 9 +
- src/OT/Layout/GPOS/PairSet.hh| 5 +++--
- 2 files changed, 8 insertions(+), 6 deletions(-)
-
-diff --git a/src/OT/Layout/GPOS/PairPosFormat2.hh 
b/src/OT/Layout/GPOS/PairPosFormat2.hh
-index 1bb0d60ae..523e0e936 100644
 a/src/OT/Layout/GPOS/PairPosFormat2.hh
-+++ b/src/OT/Layout/GPOS/PairPosFormat2.hh
-@@ -241,15 +241,16 @@ struct PairPosFormat2_4
- boring:
-   buffer->unsafe_to_concat (buffer->idx, skippy_iter.idx + 1);
- 
--
--buffer->idx = skippy_iter.idx;
- if (len2)
- {
--  buffer->idx++;
-+  skippy_iter.idx++;
-   // https://github.com/harfbuzz/harfbuzz/issues/3824
--  buffer->unsafe_to_break (buffer->idx - 1, buffer->idx + 1);
-+  // 
https://github.com/harfbuzz/harfbuzz/issues/3888#issuecomment-1326781116
-+  buffer->unsafe_to_break (buffer->idx, skippy_iter.idx + 1);
- }
- 
-+buffer->idx = skippy_iter.idx;
-+
- return_trace (true);
-   }
- 
-diff --git a/src/OT/Layout/GPOS/PairSet.hh b/src/OT/Layout/GPOS/PairSet.hh
-index b1d9f83bc..2ad1f004c 100644
 a/src/OT/Layout/GPOS/PairSet.hh
-+++ b/src/OT/Layout/GPOS/PairSet.hh
-@@ -132,8 +132,9 @@ struct PairSet
-   if (len2)
-   {
-   pos++;
--  // https://github.com/harfbuzz/harfbuzz/issues/3824
--  buffer->unsafe_to_break (pos - 1, pos + 1);
-+  // https://github.com/harfbuzz/harfbuzz/issues/3824
-+  // 
https://github.com/harfbuzz/harfbuzz/issues/3888#issuecomment-1326781116
-+  buffer->unsafe_to_break (buffer->idx, pos + 1);
-   }
- 
-   buffer->idx = pos;
--- 
-2.38.1
-
diff --git 
a/external/harfbuzz/0001-buffer-diff-Fix-check-for-glyph-flag-equality.patch.1 
b/external/harfbuzz/0001-buffer-diff-Fix-check-for-glyph-flag-equality.patch.1
deleted file mode 100644
index 45da1bddf161..
--- 
a/external/harfbuzz/0001-buffer-diff-Fix-check-for-glyph-flag-equality.patch.1
+++ /dev/null
@@ -1,65 +0,0 @@
-From 404cb99d86c2d639b4ce2fc59f00f5e66468af34 Mon Sep 17 00:00:00 2001
-From: Behdad Esfahbod 
-Date: Wed, 23 Nov 2022 15:35:14 -0700
-Subject: [PATCH] [buffer-diff] Fix check for glyph flag equality
-
-I'm not sure if the old behavior was intentional, but it was checking
-that the glyph flags were a subset of the reference buffer's glyph
-flags.  I don't see why that is useful.  Fix that.
-
-Then make the buffer-verify code ignore flag

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

2021-07-20 Thread 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 
AuthorDate: Mon Jul 19 20:40:14 2021 +0200
Commit: Julien Nabet 
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 

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
-#   

 "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..
--- 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..
--- 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.0 +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..
--- 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;
-

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

2019-08-20 Thread Khaled Hosny (via logerrit) 
 download.lst  |4 ++--
 external/harfbuzz/ExternalProject_harfbuzz.mk |1 -
 external/harfbuzz/UnpackedTarball_harfbuzz.mk |6 --
 external/harfbuzz/msvc.patch  |   17 -
 4 files changed, 2 insertions(+), 26 deletions(-)

New commits:
commit 352924a64750bb99aec54feea3af0121603c12a8
Author: Khaled Hosny 
AuthorDate: Tue Aug 20 10:33:40 2019 +0200
Commit: Khaled Hosny 
CommitDate: Tue Aug 20 20:08:59 2019 +0200

Update HarfBbuzz to 2.6.0

Change-Id: I7983dd10fe6599a2473caf0da04a0df3e63e9b2a
Reviewed-on: https://gerrit.libreoffice.org/77790
Tested-by: Jenkins
Reviewed-by: Khaled Hosny 

diff --git a/download.lst b/download.lst
index 4539a35a9b3c..c0217d93b9d0 100644
--- a/download.lst
+++ b/download.lst
@@ -96,8 +96,8 @@ export GPGME_SHA256SUM := 
1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e64
 export GPGME_TARBALL := gpgme-1.9.0.tar.bz2
 export GRAPHITE_SHA256SUM := 
d47d387161db7f7ebade1920aa7cbdc797e79772597d8b55e80b58d1071bcc36
 export GRAPHITE_TARBALL := graphite2-minimal-1.3.13.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 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 

-#   "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..
--- 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 *> (AI)->fetch_add ((V), 
std::memory_order_acq_rel))
- #define hb_atomic_int_impl_set_relaxed(AI, V) 
(reinterpret_cast *> (AI)->store ((V), 
std::memory_order_relaxed))
- #define hb_atomic_int_impl_set(AI, V) 
(reinterpret_cast *> (AI)->store ((V), 
std::memory_order_release))
--#define hb_atomic_int_impl_get_relaxed(AI)
(reinterpret_cast *> (AI)->load (std::memory_order_relaxed))
--#define hb_atomic_int_impl_get(AI)
(reinterpret_cast *> (AI)->load (std::memory_order_acquire))
-+#define hb_atomic_int_impl_get_relaxed(AI)
(reinterpret_cast const *> (AI)->load 
(std::memory_order_relaxed))
-+#define hb_atomic_int_impl_get(AI)
(reinterpret_cast const *> (AI)->load 
(std::memory_order_acquire))
- 
- #define hb_atomic_ptr_impl_set_relaxed(P, V)  
(reinterpret_cast *> (P)->store ((V), 
std::memory_order_relaxed))
--#define hb_atomic_ptr_impl_get_relaxed(P) 
(reinterpret_cast *> (P)->load (std::memory_order_relaxed))
-+#define hb_atomic_ptr_impl_get_relaxed(P) 
(reinterpret_cast const *> (P)->load 
(std::memory_order_relaxed))
- #define hb_atomic_ptr_impl_get(P) 
(reinterpret_cast *> (P)->load (std::memory_order_acquire))
- static inline bool
- _hb_atomic_ptr_impl_cmplexch (const void **P, const void *O_, const void *N)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-03-05 Thread Libreoffice Gerrit user 
 download.lst  |4 +--
 external/harfbuzz/UnpackedTarball_harfbuzz.mk |   13 ---
 external/harfbuzz/clang-cl.patch  |   12 --
 external/harfbuzz/harfbuzz-ios.patch  |   29 --
 external/harfbuzz/harfbuzz-rtti.patch |   11 -
 external/harfbuzz/msvc.patch  |   17 +++
 external/harfbuzz/ubsan.patch |   11 -
 7 files changed, 20 insertions(+), 77 deletions(-)

New commits:
commit b7ddc514bff9bdf682abae537f990aa01dc2c0fb
Author: Stephan Bergmann 
AuthorDate: Tue Mar 5 08:37:47 2019 +0100
Commit: Stephan Bergmann 
CommitDate: Tue Mar 5 15:31:25 2019 +0100

Upgrade to latest HarfBuzz 2.3.1

As a side-effect, this gets rid of some Clang
-fsanitize=implicit-signed-integer-truncation warnings.

The various external/harfbuzz/*.patch no longer applied and appear not to be
necessary any more.  (But a new external/harfbuzz/msvc.patch became 
necessary.)

 was downloaded 
from

,
and HARFBUZZ_SHA256SUM in download.lst matches .

Change-Id: Ic85acd14b4f488b3d88ce1bafc93be271928006e
Reviewed-on: https://gerrit.libreoffice.org/68731
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/download.lst b/download.lst
index 9b85f3da8f78..c9475b474dc5 100644
--- a/download.lst
+++ b/download.lst
@@ -96,8 +96,8 @@ export GPGME_SHA256SUM := 
1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e64
 export GPGME_TARBALL := gpgme-1.9.0.tar.bz2
 export GRAPHITE_SHA256SUM := 
d47d387161db7f7ebade1920aa7cbdc797e79772597d8b55e80b58d1071bcc36
 export GRAPHITE_TARBALL := graphite2-minimal-1.3.13.tgz
-export HARFBUZZ_SHA256SUM := 
3c592f86fa0da69e2e0e98cae9f5d5b61def3bb7948aa00ca45748f27fa545fd
-export HARFBUZZ_TARBALL := harfbuzz-1.8.4.tar.bz2
+export HARFBUZZ_SHA256SUM := 
f205699d5b91374008d6f8e36c59e419ae2d9a7bb8c5d9f34041b9a5abcae468
+export HARFBUZZ_TARBALL := harfbuzz-2.3.1.tar.bz2
 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 3a20f31e101f..48d7b450bc3a 100644
--- a/external/harfbuzz/UnpackedTarball_harfbuzz.mk
+++ b/external/harfbuzz/UnpackedTarball_harfbuzz.mk
@@ -16,18 +16,7 @@ $(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/clang-cl.patch \
-external/harfbuzz/ubsan.patch \
-))
-
-ifneq ($(ENABLE_RUNTIME_OPTIMIZATIONS),TRUE)
-$(eval $(call gb_UnpackedTarball_add_patches,harfbuzz, \
-external/harfbuzz/harfbuzz-rtti.patch \
-))
-endif
-
-$(eval $(call gb_UnpackedTarball_add_patches,harfbuzz, \
-external/harfbuzz/harfbuzz-ios.patch \
+external/harfbuzz/msvc.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/harfbuzz/clang-cl.patch b/external/harfbuzz/clang-cl.patch
deleted file mode 100644
index 9fbeee4114d8..
--- a/external/harfbuzz/clang-cl.patch
+++ /dev/null
@@ -1,12 +0,0 @@
 src/hb-common.h
-+++ src/hb-common.h
-@@ -346,7 +346,9 @@
-*
-*   https://lists.freedesktop.org/archives/harfbuzz/2014-March/004150.html
-*/
-+#if !defined _MSC_VER /* avoid clang-cl -Wmicrosoft-enum-value */
-   _HB_SCRIPT_MAX_VALUE= HB_TAG_MAX, /*< skip 
>*/
-+#endif
-   _HB_SCRIPT_MAX_VALUE_SIGNED = HB_TAG_MAX_SIGNED /*< skip >*/
-
- } hb_script_t;
diff --git a/external/harfbuzz/harfbuzz-ios.patch 
b/external/harfbuzz/harfbuzz-ios.patch
deleted file mode 100644
index 215800e5ab57..
--- a/external/harfbuzz/harfbuzz-ios.patch
+++ /dev/null
@@ -1,29 +0,0 @@
 src/hb-coretext.cc
-+++ src/hb-coretext.cc
-@@ -167,7 +167,7 @@
-   if (CFStringHasPrefix (cg_postscript_name, CFSTR (".SFNSText")) ||
-   CFStringHasPrefix (cg_postscript_name, CFSTR (".SFNSDisplay")))
-   {
--#if MAC_OS_X_VERSION_MIN_REQUIRED < 1080
-+#if !defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && 
(MAC_OS_X_VERSION_MIN_REQUIRED < 1080)
- # define kCTFontUIFontSystem kCTFontSystemFontType
- # define kCTFontUIFontEmphasizedSystem kCTFontEmphasizedSystemFontType
- #endif
-@@ -217,7 +217,7 @@
-   }
- 
-   CFURLRef original_url = nullptr;
--#if MAC_OS_X_VERSION_MIN_REQUIRED < 1060
-+#if !defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && 
(MAC_OS_X_VERSION_MIN_REQUIRED < 1060)
-   ATSFontRef atsFont;
-   FSRef fsref;
-   OSStatus

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

2018-07-29 Thread Libreoffice Gerrit user 
 download.lst  |4 ++--
 external/harfbuzz/ExternalProject_harfbuzz.mk |2 +-
 external/harfbuzz/clang-cl.patch  |6 +++---
 external/harfbuzz/ubsan.patch |   10 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

New commits:
commit b96bbb1ff391036cbba832bc22100792880f0fe6
Author: Tomaž Vajngerl 
AuthorDate: Thu Jul 19 19:28:55 2018 +0200
Commit: Caolán McNamara 
CommitDate: Sun Jul 29 16:52:59 2018 +0200

upgrade the internal harfbuzz to 1.8.4

Change-Id: I127cf3fa3ae00e91c73114e1a1915ea614924819
Reviewed-on: https://gerrit.libreoffice.org/57771
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/download.lst b/download.lst
index 9b1f4324408a..4ca0f5399c8a 100644
--- a/download.lst
+++ b/download.lst
@@ -94,8 +94,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 := 
b5d6ac8415f97f3540d73f3f91c41c5c10f8a4d76350f11a7184062aae88ac0b
-export HARFBUZZ_TARBALL := harfbuzz-1.7.4.tar.bz2
+export HARFBUZZ_SHA256SUM := 
3c592f86fa0da69e2e0e98cae9f5d5b61def3bb7948aa00ca45748f27fa545fd
+export HARFBUZZ_TARBALL := harfbuzz-1.8.4.tar.bz2
 export HSQLDB_SHA256SUM := 
d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370
 export HSQLDB_TARBALL := 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
 export HUNSPELL_SHA256SUM := 
3cd9ceb062fe5814f668e4f22b2fa6e3ba0b339b921739541ce180cac4d6f4c4
diff --git a/external/harfbuzz/ExternalProject_harfbuzz.mk 
b/external/harfbuzz/ExternalProject_harfbuzz.mk
index adc3e4c1bf59..55caa5ae0f6c 100644
--- a/external/harfbuzz/ExternalProject_harfbuzz.mk
+++ b/external/harfbuzz/ExternalProject_harfbuzz.mk
@@ -47,7 +47,7 @@ $(call gb_ExternalProject_get_state_target,harfbuzz,build) :
$(if $(ENABLE_OPTIMIZED), \

$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) \
$(if $(debug),$(gb_DEBUG_CFLAGS) 
$(gb_DEBUG_CXXFLAGS)) \
-   $(CXXFLAGS) \
+   $(CXXFLAGS) $(CXXFLAGS_CXX11) \
$(ICU_UCHAR_TYPE) \
$(if $(filter 
LINUX,$(OS)),-fvisibility=hidden)' \
&& (cd $(EXTERNAL_WORKDIR)/src && $(MAKE) lib) \
diff --git a/external/harfbuzz/clang-cl.patch b/external/harfbuzz/clang-cl.patch
index 5ba470637601..9fbeee4114d8 100644
--- a/external/harfbuzz/clang-cl.patch
+++ b/external/harfbuzz/clang-cl.patch
@@ -1,12 +1,12 @@
 --- src/hb-common.h
 +++ src/hb-common.h
-@@ -331,7 +331,9 @@
+@@ -346,7 +346,9 @@
 *
-*   http://lists.freedesktop.org/archives/harfbuzz/2014-March/004150.html
+*   https://lists.freedesktop.org/archives/harfbuzz/2014-March/004150.html
 */
 +#if !defined _MSC_VER /* avoid clang-cl -Wmicrosoft-enum-value */
_HB_SCRIPT_MAX_VALUE= HB_TAG_MAX, /*< skip 
>*/
 +#endif
_HB_SCRIPT_MAX_VALUE_SIGNED = HB_TAG_MAX_SIGNED /*< skip >*/
- 
+
  } hb_script_t;
diff --git a/external/harfbuzz/ubsan.patch b/external/harfbuzz/ubsan.patch
index c2247ef84d3e..fb299316af9d 100644
--- a/external/harfbuzz/ubsan.patch
+++ b/external/harfbuzz/ubsan.patch
@@ -1,11 +1,11 @@
 --- src/hb-ot-hmtx-table.hh
 +++ src/hb-ot-hmtx-table.hh
-@@ -143,7 +143,7 @@
- return default_advance;
+@@ -263,7 +263,7 @@ struct hmtxvmtx
+   return default_advance;
}
  
--  return table->longMetric[MIN (glyph, (uint32_t) num_advances - 
1)].advance
-+  return static_cast(table->longMetric)[MIN 
(glyph, (uint32_t) num_advances - 1)].advance
-  + var_table->get_advance_var (glyph, font->coords, 
font->num_coords); // TODO Optimize?!
+-  return table->longMetric[MIN (glyph, (uint32_t) num_advances - 
1)].advance;
++  return static_cast(table->longMetric)[MIN 
(glyph, (uint32_t) num_advances - 1)].advance;
  }
  
+ inline unsigned int get_advance (hb_codepoint_t  glyph,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-01-15 Thread Khaled Hosny 
 download.lst  |4 
 external/harfbuzz/UnpackedTarball_harfbuzz.mk |2 
 external/harfbuzz/revert-make-inert.patch |  200 --
 3 files changed, 2 insertions(+), 204 deletions(-)

New commits:
commit 3b773d5b41628c1ccf52bdd0d7962183d54c4138
Author: Khaled Hosny 
Date:   Mon Jan 15 15:22:13 2018 +0200

Upload HarfBuzz 1.7.4

Change-Id: I7dd1f87dc95d0fb190755a8742d28ef8679d7b1e
Reviewed-on: https://gerrit.libreoffice.org/47897
Tested-by: Jenkins 
Reviewed-by: Khaled Hosny 

diff --git a/download.lst b/download.lst
index f574617147c9..ae825299d6cf 100644
--- a/download.lst
+++ b/download.lst
@@ -94,8 +94,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 := 
042742d6ec67bc6719b69cf38a3fba24fbd120e207e3fdc18530dc730fb6a029
-export HARFBUZZ_TARBALL := harfbuzz-1.7.0.tar.bz2
+export HARFBUZZ_SHA256SUM := 
b5d6ac8415f97f3540d73f3f91c41c5c10f8a4d76350f11a7184062aae88ac0b
+export HARFBUZZ_TARBALL := harfbuzz-1.7.4.tar.bz2
 export HSQLDB_SHA256SUM := 
d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370
 export HSQLDB_TARBALL := 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
 export HUNSPELL_SHA256SUM := 
3cd9ceb062fe5814f668e4f22b2fa6e3ba0b339b921739541ce180cac4d6f4c4
diff --git a/external/harfbuzz/UnpackedTarball_harfbuzz.mk 
b/external/harfbuzz/UnpackedTarball_harfbuzz.mk
index 537862531bfd..8ec1c8d3ab23 100644
--- a/external/harfbuzz/UnpackedTarball_harfbuzz.mk
+++ b/external/harfbuzz/UnpackedTarball_harfbuzz.mk
@@ -17,8 +17,6 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,harfbuzz,0))
 
 $(eval $(call gb_UnpackedTarball_add_patches,harfbuzz, \
 external/harfbuzz/clang-cl.patch \
-external/harfbuzz/ubsan.patch \
-   external/harfbuzz/revert-make-inert.patch \
 ))
 
 ifneq ($(ENABLE_RUNTIME_OPTIMIZATIONS),TRUE)
diff --git a/external/harfbuzz/revert-make-inert.patch 
b/external/harfbuzz/revert-make-inert.patch
deleted file mode 100644
index 366750d87fb9..
--- a/external/harfbuzz/revert-make-inert.patch
+++ /dev/null
@@ -1,200 +0,0 @@
-From 93f7c1652a05e806c2e3ac7edf498d2f4a508a3a Mon Sep 17 00:00:00 2001
-From: Behdad Esfahbod 
-Date: Tue, 14 Nov 2017 10:59:54 -0800
-Subject: [PATCH] Revert "[glib/ucdn/icu/ft/ot] Make returned funcs inert"
-
-This reverts commit 5daf3bd4494cce6b4fb074533be9e99c4d9e0edd.
-
-If other atexit callbacks try to destruct the objects we destruct
-in atexit callbacks, bad things will happen.
-
-I'll come up with some other way to catch premature destruction
-of HB-owned objects.
-
-Fixes https://github.com/behdad/harfbuzz/issues/618

- src/hb-ft.cc |  3 ---
- src/hb-glib.cc   |  3 ---
- src/hb-icu.cc|  3 ---
- src/hb-object-private.hh | 37 ++---
- src/hb-ot-font.cc|  3 ---
- src/hb-ucdn.cc   |  3 ---
- 6 files changed, 6 insertions(+), 46 deletions(-)
-
-diff --git src/hb-ft.cc src/hb-ft.cc
-index 68c774547..0f15f8c3d 100644
 src/hb-ft.cc
-+++ src/hb-ft.cc
-@@ -423,7 +423,6 @@ static hb_font_funcs_t *static_ft_funcs = nullptr;
- static
- void free_static_ft_funcs (void)
- {
--  hb_object_undo_inert (static_ft_funcs);
-   hb_font_funcs_destroy (static_ft_funcs);
- }
- #endif
-@@ -454,10 +453,8 @@ _hb_ft_font_set_funcs (hb_font_t *font, FT_Face ft_face, 
bool unref)
- hb_font_funcs_set_glyph_from_name_func (funcs, hb_ft_get_glyph_from_name, 
nullptr, nullptr);
- 
- hb_font_funcs_make_immutable (funcs);
--hb_object_make_inert (funcs);
- 
- if (!hb_atomic_ptr_cmpexch (_ft_funcs, nullptr, funcs)) {
--  hb_object_undo_inert (funcs);
-   hb_font_funcs_destroy (funcs);
-   goto retry;
- }
-diff --git src/hb-glib.cc src/hb-glib.cc
-index 31de68e86..50c30e9c7 100644
 src/hb-glib.cc
-+++ src/hb-glib.cc
-@@ -370,7 +370,6 @@ static hb_unicode_funcs_t *static_glib_funcs = nullptr;
- static
- void free_static_glib_funcs (void)
- {
--  hb_object_undo_inert (static_glib_funcs);
-   hb_unicode_funcs_destroy (static_glib_funcs);
- }
- #endif
-@@ -391,10 +390,8 @@ hb_glib_get_unicode_funcs (void)
- #undef HB_UNICODE_FUNC_IMPLEMENT
- 
- hb_unicode_funcs_make_immutable (funcs);
--hb_object_make_inert (funcs);
- 
- if (!hb_atomic_ptr_cmpexch (_glib_funcs, nullptr, funcs)) {
--  hb_object_undo_inert (funcs);
-   hb_unicode_funcs_destroy (funcs);
-   goto retry;
- }
-diff --git src/hb-icu.cc src/hb-icu.cc
-index 44a198937..552eaeca5 100644
 src/hb-icu.cc
-+++ src/hb-icu.cc
-@@ -351,7 +351,6 @@ static hb_unicode_funcs_t *static_icu_funcs = nullptr;
- static
- void free_static_icu_funcs

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

2017-11-14 Thread Khaled Hosny 
 download.lst  |4 
 external/harfbuzz/UnpackedTarball_harfbuzz.mk |1 
 external/harfbuzz/revert-make-inert.patch |  200 ++
 3 files changed, 203 insertions(+), 2 deletions(-)

New commits:
commit 7e56dce9efa7184e522c83130dcf79d894488657
Author: Khaled Hosny 
Date:   Mon Nov 13 21:18:47 2017 +0200

tdf#105992: Upload HarfBuzz 1.7.0

This release supports old-style kern table in the code path we are using in
CommonLayout.

Change-Id: Id20e6fe1cfe98ef65b8fa4a5627f6246cbac54a6
Reviewed-on: https://gerrit.libreoffice.org/44693
Tested-by: Jenkins 
Reviewed-by: Khaled Hosny 

diff --git a/download.lst b/download.lst
index 51553c95a7fe..78bac45c9514 100644
--- a/download.lst
+++ b/download.lst
@@ -84,8 +84,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 := 
e31eb367beb61a9399d2c78b51c225ab2b1cbd46f364f2d80d97bb422b44101a
-export HARFBUZZ_TARBALL := harfbuzz-1.6.3.tar.bz2
+export HARFBUZZ_SHA256SUM := 
042742d6ec67bc6719b69cf38a3fba24fbd120e207e3fdc18530dc730fb6a029
+export HARFBUZZ_TARBALL := harfbuzz-1.7.0.tar.bz2
 export HSQLDB_SHA256SUM := 
d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370
 export HSQLDB_TARBALL := 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
 export HUNSPELL_SHA256SUM := 
3cd9ceb062fe5814f668e4f22b2fa6e3ba0b339b921739541ce180cac4d6f4c4
diff --git a/external/harfbuzz/UnpackedTarball_harfbuzz.mk 
b/external/harfbuzz/UnpackedTarball_harfbuzz.mk
index 74c990c0c1aa..537862531bfd 100644
--- a/external/harfbuzz/UnpackedTarball_harfbuzz.mk
+++ b/external/harfbuzz/UnpackedTarball_harfbuzz.mk
@@ -18,6 +18,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,harfbuzz,0))
 $(eval $(call gb_UnpackedTarball_add_patches,harfbuzz, \
 external/harfbuzz/clang-cl.patch \
 external/harfbuzz/ubsan.patch \
+   external/harfbuzz/revert-make-inert.patch \
 ))
 
 ifneq ($(ENABLE_RUNTIME_OPTIMIZATIONS),TRUE)
diff --git a/external/harfbuzz/revert-make-inert.patch 
b/external/harfbuzz/revert-make-inert.patch
new file mode 100644
index ..366750d87fb9
--- /dev/null
+++ b/external/harfbuzz/revert-make-inert.patch
@@ -0,0 +1,200 @@
+From 93f7c1652a05e806c2e3ac7edf498d2f4a508a3a Mon Sep 17 00:00:00 2001
+From: Behdad Esfahbod 
+Date: Tue, 14 Nov 2017 10:59:54 -0800
+Subject: [PATCH] Revert "[glib/ucdn/icu/ft/ot] Make returned funcs inert"
+
+This reverts commit 5daf3bd4494cce6b4fb074533be9e99c4d9e0edd.
+
+If other atexit callbacks try to destruct the objects we destruct
+in atexit callbacks, bad things will happen.
+
+I'll come up with some other way to catch premature destruction
+of HB-owned objects.
+
+Fixes https://github.com/behdad/harfbuzz/issues/618
+---
+ src/hb-ft.cc |  3 ---
+ src/hb-glib.cc   |  3 ---
+ src/hb-icu.cc|  3 ---
+ src/hb-object-private.hh | 37 ++---
+ src/hb-ot-font.cc|  3 ---
+ src/hb-ucdn.cc   |  3 ---
+ 6 files changed, 6 insertions(+), 46 deletions(-)
+
+diff --git src/hb-ft.cc src/hb-ft.cc
+index 68c774547..0f15f8c3d 100644
+--- src/hb-ft.cc
 src/hb-ft.cc
+@@ -423,7 +423,6 @@ static hb_font_funcs_t *static_ft_funcs = nullptr;
+ static
+ void free_static_ft_funcs (void)
+ {
+-  hb_object_undo_inert (static_ft_funcs);
+   hb_font_funcs_destroy (static_ft_funcs);
+ }
+ #endif
+@@ -454,10 +453,8 @@ _hb_ft_font_set_funcs (hb_font_t *font, FT_Face ft_face, 
bool unref)
+ hb_font_funcs_set_glyph_from_name_func (funcs, hb_ft_get_glyph_from_name, 
nullptr, nullptr);
+ 
+ hb_font_funcs_make_immutable (funcs);
+-hb_object_make_inert (funcs);
+ 
+ if (!hb_atomic_ptr_cmpexch (_ft_funcs, nullptr, funcs)) {
+-  hb_object_undo_inert (funcs);
+   hb_font_funcs_destroy (funcs);
+   goto retry;
+ }
+diff --git src/hb-glib.cc src/hb-glib.cc
+index 31de68e86..50c30e9c7 100644
+--- src/hb-glib.cc
 src/hb-glib.cc
+@@ -370,7 +370,6 @@ static hb_unicode_funcs_t *static_glib_funcs = nullptr;
+ static
+ void free_static_glib_funcs (void)
+ {
+-  hb_object_undo_inert (static_glib_funcs);
+   hb_unicode_funcs_destroy (static_glib_funcs);
+ }
+ #endif
+@@ -391,10 +390,8 @@ hb_glib_get_unicode_funcs (void)
+ #undef HB_UNICODE_FUNC_IMPLEMENT
+ 
+ hb_unicode_funcs_make_immutable (funcs);
+-hb_object_make_inert (funcs);
+ 
+ if (!hb_atomic_ptr_cmpexch (_glib_funcs, nullptr, funcs)) {
+-  hb_object_undo_inert (funcs);
+   hb_unicode_funcs_destroy (funcs);
+   goto retry;
+ }
+diff --git src/hb-icu.cc src/hb-icu.cc
+index 44a198937..552eaeca5 100644
+--- src/hb-icu.cc
 src/hb-icu.cc
+@@ -351,7

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

2017-11-09 Thread David Tardon 
 download.lst  |4 +--
 external/harfbuzz/UnpackedTarball_harfbuzz.mk |1 
 external/harfbuzz/ubsan.patch |   32 --
 3 files changed, 2 insertions(+), 35 deletions(-)

New commits:
commit 945c10f42fe6d22031e7424b47481ac2cfb539be
Author: David Tardon 
Date:   Wed Nov 8 19:54:16 2017 +0100

upload harfbuzz 1.6.3

Change-Id: Ib9920366ba32774d1e96f9dfde201975c322e6f5
Reviewed-on: https://gerrit.libreoffice.org/44540
Tested-by: Jenkins 
Reviewed-by: David Tardon 

diff --git a/download.lst b/download.lst
index 2ca97abe6764..021ad87c0ada 100644
--- a/download.lst
+++ b/download.lst
@@ -82,8 +82,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 := 
ccec4930ff0bb2d0c40aee203075447954b64a8c2695202413cc5e428c907131
-export HARFBUZZ_TARBALL := harfbuzz-1.4.8.tar.bz2
+export HARFBUZZ_SHA256SUM := 
e31eb367beb61a9399d2c78b51c225ab2b1cbd46f364f2d80d97bb422b44101a
+export HARFBUZZ_TARBALL := harfbuzz-1.6.3.tar.bz2
 export HSQLDB_SHA256SUM := 
d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370
 export HSQLDB_TARBALL := 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
 export HUNSPELL_SHA256SUM := 
3cd9ceb062fe5814f668e4f22b2fa6e3ba0b339b921739541ce180cac4d6f4c4
diff --git a/external/harfbuzz/UnpackedTarball_harfbuzz.mk 
b/external/harfbuzz/UnpackedTarball_harfbuzz.mk
index 74c990c0c1aa..8ec1c8d3ab23 100644
--- a/external/harfbuzz/UnpackedTarball_harfbuzz.mk
+++ b/external/harfbuzz/UnpackedTarball_harfbuzz.mk
@@ -17,7 +17,6 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,harfbuzz,0))
 
 $(eval $(call gb_UnpackedTarball_add_patches,harfbuzz, \
 external/harfbuzz/clang-cl.patch \
-external/harfbuzz/ubsan.patch \
 ))
 
 ifneq ($(ENABLE_RUNTIME_OPTIMIZATIONS),TRUE)
diff --git a/external/harfbuzz/ubsan.patch b/external/harfbuzz/ubsan.patch
deleted file mode 100644
index b855d5f2140d..
--- a/external/harfbuzz/ubsan.patch
+++ /dev/null
@@ -1,32 +0,0 @@
 src/hb-ot-font.cc
-+++ src/hb-ot-font.cc
-@@ -138,7 +138,7 @@
-   return this->default_advance;
- }
- 
--return this->table->longMetric[MIN (glyph, (uint32_t) this->num_advances 
- 1)].advance
-+return static_cast(this->table->longMetric)[MIN 
(glyph, (uint32_t) this->num_advances - 1)].advance
-+ this->var->get_advance_var (glyph, font->coords, font->num_coords); 
// TODO Optimize?!
-   }
- };
-@@ -458,8 +458,9 @@
- }
- 
- static void
--_hb_ot_font_destroy (hb_ot_font_t *ot_font)
-+_hb_ot_font_destroy (void *ot_font_)
- {
-+  hb_ot_font_t *ot_font = static_cast(ot_font_);
-   ot_font->cmap.fini ();
-   ot_font->h_metrics.fini ();
-   ot_font->v_metrics.fini ();
 src/hb-private.hh
-+++ src/hb-private.hh
-@@ -461,6 +461,7 @@
-   template 
-   inline const Type *bsearch (T *key) const
-   {
-+if (len == 0) return NULL;
- return (const Type *) ::bsearch (key, array, len, sizeof (Type), 
(hb_compare_func_t) Type::cmp);
-   }
- 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-05-09 Thread Khaled Hosny 
 download.lst  |4 -
 external/harfbuzz/ExternalProject_harfbuzz.mk |2 
 external/harfbuzz/UnpackedTarball_harfbuzz.mk |4 -
 external/harfbuzz/ubsan.patch |   86 --
 4 files changed, 4 insertions(+), 92 deletions(-)

New commits:
commit 3acb1d4b28944de908ffb3d0b756725ae015214f
Author: Khaled Hosny khaledho...@eglug.org
Date:   Wed May 6 12:59:15 2015 +0200

Update HarfBuzz to 0.9.40

Most of ubsan.patch seems to have been applied upstream, and I can’t
reproduce the issue referenced for the remaining bits, anyway it is
better to push such changes upstream first.

Change-Id: Ie56786c01c06d3542052cd91e36d1f707092beba
Reviewed-on: https://gerrit.libreoffice.org/15643
Tested-by: Jenkins c...@libreoffice.org
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/download.lst b/download.lst
index 7c0b781..01ed4cf 100644
--- a/download.lst
+++ b/download.lst
@@ -60,8 +60,8 @@ export GLEW_TARBALL := 
594eb47b4b1210e25438d51825404d5a-glew-1.10.0.zip
 export GLM_TARBALL := 
bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip
 export GRAPHITE_MD5SUM := 2ef839348fe28e3b923bf8cced440227
 export GRAPHITE_TARBALL := graphite2-1.2.4.tgz
-export HARFBUZZ_MD5SUM := a4a9b548577e2ee22f0887937da5fd6c
-export HARFBUZZ_TARBALL := harfbuzz-0.9.23.tar.bz2
+export HARFBUZZ_MD5SUM := 0e27e531f4c4acff601ebff0957755c2
+export HARFBUZZ_TARBALL := harfbuzz-0.9.40.tar.bz2
 export HSQLDB_TARBALL := 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
 export HUNSPELL_TARBALL := 
4967da60b23413604c9e563beacc63b4-hunspell-1.3.3.tar.gz
 export HYPHEN_TARBALL := 5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz
diff --git a/external/harfbuzz/ExternalProject_harfbuzz.mk 
b/external/harfbuzz/ExternalProject_harfbuzz.mk
index 2514124..302eed7 100644
--- a/external/harfbuzz/ExternalProject_harfbuzz.mk
+++ b/external/harfbuzz/ExternalProject_harfbuzz.mk
@@ -25,11 +25,13 @@ $(call gb_ExternalProject_get_state_target,harfbuzz,build) :
./configure \
--enable-static \
--disable-shared \
+   --disable-gtk-doc \
--with-pic \
--with-icu=yes \
--with-freetype=no \
--with-cairo=no \
--with-glib=no \
+   $(if 
$(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)) \
 (cd $(EXTERNAL_WORKDIR)/src  $(MAKE)) \
)
diff --git a/external/harfbuzz/UnpackedTarball_harfbuzz.mk 
b/external/harfbuzz/UnpackedTarball_harfbuzz.mk
index 9a5560f..5450a81 100644
--- a/external/harfbuzz/UnpackedTarball_harfbuzz.mk
+++ b/external/harfbuzz/UnpackedTarball_harfbuzz.mk
@@ -13,10 +13,6 @@ $(eval $(call 
gb_UnpackedTarball_set_tarball,harfbuzz,$(HARFBUZZ_TARBALL),,harfb
 
 $(eval $(call gb_UnpackedTarball_set_patchlevel,harfbuzz,0))
 
-$(eval $(call gb_UnpackedTarball_add_patches,harfbuzz, \
-external/harfbuzz/ubsan.patch \
-))
-
 ifneq ($(ENABLE_RUNTIME_OPTIMIZATIONS),TRUE)
 $(eval $(call gb_UnpackedTarball_add_patches,harfbuzz, \
 external/harfbuzz/harfbuzz-rtti.patch \
diff --git a/external/harfbuzz/ubsan.patch b/external/harfbuzz/ubsan.patch
deleted file mode 100644
index 6c301c4..000
--- a/external/harfbuzz/ubsan.patch
+++ /dev/null
@@ -1,86 +0,0 @@
 src/hb-object-private.hh
-+++ src/hb-object-private.hh
-@@ -131,7 +131,7 @@
-   }
- 
-   inline bool destroy (void) {
--if (unlikely (!this || this-is_inert ()))
-+if (unlikely (is_inert ()))
-   return false;
- if (ref_count.dec () != 1)
-   return false;
-@@ -160,13 +160,12 @@
-   }
- 
-   inline void trace (const char *function) const {
--if (unlikely (!this)) return;
- /* TODO We cannot use DEBUG_MSG_FUNC here since that one currently only
-  * prints the class name and throws away the template info. */
- DEBUG_MSG (OBJECT, (void *) this,
-  %s refcount=%d,
-  function,
-- this ? ref_count.ref_count : 0);
-+ ref_count.ref_count);
-   }
- 
-   private:
-@@ -179,7 +179,7 @@
- template typename Type
- static inline void hb_object_trace (const Type *obj, const char *function)
- {
--  obj-header.trace (function);
-+  if (likely (obj)) obj-header.trace (function);
- }
- template typename Type
- static inline Type *hb_object_create (void)
-@@ -204,7 +204,7 @@
- static inline bool hb_object_destroy (Type *obj)
- {
-   hb_object_trace (obj, HB_FUNC);
--  return obj-header.destroy ();
-+  return likely (obj)  obj-header.destroy ();
- }
- template typename Type
- static inline bool hb_object_set_user_data (Type   *obj,
 src/hb-ot-map-private.hh
-+++ src/hb-ot-map-private.hh
-@@