Accepting request 1326285 from Education

OBS-URL: https://build.opensuse.org/request/show/1326285
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gcompris-qt?expand=0&rev=34

gcompris-25.1.1-qt-6.10.patch

@@ -0,0 +1,49 @@
+From d4bd9ad1d588158963610f3dacef86e8d3b2641c Mon Sep 17 00:00:00 2001
+From: Johnny Jazeix <jazeix@gmail.com>
+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
+

gcompris-qt-25.1.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dda4e486c7ec4d080744a05a6b89dbafe0dfe07041fbf245f08982716375acb5
+size 49412668

gcompris-qt-4.1.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3f3d1c3b205f89ec4a1d4b075e6d7c670d852aeedbeef56ec32e15bb875a0685
-size 49190664

gcompris-qt.changes

@@ -1,3 +1,27 @@
+-------------------------------------------------------------------
+Thu Jan  8 20:56:31 UTC 2026 - Giacomo Comes <gcomes.obs@gmail.com>
+
+- Add gcompris-25.1.1-qt-6.10.patch from gentoo
+  * fix build with Qt 6.10
+- Add BuildRequires: cmake(Qt6QuickControls2Basic) and 
+  cmake(Qt6QuickControls2BasicStyleImpl)
+
+-------------------------------------------------------------------
+Wed May 21 14:32:41 UTC 2025 - Bruno Friedmann <bruno@ioda-net.ch>
+
+- Update to version 25.1 contains bug fixes and graphics
+  improvements on many activities
+
+-------------------------------------------------------------------
+Mon Feb 10 12:00:38 UTC 2025 - Ana Guerrero <ana.guerrero@suse.com>
+
+- Update to version 25.0. Upstream changed versioning to the year.
+ * This new version contains 195 activities, including 5 new ones.
+ * New translation to Sanskrit
+ * First relase using Qt6
+- Packaging revamp.
+  * Switch build requirements to Qt6.
+
 -------------------------------------------------------------------
 Thu May 23 19:12:23 UTC 2024 - Bruno Friedmann <bruno@ioda-net.ch>
 

gcompris-qt.spec

@@ -1,8 +1,7 @@
 #
 # spec file for package gcompris-qt
 #
-# Copyright (c) 2024 SUSE LLC
-# Copyright (c) 2024 Ioda-Net Sàrl, Charmoille, Switzerland. Bruno Friedmann
+# 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
@@ -17,8 +16,10 @@
 #
 
 
+%define qt6_version 6.5.0
+
 Name:           gcompris-qt
-Version:        4.1
+Version:        25.1
 Release:        0
 Summary:        Multiactivity educational software for children aged 2–10 (Qt version)
 License:        AGPL-3.0-or-later AND CC-BY-4.0 AND Apache-2.0 AND MPL-2.0 AND OFL-1.1 AND GFDL-1.2-or-later AND MIT AND CC0-1.0 AND BSD-2-Clause AND BSD-3-Clause
@@ -27,50 +28,31 @@ URL:            https://gcompris.net
 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:  fdupes
-BuildRequires:  libqt5-qtcharts-imports >= 5.12.0
-BuildRequires:  libqt5-qtgraphicaleffects >= 5.12.0
-BuildRequires:  libqt5-qtimageformats >= 5.12.0
 BuildRequires:  pkgconfig
 BuildRequires:  qml-box2d
-BuildRequires:  update-desktop-files
-BuildRequires:  cmake(Qt5LinguistTools)
-BuildRequires:  pkgconfig(Qt5Charts) >= 5.12.0
-BuildRequires:  pkgconfig(Qt5Concurrent) >= 5.12.0
-# We don't want the Administrative documentation
-# BuildRequires:  kdoctools-devel
-BuildRequires:  pkgconfig(Qt5Core) >= 5.12.0
-BuildRequires:  pkgconfig(Qt5Multimedia) >= 5.12.0
-BuildRequires:  pkgconfig(Qt5Network) >= 5.12.0
-BuildRequires:  pkgconfig(Qt5OpenGL) >= 5.12.0
-BuildRequires:  pkgconfig(Qt5PrintSupport) >= 5.12.0
-BuildRequires:  pkgconfig(Qt5Quick) >= 5.12.0
-BuildRequires:  pkgconfig(Qt5QuickControls2) >= 5.12.0
-BuildRequires:  pkgconfig(Qt5QuickTemplates2) >= 5.12.0
-BuildRequires:  pkgconfig(Qt5Script) >= 5.12.0
-BuildRequires:  pkgconfig(Qt5Sensors) >= 5.12.0
-BuildRequires:  pkgconfig(Qt5Svg) >= 5.12.0
-BuildRequires:  pkgconfig(Qt5Test) >= 5.12.0
-BuildRequires:  pkgconfig(Qt5Widgets) >= 5.12.0
+BuildRequires:  qt6-waylandclient-private-devel >= %{qt6_version}
+BuildRequires:  cmake(Qt6Charts) >= %{qt6_version}
+BuildRequires:  cmake(Qt6Core) >= %{qt6_version}
+BuildRequires:  cmake(Qt6LinguistTools) >= %{qt6_version}
+BuildRequires:  cmake(Qt6Multimedia) >= %{qt6_version}
+BuildRequires:  cmake(Qt6QmlTools) >= %{qt6_version}
+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}
 BuildRequires:  pkgconfig(openssl)
