Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package gcompris-qt for openSUSE:Factory checked in at 2026-01-09 17:04:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gcompris-qt (Old) and /work/SRC/openSUSE:Factory/.gcompris-qt.new.1928 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gcompris-qt" Fri Jan 9 17:04:23 2026 rev:34 rq:1326285 version:25.1 Changes: -------- --- /work/SRC/openSUSE:Factory/gcompris-qt/gcompris-qt.changes 2025-05-22 16:58:08.157126951 +0200 +++ /work/SRC/openSUSE:Factory/.gcompris-qt.new.1928/gcompris-qt.changes 2026-01-09 17:06:19.851060330 +0100 @@ -1,0 +2,8 @@ +Thu Jan 8 20:56:31 UTC 2026 - Giacomo Comes <[email protected]> + +- Add gcompris-25.1.1-qt-6.10.patch from gentoo + * fix build with Qt 6.10 +- Add BuildRequires: cmake(Qt6QuickControls2Basic) and + cmake(Qt6QuickControls2BasicStyleImpl) + +------------------------------------------------------------------- New: ---- gcompris-25.1.1-qt-6.10.patch ----------(New B)---------- New: - Add gcompris-25.1.1-qt-6.10.patch from gentoo * fix build with Qt 6.10 ----------(New E)---------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gcompris-qt.spec ++++++ --- /var/tmp/diff_new_pack.VaBMFD/_old 2026-01-09 17:06:20.743097305 +0100 +++ /var/tmp/diff_new_pack.VaBMFD/_new 2026-01-09 17:06:20.743097305 +0100 @@ -1,7 +1,7 @@ # # spec file for package gcompris-qt # -# Copyright (c) 2025 SUSE LLC +# Copyright (c) 2026 SUSE LLC and contributors # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -28,6 +28,8 @@ Source0: https://download.kde.org/stable/gcompris/qt/src/%{name}-%{version}.tar.xz Source1: https://download.kde.org/stable/gcompris/qt/src/%{name}-%{version}.tar.xz.sig Source2: https://share.kde.org/index.php/s/YjKzYs1bgDsOo5V/download#/%{name}.keyring +#PATCH-FIX-OPENSUSE -- gcompris-25.1.1-qt-6.10.patch +Patch1: gcompris-25.1.1-qt-6.10.patch BuildRequires: cmake BuildRequires: extra-cmake-modules BuildRequires: pkgconfig @@ -41,6 +43,8 @@ BuildRequires: cmake(Qt6QmlWorkerScript) >= %{qt6_version} BuildRequires: cmake(Qt6Quick) >= %{qt6_version} BuildRequires: cmake(Qt6QuickControls2) >= %{qt6_version} +BuildRequires: cmake(Qt6QuickControls2Basic) >= %{qt6_version} +BuildRequires: cmake(Qt6QuickControls2BasicStyleImpl) >= %{qt6_version} BuildRequires: cmake(Qt6Sensors) >= %{qt6_version} BuildRequires: cmake(Qt6Svg) >= %{qt6_version} BuildRequires: cmake(Qt6WaylandClient) >= %{qt6_version} ++++++ gcompris-25.1.1-qt-6.10.patch ++++++ >From d4bd9ad1d588158963610f3dacef86e8d3b2641c Mon Sep 17 00:00:00 2001 From: Johnny Jazeix <[email protected]> Date: Sun, 14 Sep 2025 13:59:59 +0200 Subject: [PATCH] cmake, ignore private modules if they don't exist --- src/core/CMakeLists.txt | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index f4eb66b6dd..dde4a7aec8 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -73,10 +73,18 @@ elseif(CMAKE_HOST_APPLE) set_source_files_properties(${gcompris_RES} PROPERTIES MACOSX_PACKAGE_LOCATION "Resources") endif() -set(used_qt_modules ${QT_MAJOR}::Qml ${QT_MAJOR}::Quick ${QT_MAJOR}::Widgets ${QT_MAJOR}::Gui ${QT_MAJOR}::Multimedia ${QT_MAJOR}::Core ${QT_MAJOR}::Svg ${QT_MAJOR}::Sensors ${QT_MAJOR}::QuickControls2 ${QT_MAJOR}::QuickTemplates2 ${QT_MAJOR}::Charts ${QT_MAJOR}::QmlWorkerScript ${QT_MAJOR}::CorePrivate) +set(used_qt_modules ${QT_MAJOR}::Qml ${QT_MAJOR}::Quick ${QT_MAJOR}::Widgets ${QT_MAJOR}::Gui ${QT_MAJOR}::Multimedia ${QT_MAJOR}::Core ${QT_MAJOR}::Svg ${QT_MAJOR}::Sensors ${QT_MAJOR}::QuickControls2 ${QT_MAJOR}::QuickTemplates2 ${QT_MAJOR}::Charts ${QT_MAJOR}::QmlWorkerScript) + +if(TARGET ${QT_MAJOR}::CorePrivate) + set(used_qt_modules ${used_qt_modules} ${QT_MAJOR}::CorePrivate) +endif() if(TARGET ${QT_MAJOR}::QuickControls2Basic) - set(used_qt_modules ${used_qt_modules} ${QT_MAJOR}::QuickControls2Basic ${QT_MAJOR}::QuickControls2BasicPrivate) + set(used_qt_modules ${used_qt_modules} ${QT_MAJOR}::QuickControls2Basic) + if(TARGET ${QT_MAJOR}::QuickControls2BasicPrivate) + set(used_qt_modules ${used_qt_modules} ${QT_MAJOR}::QuickControls2BasicPrivate) + endif() + # This should not be needed! But for some reason, on windows it does not find # automatically the library so we need to install it manually if(WIN32) @@ -86,7 +94,10 @@ if(TARGET ${QT_MAJOR}::QuickControls2Basic) endif() if(TARGET ${QT_MAJOR}::WaylandClient) - set(used_qt_modules ${used_qt_modules} ${QT_MAJOR}::WaylandClient ${QT_MAJOR}::WaylandClientPrivate) + set(used_qt_modules ${used_qt_modules} ${QT_MAJOR}::WaylandClient) + if(TARGET ${QT_MAJOR}::WaylandClientPrivate) + set(used_qt_modules ${used_qt_modules} ${QT_MAJOR}::WaylandClientPrivate) + endif() endif() if(ANDROID) -- GitLab
