Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package freetype2 for openSUSE:Factory checked in at 2026-03-10 17:47:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/freetype2 (Old) and /work/SRC/openSUSE:Factory/.freetype2.new.8177 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "freetype2" Tue Mar 10 17:47:04 2026 rev:113 rq:1337639 version:2.14.2 Changes: -------- +++ only whitespace diff in changes, re-diffing --- /work/SRC/openSUSE:Factory/freetype2/ft2demos.changes 2026-03-05 17:15:08.170619814 +0100 +++ /work/SRC/openSUSE:Factory/.freetype2.new.8177/ft2demos.changes 2026-03-10 17:47:30.257160290 +0100 @@ -1,0 +2,9 @@ +Mon Mar 9 11:27:08 UTC 2026 - Fridrich Strba <[email protected]> + +- Added patch: + * qt6-version.patch + + lower the QT6 requirement to 6.6, since it builds just fine + and allows to have the same spec file for all values of the + %%suse_version macro + +------------------------------------------------------------------- New: ---- qt6-version.patch ----------(New B)---------- New:/work/SRC/openSUSE:Factory/.freetype2.new.8177/ft2demos.changes-- Added patch: /work/SRC/openSUSE:Factory/.freetype2.new.8177/ft2demos.changes: * qt6-version.patch /work/SRC/openSUSE:Factory/.freetype2.new.8177/ft2demos.changes- + lower the QT6 requirement to 6.6, since it builds just fine ----------(New E)---------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ft2demos.spec ++++++ --- /var/tmp/diff_new_pack.6yJzSb/_old 2026-03-10 17:47:32.289244174 +0100 +++ /var/tmp/diff_new_pack.6yJzSb/_new 2026-03-10 17:47:32.289244174 +0100 @@ -17,6 +17,11 @@ %global freetype_version 2.14.2 +%if 0%{?suse_version} < 1600 +%global qt_version 5 +%else +%global qt_version 6 +%endif Name: ft2demos Version: 2.14.2 Release: 0 @@ -36,12 +41,15 @@ Source1016: bug-647375_tt2.ttf # silence our clamav check NoSource: 1000 +Patch0: bugzilla-308961-cmex-workaround.patch # PATCH-FIX-OPENSUSE don-t-mark-libpng-as-required-library.patch -- it is private in .pc -Patch202: don-t-mark-libpng-as-required-library.patch -Patch308961: bugzilla-308961-cmex-workaround.patch +Patch1: don-t-mark-libpng-as-required-library.patch +Patch100: qt6-version.patch BuildRequires: cmake BuildRequires: libpng-devel BuildRequires: pkgconfig +BuildRequires: pkgconfig(Qt%{qt_version}Gui) +BuildRequires: pkgconfig(Qt%{qt_version}Widgets) BuildRequires: pkgconfig(bzip2) BuildRequires: pkgconfig(harfbuzz) BuildRequires: pkgconfig(libbrotlidec) @@ -60,13 +68,6 @@ Requires: ftvalid = %{version}-%{release} Requires: ftview = %{version}-%{release} Conflicts: dtc < 1.4.0 -%if 0%{?suse_version} >= 1600 -BuildRequires: pkgconfig(Qt6Gui) -BuildRequires: pkgconfig(Qt6Widgets) -%else -BuildRequires: pkgconfig(Qt5Gui) -BuildRequires: pkgconfig(Qt5Widgets) -%endif %description Freetype2 utilities and demo programs. @@ -174,8 +175,11 @@ %prep %setup -q -n freetype-%{freetype_version} -b 1 -%patch -P 308961 -p 1 -%patch -P 202 -p1 +%patch -P 0 -p1 +%patch -P 1 -p1 +pushd ../ft2demos-%{version} +%patch -P 100 -p1 +popd %build export CFLAGS="%{optflags} -std=gnu99 -D_GNU_SOURCE $(getconf LFS_CFLAGS)" @@ -191,11 +195,7 @@ cd src/ftinspect %cmake \ -%if 0%{?suse_version} >= 1600 - -DUSE_QT_VERSION=6 -%else - -DUSE_QT_VERSION=5 -%endif + -DUSE_QT_VERSION=%{qt_version} %cmake_build popd ++++++ qt6-version.patch ++++++ diff -urEbwB ft2demos-2.14.2.orig/src/ftinspect/CMakeLists.txt ft2demos-2.14.2/src/ftinspect/CMakeLists.txt --- ft2demos-2.14.2.orig/src/ftinspect/CMakeLists.txt 2026-03-09 12:04:16.048652826 +0100 +++ ft2demos-2.14.2/src/ftinspect/CMakeLists.txt 2026-03-09 12:04:40.637647968 +0100 @@ -51,7 +51,7 @@ message(FATAL_ERROR "USE_QT_VERSION must be set to either 5 or 6. Found: '${USE_QT_VERSION}'") endif() if(USE_QT_VERSION EQUAL 6) - set(QT_MIN_VERSION "6.8") + set(QT_MIN_VERSION "6.6") elseif(USE_QT_VERSION EQUAL 5) set(QT_MIN_VERSION "5.15") endif()
