Merge remote-tracking branch 'origin/3.6' into 3.7

harfbuzz/.signature

@@ -1,5 +1,6 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/XJ4DhUx5YPRHHU93LYKx0TrXOoheLHfQqKs3tzxst8pCc0mikkah75XjwBUNPxbiIot/YGuXCPwVW/ajT1LwwA=
-SHA256 (Pkgfile) = f64bf211bd092ff360e12736acbf79ec64306931a815a7c200aefc60ce006ba5
+RWSE3ohX2g5d/aOopB5ZLwxFxGvd16xrPIckc4reIVK0TbGMLFboDCHVyklB4cPB2lRW756AkxhNoYKSVm0UziG3K+gkfuO/gwg=
+SHA256 (Pkgfile) = e96c85de934ce68085cef5e2f71c7e59cfc2b9566d8a343035710d02a74b9cc5
 SHA256 (.footprint) = a50a5bf4407a6a7891d526491d7b8f6a30458aa04cf3feb47786191b9b4a172a
 SHA256 (harfbuzz-5.0.1.tar.xz) = d0094299a36346b9f5540aa159b358425c022b19fcdf72165eaf94046a179166
+SHA256 (bitmap-font.patch) = 96a1b62a0199f7e432160e881adc5ec427a0de56c718068751362ee86b8ae15d

harfbuzz/Pkgfile

@@ -6,10 +6,13 @@
 
 name=harfbuzz
 version=5.0.1
-release=1
-source=(https://github.com/harfbuzz/harfbuzz/releases/download/$version/$name-$version.tar.xz)
+release=2
+source=(https://github.com/harfbuzz/harfbuzz/releases/download/$version/$name-$version.tar.xz
+	bitmap-font.patch)
 
 build() {
+	patch -Np1 -d $name-$version -i $SRC/bitmap-font.patch
+
 	meson setup build $name-$version \
 		--prefix=/usr \
 		--buildtype=plain \

harfbuzz/bitmap-font.patch

@@ -0,0 +1,25 @@
+From 1ac21246a751031823179377c3eef7ed3d4d5686 Mon Sep 17 00:00:00 2001
+From: Behdad Esfahbod <behdad@behdad.org>
+Date: Mon, 25 Jul 2022 08:40:02 -0600
+Subject: [PATCH] [hb-ft] Fix bitmap font rendering with hb_ft_font_changed()
+
+Fixes https://github.com/harfbuzz/harfbuzz/issues/3754
+Fixes https://github.com/harfbuzz/harfbuzz/issues/3755
+---
+ src/hb-ft.cc | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/hb-ft.cc b/src/hb-ft.cc
+index 5c88a7f3bd..ef073475cb 100644
+--- a/src/hb-ft.cc
++++ b/src/hb-ft.cc
+@@ -1086,7 +1086,8 @@ hb_ft_font_changed (hb_font_t *font)
+   }
+ #endif
+ 
+-  _hb_ft_hb_font_check_changed (font, ft_font);
++  ft_font->advance_cache.clear ();
++  ft_font->cached_serial = font->serial;
+ }
+ 
+ /**