-# Runtime requirements, it doesn't start without them (boo#1011125)
 Requires:       %{name}-activities = %{version}
-Requires:       libQt5Multimedia5 >= 5.12.0
-Requires:       libQt5Svg5 >= 5.12.0
-Requires:       libqt5-qtcharts-imports >= 5.12.0
-Requires:       libqt5-qtgraphicaleffects >= 5.12.0
-Requires:       libqt5-qtimageformats >= 5.12.0
-Requires:       qml-box2d
 Recommends:     %{name}-voices = %{version}
 Provides:       gcompris = 17.10
 Obsoletes:      gcompris < 17.10
-%if 0%{?suse_version} >= 1550
-BuildRequires:  pkgconfig(Qt5QmlModels) >= 5.12.0
-%else
-BuildRequires:  pkgconfig(Qt5Qml) >= 5.12.0
-%endif
 
 %description
 GCompris-Qt is an educational software suite comprising
@@ -81,9 +63,6 @@ Currently, GCompris offers in excess of 100 activities. New
 activities can be added, and an activity can implement its own game
 scheme.
 
-This version is a rewrite of GCompris using the QtQuick
-technology.
-
 %package activities
 Summary:        Activity files for %{name}
 Group:          Amusements/Teaching/Other
@@ -97,32 +76,30 @@ More than 100 activities are available.
 %lang_package
 
 %prep
-%setup -q
+%autosetup -p1
 
 %build
-export LDFLAGS="-Wl,-z,relro,-z,now -pie"
-export CFLAGS="%{optflags} -fPIE -pie -fno-strict-aliasing -DNDEBUG"
-export CXXFLAGS="%{optflags} -fPIE -pie -fno-strict-aliasing -DNDEBUG"
-
-find . -name CMakeLists.txt \
-  -exec sed -i -re '/^[[:blank:]]*[sS][eE][tT][[:blank:]]*\([[:blank:]]*(CMAKE_BUILD_TYPE|CMAKE_COLOR_MAKEFILE|CMAKE_INSTALL_PREFIX|CMAKE_VERBOSE_MAKEFILE).*\)/{s/^/#IGNORE /}' {} +
-%cmake_kf5 -d build
-
-%make_build
-# Build translastions too.
-%make_build BuildTranslations
+%if 0%{?suse_version} < 1600
+export CXX=g++-13 CC=gcc-13
+%cmake \
+	-DQML_BOX2D_MODULE=system \
+	-DQML_BOX2D_LIBRARY=/usr/lib64/Box2D/libqmlbox2d.so build
+%cmake_build
+%endif
+%if 0%{?suse_version} >= 1600
+%cmake_kf6 \
+	-DQML_BOX2D_MODULE=system \
+	-DQML_BOX2D_LIBRARY=/usr/lib64/Box2D/libqmlbox2d.so build
+%kf6_build
+%endif
 
 %install
+%if 0%{?suse_version} < 1600
 %cmake_install
-#Fix wrong place of man page temporaly
-rm -fr %{buildroot}/%{_prefix}/man
-# Install desktop file
-install -d %{buildroot}/%{_datadir}/applications
-install org.kde.gcompris.desktop %{buildroot}/%{_datadir}/applications/org.kde.gcompris.desktop
-%suse_update_desktop_file org.kde.gcompris Education Math Languages
-# Install icon file
-install -d %{buildroot}/%{_datadir}/icons/hicolor/scalable/apps/
-install -m 644 images/sc-apps-gcompris-qt.svg %{buildroot}/%{_datadir}/icons/hicolor/scalable/apps/gcompris-qt.svg
+%endif
+%if 0%{?suse_version} >= 1600
+%kf6_install
+%endif
 
 %files
 %license LICENSES/*
@@ -138,7 +115,6 @@ install -m 644 images/sc-apps-gcompris-qt.svg %{buildroot}/%{_datadir}/icons/hic
 %files activities
 %license LICENSES/*
 %doc README.md
-#Activities
 %dir %{_datadir}/%{name}
 %dir %{_datadir}/%{name}/rcc
 %{_datadir}/%{name}/rcc/*.rcc