commit 164c0f1eb5165786e0addfe5317cf6de3061ddf9 Author: Christian Persch Date: Sat Mar 11 11:19:11 2023 +0100 fonts: Keep the PangoLayout unchanged The previous commit still wasn't completely fixing the problem, since the FontInfo and the UnistrInfo are cached too, and m_layout will be re-used when creating the next UnistrInfo, but the code in pango_cairo_show_layout_line() requires the PangoLayout to still have the same text as when it was created for the UnistrInfo. To fix this, adopt the PangoLayout into the PangoLayoutLine cached in the UnistrInfo, and create a new layout for next use. Fixes: https://gitlab.gnome.org/GNOME/vte/-/issues/2606 Fixes: https://gitlab.gnome.org/GNOME/vte/-/issues/2620 (cherry picked from commit 3c8f66be867aca6656e4109ce880b6ea7431b895) Fixes: https://gitlab.gnome.org/Teams/Releng/freeze-breaks/-/issues/131 src/fonts-pangocairo.cc | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) commit 0dc3dbae6cf71ee3f0efb1f31b8fd3eda7c150dd Author: Christian Hergert Date: Sat Mar 11 11:19:11 2023 +0100 fonts: keep layout text available for cairo When a cairo recording surface is used, it will memcpy() the text and therefore expects the layout's text to be complete enough to contain each glyph item's offset from base pointer. This keeps that text around long enough to satisfy that requirement. It will be reset on the next operation/call to get_unistr_info(). Fixes #2620 (cherry picked from commit 22b3a562d5c95f5911560131c9f6f2df70881e34) Fixes: https://gitlab.gnome.org/Teams/Releng/freeze-breaks/-/issues/131 src/fonts-pangocairo.cc | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) commit 293cd2f7d61ba869c64cf069db72b85ca4395937 Author: Christian Persch Date: Sat Mar 4 22:21:40 2023 +0100 build: Post release version bump meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)