From 575fe22979e13f151533ee422f932d8e96aa115b Mon Sep 17 00:00:00 2001
From: Tee KOBAYASHI <xtkoba@gmail.com>
Date: Sun, 12 Feb 2023 16:04:33 +0900
Subject: [PATCH] harfbuzz: Bump to 7.0.0

---
 packages/harfbuzz/build.sh                    |  9 ++-
 .../gir/{6.0.0 => 7.0.0}/HarfBuzz-0.0.xml     | 67 ++++++++++++++++++-
 packages/harfbuzz/harfbuzz-icu.subpackage.sh  |  8 ++-
 .../harfbuzz/harfbuzz-utils.subpackage.sh     |  1 -
 4 files changed, 79 insertions(+), 6 deletions(-)
 rename packages/harfbuzz/gir/{6.0.0 => 7.0.0}/HarfBuzz-0.0.xml (93%)

diff --git a/packages/harfbuzz/build.sh b/packages/harfbuzz/build.sh
index 4c021e61db..f3797b6fc2 100644
--- a/packages/harfbuzz/build.sh
+++ b/packages/harfbuzz/build.sh
@@ -2,11 +2,11 @@ TERMUX_PKG_HOMEPAGE=https://www.freedesktop.org/wiki/Software/HarfBuzz/
 TERMUX_PKG_DESCRIPTION="OpenType text shaping engine"
 TERMUX_PKG_LICENSE="MIT"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=6.0.0
+TERMUX_PKG_VERSION=7.0.0
 TERMUX_PKG_SRCURL=https://github.com/harfbuzz/harfbuzz/archive/${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=6d753948587db3c7c3ba8cc4f8e6bf83f5c448d2591a9f7ec306467f3a4fe4fa
+TERMUX_PKG_SHA256=770dace6561ae11de5838e5dc0ec5e95978b2c029aaee00389856a7ca65b43d9
 TERMUX_PKG_AUTO_UPDATE=false
-TERMUX_PKG_DEPENDS="freetype, glib, libbz2, libc++, libpng, libgraphite"
+TERMUX_PKG_DEPENDS="freetype, glib, libcairo, libgraphite"
 TERMUX_PKG_BUILD_DEPENDS="g-ir-scanner"
 TERMUX_PKG_BREAKS="harfbuzz-dev"
 TERMUX_PKG_REPLACES="harfbuzz-dev"
@@ -16,6 +16,9 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -Dgraphite=enabled
 -Dintrospection=enabled
 "
