Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qt6-base for openSUSE:Factory checked in at 2026-05-10 16:47:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt6-base (Old) and /work/SRC/openSUSE:Factory/.qt6-base.new.1966 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt6-base" Sun May 10 16:47:06 2026 rev:82 rq:1352008 version:6.11.0 Changes: -------- --- /work/SRC/openSUSE:Factory/qt6-base/qt6-base.changes 2026-04-04 19:04:08.317059439 +0200 +++ /work/SRC/openSUSE:Factory/.qt6-base.new.1966/qt6-base.changes 2026-05-10 16:47:25.802583404 +0200 @@ -1,0 +2,11 @@ +Fri May 8 11:19:47 UTC 2026 - Christophe Marin <[email protected]> + +- Add upstream fix (QTBUG-145310, kde#518105): + * 0001-freetype-Handle-failing-glyph-rendering.patch + +------------------------------------------------------------------- +Fri May 8 07:25:18 UTC 2026 - Christophe Marin <[email protected]> + +- Also use GCC 15 on Leap 16.1 + +------------------------------------------------------------------- New: ---- 0001-freetype-Handle-failing-glyph-rendering.patch ----------(New B)---------- New:- Add upstream fix (QTBUG-145310, kde#518105): * 0001-freetype-Handle-failing-glyph-rendering.patch ----------(New E)---------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt6-base.spec ++++++ --- /var/tmp/diff_new_pack.HIhFue/_old 2026-05-10 16:47:26.638617618 +0200 +++ /var/tmp/diff_new_pack.HIhFue/_new 2026-05-10 16:47:26.642617782 +0200 @@ -44,6 +44,7 @@ # Patches 0-100 are upstream patches # Patch0: 0001-Do-not-persist-unicode-error-state-across-dirents.patch Patch1: 0001-Ensure-custom-types-are-normalized.patch +Patch2: 0001-freetype-Handle-failing-glyph-rendering.patch # Patches 100-200 are openSUSE and/or non-upstream(able) patches # # No need to pollute the library dir with object files, install them in the qt6 subfolder Patch100: 0001-CMake-Install-objects-files-into-ARCHDATADIR.patch @@ -61,7 +62,7 @@ BuildRequires: gcc14-PIE BuildRequires: gcc14-c++ %endif -%if 0%{?suse_version} == 1600 +%if 0%{?suse_version} >= 1600 && 0%{?suse_version} < 1699 BuildRequires: gcc15-PIE BuildRequires: gcc15-c++ %endif @@ -74,7 +75,7 @@ BuildRequires: pcre2-devel BuildRequires: perl BuildRequires: pkgconfig -BuildRequires: qt6-macros +BuildRequires: qt6-macros >= 20260508 %ifnarch ppc64le s390x %if 0%{?suse_version} >= 1699 # Not available in Leap 15 nor 16, and fails to build for ppc and s390x @@ -203,7 +204,7 @@ Requires: cmake Requires: gcc-c++ Requires: pkgconfig -Requires: qt6-macros +Requires: qt6-macros >= 20260508 # qtpaths moved from qt6-tools to qt6-base with Qt 6.2 Provides: qt6-tools-qtpaths = 6.2.0 Obsoletes: qt6-tools-qtpaths < 6.2.0 @@ -258,7 +259,7 @@ Requires: gcc14-PIE Requires: gcc14-c++ %endif -%if 0%{?suse_version} == 1600 +%if 0%{?suse_version} >= 1600 && 0%{?suse_version} < 1699 Requires: gcc15-PIE Requires: gcc15-c++ %endif @@ -811,7 +812,7 @@ %if 0%{?suse_version} == 1500 %patch -p1 -P 201 %endif -%if 0%{?suse_version} == 1600 +%if 0%{?suse_version} >= 1600 && 0%{?suse_version} < 1699 %patch -p1 -P 202 %endif ++++++ 0001-freetype-Handle-failing-glyph-rendering.patch ++++++ >From 1466f88633b2c29a6159a0c2eacd0c0d6601aa5e Mon Sep 17 00:00:00 2001 From: David Edmundson <[email protected]> Date: Wed, 25 Mar 2026 15:32:10 +0000 Subject: [PATCH] freetype: Handle failing glyph rendering When FT_Render_Glpyh fails the slot returns a bitmap containing a valid width and height but a null buffer. When we eventually memcpy this buffer we will crash. Existing error handling in this method returns null on errors. Pick-to: 6.10 6.8 Fixes: QTBUG-145310 Change-Id: I4737ab4d769b52f42bd1ef9037c8b9fd681a4ae8 Reviewed-by: Eskil Abrahamsen Blomfeldt <[email protected]> (cherry picked from commit 1b4f4b1797bc7db3eea6ef83a34df61d7bf78e17) Reviewed-by: Qt Cherry-pick Bot <[email protected]> --- src/gui/text/freetype/qfontengine_ft.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/gui/text/freetype/qfontengine_ft.cpp b/src/gui/text/freetype/qfontengine_ft.cpp index e331a4cc815..371e01db590 100644 --- a/src/gui/text/freetype/qfontengine_ft.cpp +++ b/src/gui/text/freetype/qfontengine_ft.cpp @@ -1955,11 +1955,13 @@ QFontEngineFT::Glyph *QFontEngineFT::loadGlyph(QGlyphSet *set, uint glyph, FT_Library_SetLcdFilter(slot->library, (FT_LcdFilter)lcdFilterType); err = FT_Render_Glyph(slot, renderMode); - if (err != FT_Err_Ok) - qWarning("render glyph failed err=%x face=%p, glyph=%d", err, face, glyph); - FT_Library_SetLcdFilter(slot->library, FT_LCD_FILTER_NONE); + if (err != FT_Err_Ok) { + qWarning("render glyph failed err=%x face=%p, glyph=%d", err, face, glyph); + return nullptr; + } + info.height = slot->bitmap.rows; info.width = slot->bitmap.width; info.x = slot->bitmap_left; -- 2.54.0
