Git commit 0bd4a3805376a856707d26ee2a30dac80f5aba73 by Timothée Giet. Committed on 10/06/2025 at 08:24. Pushed by timotheegiet into branch 'master'.
core, bump version to 25.1.1 patch release fixing a major bug for builds with Qt 6.5 and 6.6 M +2 -2 CMakeLists.txt M +2 -2 docs/docbook/index.docbook M +1 -0 org.kde.gcompris.appdata.xml M +2 -2 publiccode.yml https://invent.kde.org/education/gcompris/-/commit/0bd4a3805376a856707d26ee2a30dac80f5aba73 diff --git a/CMakeLists.txt b/CMakeLists.txt index 95443bba41..2d8e46a0e4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,10 +21,10 @@ set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DQT_QML_DEBUG") set(GCOMPRIS_MAJOR_VERSION 25) set(GCOMPRIS_MINOR_VERSION 1) -set(GCOMPRIS_PATCH_VERSION 0) +set(GCOMPRIS_PATCH_VERSION 1) if("${CMAKE_ANDROID_ARCH}" STREQUAL "arm64") - set(GCOMPRIS_PATCH_VERSION 1) + set(GCOMPRIS_PATCH_VERSION 2) endif() # Set the BUILD_DATE diff --git a/docs/docbook/index.docbook b/docs/docbook/index.docbook index 2836b0c693..62f0ae5212 100644 --- a/docs/docbook/index.docbook +++ b/docs/docbook/index.docbook @@ -46,12 +46,12 @@ Don't forget to include this last date. Please respect the format of the date (YYYY-MM-DD),it is used by scripts. --> -<date>2025-05-21</date> +<date>2025-06-10</date> <!--version information of the application and kde this documentation is valid for. for example 'xx.yy.zz' --> -<releaseinfo>25.1</releaseinfo> +<releaseinfo>25.1.1</releaseinfo> <!-- Abstract about this handbook --> diff --git a/org.kde.gcompris.appdata.xml b/org.kde.gcompris.appdata.xml index 1900174a86..6cc7412fe6 100644 --- a/org.kde.gcompris.appdata.xml +++ b/org.kde.gcompris.appdata.xml @@ -1267,6 +1267,7 @@ <value key="KDE::supporters">[jdkiser](https://social.sdf.org/@jdkiser);fabacam;Michael Klingberg;[Gianmarco Gargiulo](https://mastodon.uno/@gianmarcogg03);nukke</value> </custom> <releases> + <release version="25.1.1" date="2025-06-10"/> <release version="25.1" date="2025-05-21"/> <release version="25.0" date="2025-01-30"/> <release version="4.3" date="2024-11-29"/> diff --git a/publiccode.yml b/publiccode.yml index 068f57af82..9e0dc14d55 100644 --- a/publiccode.yml +++ b/publiccode.yml @@ -5,8 +5,8 @@ publiccodeYmlVersion: '0.3' name: GCompris url: 'https://invent.kde.org/education/gcompris.git' -releaseDate: '2025-05-21' -softwareVersion: '25.1' +releaseDate: '2025-06-10' +softwareVersion: '25.1.1' developmentStatus: stable logo: images/sc-apps-gcompris-qt.svg landingURL: 'https://www.gcompris.net/'
