From 24986c5e637c95474e996e218d3ebf307c6ba03a81268aac1d6dd32dccfd1add Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Thu, 16 Oct 2025 11:26:41 +0000 Subject: [PATCH] Accepting request 1309873 from home:mathletic:branches:devel:tools:building - update to 1.9 * add support for CMake 4.0 - drop cmake-extras-1.8-cmake4.patch as it is part of the release OBS-URL: https://build.opensuse.org/request/show/1309873 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake-extras?expand=0&rev=8 --- cmake-extras-1.8-cmake4.patch | 120 ---------------------------------- cmake-extras-1.8.tar.gz | 3 - cmake-extras-1.9.tar.gz | 3 + cmake-extras.changes | 7 ++ cmake-extras.spec | 3 +- 5 files changed, 11 insertions(+), 125 deletions(-) delete mode 100644 cmake-extras-1.8-cmake4.patch delete mode 100644 cmake-extras-1.8.tar.gz create mode 100644 cmake-extras-1.9.tar.gz diff --git a/cmake-extras-1.8-cmake4.patch b/cmake-extras-1.8-cmake4.patch deleted file mode 100644 index 919faff..0000000 --- a/cmake-extras-1.8-cmake4.patch +++ /dev/null @@ -1,120 +0,0 @@ -From df9801b2882f3c4cd488f0605f17dc8ed35b2dab Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Christoph=20Gr=C3=BCninger?= -Date: Thu, 27 Mar 2025 19:20:53 +0100 -Subject: [PATCH] [cmake] Require minimum CMake version 3.10 - -Soon CMake 4.0 will be released. It requires that projects -set a minimum required CMake version of 3.5 and warns that -CMake older than 3.10 is deprecated. There is a -workaround with an additional flag, but it would is better -to increase the minimum required version. ---- - CMakeLists.txt | 2 +- - examples/copyrighttest-demo/CMakeLists.txt | 2 +- - examples/doxygenbuilder-demo/CMakeLists.txt | 2 +- - examples/findgmock-demo/CMakeLists.txt | 2 +- - examples/gdbus-demo/CMakeLists.txt | 2 +- - examples/gsettings-demo/CMakeLists.txt | 2 +- - examples/includechecker-demo/CMakeLists.txt | 2 +- - examples/intltool-demo/CMakeLists.txt | 2 +- - src/GdbusCodegen/GdbusCodegenConfig.cmake | 3 --- - 9 files changed, 8 insertions(+), 11 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index d1401c3..ee73147 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,4 +1,4 @@ --cmake_minimum_required(VERSION 3.0.2) -+cmake_minimum_required(VERSION 3.10) - project(cmake-extras VERSION 1.8) - - include(GNUInstallDirs) -diff --git a/examples/copyrighttest-demo/CMakeLists.txt b/examples/copyrighttest-demo/CMakeLists.txt -index 79d981d..a26bf12 100644 ---- a/examples/copyrighttest-demo/CMakeLists.txt -+++ b/examples/copyrighttest-demo/CMakeLists.txt -@@ -14,7 +14,7 @@ - # along with this program. If not, see . - # - --cmake_minimum_required(VERSION 3.0.2) -+cmake_minimum_required(VERSION 3.10) - project(copyrighttest-demo LANGUAGES C CXX) - - include(CTest) -diff --git a/examples/doxygenbuilder-demo/CMakeLists.txt b/examples/doxygenbuilder-demo/CMakeLists.txt -index 0bdef93..9efb49d 100644 ---- a/examples/doxygenbuilder-demo/CMakeLists.txt -+++ b/examples/doxygenbuilder-demo/CMakeLists.txt -@@ -1,4 +1,4 @@ --cmake_minimum_required(VERSION 3.1) -+cmake_minimum_required(VERSION 3.10) - project(doxygenbuilder-demo LANGUAGES C CXX) - - include(GNUInstallDirs) -diff --git a/examples/findgmock-demo/CMakeLists.txt b/examples/findgmock-demo/CMakeLists.txt -index 255e793..24848bf 100644 ---- a/examples/findgmock-demo/CMakeLists.txt -+++ b/examples/findgmock-demo/CMakeLists.txt -@@ -1,4 +1,4 @@ --cmake_minimum_required(VERSION 3.0.2) -+cmake_minimum_required(VERSION 3.10) - project(findgmock-demo LANGUAGES C CXX) - - # find_package(GMock) will find the Google Mock source, and add it to -diff --git a/examples/gdbus-demo/CMakeLists.txt b/examples/gdbus-demo/CMakeLists.txt -index 619ae11..2c58ceb 100644 ---- a/examples/gdbus-demo/CMakeLists.txt -+++ b/examples/gdbus-demo/CMakeLists.txt -@@ -1,4 +1,4 @@ --cmake_minimum_required(VERSION 3.1) -+cmake_minimum_required(VERSION 3.10) - project(gdbus-demo) - - set (CMAKE_CXX_STANDARD 14) -diff --git a/examples/gsettings-demo/CMakeLists.txt b/examples/gsettings-demo/CMakeLists.txt -index 03abf49..65957ae 100644 ---- a/examples/gsettings-demo/CMakeLists.txt -+++ b/examples/gsettings-demo/CMakeLists.txt -@@ -1,4 +1,4 @@ --cmake_minimum_required(VERSION 3.1) -+cmake_minimum_required(VERSION 3.10) - project(intltool-demo) - - enable_testing() -diff --git a/examples/includechecker-demo/CMakeLists.txt b/examples/includechecker-demo/CMakeLists.txt -index 77a6694..3ccc5b5 100644 ---- a/examples/includechecker-demo/CMakeLists.txt -+++ b/examples/includechecker-demo/CMakeLists.txt -@@ -1,4 +1,4 @@ --cmake_minimum_required(VERSION 3.1) -+cmake_minimum_required(VERSION 3.10) - project(includechecker-demo LANGUAGES C CXX) - - include(GNUInstallDirs) -diff --git a/examples/intltool-demo/CMakeLists.txt b/examples/intltool-demo/CMakeLists.txt -index 96cd64e..4d422d6 100644 ---- a/examples/intltool-demo/CMakeLists.txt -+++ b/examples/intltool-demo/CMakeLists.txt -@@ -1,4 +1,4 @@ --cmake_minimum_required(VERSION 3.1) -+cmake_minimum_required(VERSION 3.10) - project(intltool-demo LANGUAGES C CXX) - - include(GNUInstallDirs) -diff --git a/src/GdbusCodegen/GdbusCodegenConfig.cmake b/src/GdbusCodegen/GdbusCodegenConfig.cmake -index 552a8d4..6e51098 100644 ---- a/src/GdbusCodegen/GdbusCodegenConfig.cmake -+++ b/src/GdbusCodegen/GdbusCodegenConfig.cmake -@@ -1,7 +1,4 @@ - cmake_minimum_required(VERSION 3.13) --if(POLICY CMP0011) -- cmake_policy(SET CMP0011 NEW) --endif(POLICY CMP0011) - - find_program(GDBUS_CODEGEN NAMES gdbus-codegen DOC "gdbus-codegen executable") - if(NOT GDBUS_CODEGEN) --- -2.49.0 - diff --git a/cmake-extras-1.8.tar.gz b/cmake-extras-1.8.tar.gz deleted file mode 100644 index 7c64a38..0000000 --- a/cmake-extras-1.8.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:486ec200cee59cd801efdaf8182eb09fa2565a9fb8150b991cb6d583af3d8644 -size 88102 diff --git a/cmake-extras-1.9.tar.gz b/cmake-extras-1.9.tar.gz new file mode 100644 index 0000000..268ae53 --- /dev/null +++ b/cmake-extras-1.9.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d04eba46e81873fa9f06759edd12b045bc14d7559c49023397ef65999a8fff0a +size 88249 diff --git a/cmake-extras.changes b/cmake-extras.changes index e5e9cf0..5b98c40 100644 --- a/cmake-extras.changes +++ b/cmake-extras.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Oct 8 23:19:56 UTC 2025 - Christoph G + +- update to 1.9 + * add support for CMake 4.0 +- drop cmake-extras-1.8-cmake4.patch as it is part of the release + ------------------------------------------------------------------- Thu Apr 17 16:47:21 UTC 2025 - Andreas Stieger diff --git a/cmake-extras.spec b/cmake-extras.spec index 7e58ae3..2df4533 100644 --- a/cmake-extras.spec +++ b/cmake-extras.spec @@ -16,14 +16,13 @@ # Name: cmake-extras -Version: 1.8 +Version: 1.9 Release: 0 Summary: A collection of add-ons for the CMake build tool License: GPL-3.0-or-later Group: Development/Tools/Building URL: https://gitlab.com/ubports/development/core/cmake-extras Source: https://gitlab.com/ubports/development/core/cmake-extras/-/archive/%{version}/%{name}-%{version}.tar.gz -Patch0: cmake-extras-1.8-cmake4.patch BuildRequires: cmake BuildRequires: vala BuildRequires: qmlpluginexports-qt5