+TERMUX_PKG_RM_AFTER_INSTALL="
+share/gtk-doc
+"
 
 termux_step_post_get_source() {
 	mv CMakeLists.txt CMakeLists.txt.unused
diff --git a/packages/harfbuzz/gir/6.0.0/HarfBuzz-0.0.xml b/packages/harfbuzz/gir/7.0.0/HarfBuzz-0.0.xml
similarity index 93%
rename from packages/harfbuzz/gir/6.0.0/HarfBuzz-0.0.xml
rename to packages/harfbuzz/gir/7.0.0/HarfBuzz-0.0.xml
index 1f304c3258..c7c15aeac2 100644
--- a/packages/harfbuzz/gir/6.0.0/HarfBuzz-0.0.xml
+++ b/packages/harfbuzz/gir/7.0.0/HarfBuzz-0.0.xml
@@ -641,10 +641,70 @@
     <member name="HB_OT_METRICS_TAG_STRIKEOUT_OFFSET" nick="strikeout-offset" value="1937011311"/>
     <member name="HB_OT_METRICS_TAG_UNDERLINE_SIZE" nick="underline-size" value="1970168947"/>
     <member name="HB_OT_METRICS_TAG_UNDERLINE_OFFSET" nick="underline-offset" value="1970168943"/>
+  </enum>  <enum name="hb_ot_name_id_predefined_t" get-type="hb_gobject_ot_name_id_predefined_get_type">
+    <member name="HB_OT_NAME_ID_COPYRIGHT" nick="copyright" value="0"/>
+    <member name="HB_OT_NAME_ID_FONT_FAMILY" nick="font-family" value="1"/>
+    <member name="HB_OT_NAME_ID_FONT_SUBFAMILY" nick="font-subfamily" value="2"/>
+    <member name="HB_OT_NAME_ID_UNIQUE_ID" nick="unique-id" value="3"/>
+    <member name="HB_OT_NAME_ID_FULL_NAME" nick="full-name" value="4"/>
+    <member name="HB_OT_NAME_ID_VERSION_STRING" nick="version-string" value="5"/>
+    <member name="HB_OT_NAME_ID_POSTSCRIPT_NAME" nick="postscript-name" value="6"/>
+    <member name="HB_OT_NAME_ID_TRADEMARK" nick="trademark" value="7"/>
+    <member name="HB_OT_NAME_ID_MANUFACTURER" nick="manufacturer" value="8"/>
+    <member name="HB_OT_NAME_ID_DESIGNER" nick="designer" value="9"/>
+    <member name="HB_OT_NAME_ID_DESCRIPTION" nick="description" value="10"/>
+    <member name="HB_OT_NAME_ID_VENDOR_URL" nick="vendor-url" value="11"/>
+    <member name="HB_OT_NAME_ID_DESIGNER_URL" nick="designer-url" value="12"/>
+    <member name="HB_OT_NAME_ID_LICENSE" nick="license" value="13"/>
+    <member name="HB_OT_NAME_ID_LICENSE_URL" nick="license-url" value="14"/>
+    <member name="HB_OT_NAME_ID_TYPOGRAPHIC_FAMILY" nick="typographic-family" value="16"/>
+    <member name="HB_OT_NAME_ID_TYPOGRAPHIC_SUBFAMILY" nick="typographic-subfamily" value="17"/>
+    <member name="HB_OT_NAME_ID_MAC_FULL_NAME" nick="mac-full-name" value="18"/>
+    <member name="HB_OT_NAME_ID_SAMPLE_TEXT" nick="sample-text" value="19"/>
+    <member name="HB_OT_NAME_ID_CID_FINDFONT_NAME" nick="cid-findfont-name" value="20"/>
+    <member name="HB_OT_NAME_ID_WWS_FAMILY" nick="wws-family" value="21"/>
+    <member name="HB_OT_NAME_ID_WWS_SUBFAMILY" nick="wws-subfamily" value="22"/>
+    <member name="HB_OT_NAME_ID_LIGHT_BACKGROUND" nick="light-background" value="23"/>
+    <member name="HB_OT_NAME_ID_DARK_BACKGROUND" nick="dark-background" value="24"/>
+    <member name="HB_OT_NAME_ID_VARIATIONS_PS_PREFIX" nick="variations-ps-prefix" value="25"/>
+    <member name="HB_OT_NAME_ID_INVALID" nick="invalid" value="65535"/>
   </enum>  <flags name="hb_ot_var_axis_flags_t" get-type="hb_gobject_ot_var_axis_flags_get_type">
     <member name="HB_OT_VAR_AXIS_FLAG_HIDDEN" nick="hidden" value="1"/>
   </flags>
-  <enum name="hb_style_tag_t" get-type="hb_gobject_style_tag_get_type">
+  <enum name="hb_paint_extend_t" get-type="hb_gobject_paint_extend_get_type">
+    <member name="HB_PAINT_EXTEND_PAD" nick="pad" value="0"/>
+    <member name="HB_PAINT_EXTEND_REPEAT" nick="repeat" value="1"/>
+    <member name="HB_PAINT_EXTEND_REFLECT" nick="reflect" value="2"/>
+  </enum>  <enum name="hb_paint_composite_mode_t" get-type="hb_gobject_paint_composite_mode_get_type">
+    <member name="HB_PAINT_COMPOSITE_MODE_CLEAR" nick="clear" value="0"/>
+    <member name="HB_PAINT_COMPOSITE_MODE_SRC" nick="src" value="1"/>
+    <member name="HB_PAINT_COMPOSITE_MODE_DEST" nick="dest" value="2"/>
+    <member name="HB_PAINT_COMPOSITE_MODE_SRC_OVER" nick="src-over" value="3"/>
+    <member name="HB_PAINT_COMPOSITE_MODE_DEST_OVER" nick="dest-over" value="4"/>
+    <member name="HB_PAINT_COMPOSITE_MODE_SRC_IN" nick="src-in" value="5"/>
+    <member name="HB_PAINT_COMPOSITE_MODE_DEST_IN" nick="dest-in" value="6"/>
+    <member name="HB_PAINT_COMPOSITE_MODE_SRC_OUT" nick="src-out" value="7"/>
+    <member name="HB_PAINT_COMPOSITE_MODE_DEST_OUT" nick="dest-out" value="8"/>
+    <member name="HB_PAINT_COMPOSITE_MODE_SRC_ATOP" nick="src-atop" value="9"/>
+    <member name="HB_PAINT_COMPOSITE_MODE_DEST_ATOP" nick="dest-atop" value="10"/>
+    <member name="HB_PAINT_COMPOSITE_MODE_XOR" nick="xor" value="11"/>
+    <member name="HB_PAINT_COMPOSITE_MODE_PLUS" nick="plus" value="12"/>
+    <member name="HB_PAINT_COMPOSITE_MODE_SCREEN" nick="screen" value="13"/>
+    <member name="HB_PAINT_COMPOSITE_MODE_OVERLAY" nick="overlay" value="14"/>
+    <member name="HB_PAINT_COMPOSITE_MODE_DARKEN" nick="darken" value="15"/>
+    <member name="HB_PAINT_COMPOSITE_MODE_LIGHTEN" nick="lighten" value="16"/>
+    <member name="HB_PAINT_COMPOSITE_MODE_COLOR_DODGE" nick="color-dodge" value="17"/>
+    <member name="HB_PAINT_COMPOSITE_MODE_COLOR_BURN" nick="color-burn" value="18"/>
+    <member name="HB_PAINT_COMPOSITE_MODE_HARD_LIGHT" nick="hard-light" value="19"/>
+    <member name="HB_PAINT_COMPOSITE_MODE_SOFT_LIGHT" nick="soft-light" value="20"/>
+    <member name="HB_PAINT_COMPOSITE_MODE_DIFFERENCE" nick="difference" value="21"/>
+    <member name="HB_PAINT_COMPOSITE_MODE_EXCLUSION" nick="exclusion" value="22"/>
+    <member name="HB_PAINT_COMPOSITE_MODE_MULTIPLY" nick="multiply" value="23"/>
+    <member name="HB_PAINT_COMPOSITE_MODE_HSL_HUE" nick="hsl-hue" value="24"/>
+    <member name="HB_PAINT_COMPOSITE_MODE_HSL_SATURATION" nick="hsl-saturation" value="25"/>
+    <member name="HB_PAINT_COMPOSITE_MODE_HSL_COLOR" nick="hsl-color" value="26"/>
+    <member name="HB_PAINT_COMPOSITE_MODE_HSL_LUMINOSITY" nick="hsl-luminosity" value="27"/>
+  </enum>  <enum name="hb_style_tag_t" get-type="hb_gobject_style_tag_get_type">
     <member name="HB_STYLE_TAG_ITALIC" nick="italic" value="1769234796"/>
     <member name="HB_STYLE_TAG_OPTICAL_SIZE" nick="optical-size" value="1869640570"/>
     <member name="HB_STYLE_TAG_SLANT_ANGLE" nick="slant-angle" value="1936486004"/>
@@ -743,6 +803,7 @@
   </enum>  <boxed name="hb_blob_t" get-type="hb_gobject_blob_get_type"/>
   <boxed name="hb_buffer_t" get-type="hb_gobject_buffer_get_type"/>
   <boxed name="hb_draw_funcs_t" get-type="hb_gobject_draw_funcs_get_type"/>
+  <boxed name="hb_paint_funcs_t" get-type="hb_gobject_paint_funcs_get_type"/>
   <boxed name="hb_face_t" get-type="hb_gobject_face_get_type"/>
   <boxed name="hb_font_t" get-type="hb_gobject_font_get_type"/>
   <boxed name="hb_font_funcs_t" get-type="hb_gobject_font_funcs_get_type"/>
@@ -754,7 +815,11 @@
   <boxed name="hb_glyph_info_t" get-type="hb_gobject_glyph_info_get_type"/>
   <boxed name="hb_glyph_position_t" get-type="hb_gobject_glyph_position_get_type"/>
   <boxed name="hb_segment_properties_t" get-type="hb_gobject_segment_properties_get_type"/>
+  <boxed name="hb_draw_state_t" get-type="hb_gobject_draw_state_get_type"/>
+  <boxed name="hb_color_stop_t" get-type="hb_gobject_color_stop_get_type"/>
+  <boxed name="hb_color_line_t" get-type="hb_gobject_color_line_get_type"/>
   <boxed name="hb_user_data_key_t" get-type="hb_gobject_user_data_key_get_type"/>
+  <boxed name="hb_ot_var_axis_info_t" get-type="hb_gobject_ot_var_axis_info_get_type"/>
   <boxed name="hb_ot_math_glyph_variant_t" get-type="hb_gobject_ot_math_glyph_variant_get_type"/>
   <boxed name="hb_ot_math_glyph_part_t" get-type="hb_gobject_ot_math_glyph_part_get_type"/>
 </dump>
diff --git a/packages/harfbuzz/harfbuzz-icu.subpackage.sh b/packages/harfbuzz/harfbuzz-icu.subpackage.sh
index bd87412926..2c3108fc2e 100644
--- a/packages/harfbuzz/harfbuzz-icu.subpackage.sh
+++ b/packages/harfbuzz/harfbuzz-icu.subpackage.sh
@@ -1,3 +1,9 @@
-TERMUX_SUBPKG_INCLUDE="lib/libharfbuzz-icu*"
+TERMUX_SUBPKG_INCLUDE="
+include/harfbuzz/hb-icu.h
+lib/libharfbuzz-icu*
+lib/pkgconfig/harfbuzz-icu.pc
+"
 TERMUX_SUBPKG_DESCRIPTION="OpenType text shaping engine ICU backend"
 TERMUX_SUBPKG_DEPENDS="libicu"
+TERMUX_SUBPKG_BREAKS="harfbuzz (<< 7.0.0)"
+TERMUX_SUBPKG_REPLACES="harfbuzz (<< 7.0.0)"
diff --git a/packages/harfbuzz/harfbuzz-utils.subpackage.sh b/packages/harfbuzz/harfbuzz-utils.subpackage.sh
index 2043c06ee1..3c9a726ddf 100644
--- a/packages/harfbuzz/harfbuzz-utils.subpackage.sh
+++ b/packages/harfbuzz/harfbuzz-utils.subpackage.sh
@@ -1,3 +1,2 @@
 TERMUX_SUBPKG_INCLUDE="bin/"
 TERMUX_SUBPKG_DESCRIPTION="Tools using the harfbuzz library"
-TERMUX_SUBPKG_DEPENDS="libcairo, fontconfig, liblzma, libpixman, libxml2"