From 3e44c6ad1b215dd931feb79766166761b33bf737c861fe065ecd160169bcb82e Mon Sep 17 00:00:00 2001 From: Hillwood Yang Date: Tue, 25 Mar 2025 13:28:08 +0000 Subject: [PATCH 1/5] Accepting request 1255504 from home:mathletic:branches:devel:tools:building - upate to 1.8 * GMock: wire dependencies between GMock step and library files * QmlPlugins: Crude support for qt6 OBS-URL: https://build.opensuse.org/request/show/1255504 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake-extras?expand=0&rev=4 --- cmake-extras-1.7.tar.gz | 3 --- cmake-extras-1.8.tar.gz | 3 +++ cmake-extras.changes | 7 +++++++ cmake-extras.spec | 4 ++-- 4 files changed, 12 insertions(+), 5 deletions(-) delete mode 100644 cmake-extras-1.7.tar.gz create mode 100644 cmake-extras-1.8.tar.gz diff --git a/cmake-extras-1.7.tar.gz b/cmake-extras-1.7.tar.gz deleted file mode 100644 index 4eb7a3c..0000000 --- a/cmake-extras-1.7.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:159d773f12f94089c64c842007085aafd8129b7f3648a9ac44eab614070e6d21 -size 87295 diff --git a/cmake-extras-1.8.tar.gz b/cmake-extras-1.8.tar.gz new file mode 100644 index 0000000..7c64a38 --- /dev/null +++ b/cmake-extras-1.8.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:486ec200cee59cd801efdaf8182eb09fa2565a9fb8150b991cb6d583af3d8644 +size 88102 diff --git a/cmake-extras.changes b/cmake-extras.changes index 1dccc20..18f461e 100644 --- a/cmake-extras.changes +++ b/cmake-extras.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Mar 24 06:56:18 UTC 2025 - Christoph G + +- upate to 1.8 + * GMock: wire dependencies between GMock step and library files + * QmlPlugins: Crude support for qt6 + ------------------------------------------------------------------- Sun Mar 24 12:37:46 UTC 2024 - Hillwood Yang diff --git a/cmake-extras.spec b/cmake-extras.spec index d904036..0e7faae 100644 --- a/cmake-extras.spec +++ b/cmake-extras.spec @@ -1,7 +1,7 @@ # # spec file for package cmake-extras # -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2025 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,7 +16,7 @@ # Name: cmake-extras -Version: 1.7 +Version: 1.8 Release: 0 Summary: A collection of add-ons for the CMake build tool License: GPL-3.0-or-later -- 2.51.1 From c7c7e4e87319e670e31f3891c4113a788e1d8eab45f16e3115568ca4822f216e Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Tue, 22 Apr 2025 16:25:58 +0000 Subject: [PATCH 2/5] Accepting request 1270603 from home:AndreasStieger:branches:devel:tools:building fix build with cmake4 (boo#1239788) OBS-URL: https://build.opensuse.org/request/show/1270603 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake-extras?expand=0&rev=6 --- cmake-extras-1.8-cmake4.patch | 120 ++++++++++++++++++++++++++++++++++ cmake-extras.changes | 5 ++ cmake-extras.spec | 1 + 3 files changed, 126 insertions(+) create mode 100644 cmake-extras-1.8-cmake4.patch diff --git a/cmake-extras-1.8-cmake4.patch b/cmake-extras-1.8-cmake4.patch new file mode 100644 index 0000000..919faff --- /dev/null +++ b/cmake-extras-1.8-cmake4.patch @@ -0,0 +1,120 @@ +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.changes b/cmake-extras.changes index 18f461e..e5e9cf0 100644 --- a/cmake-extras.changes +++ b/cmake-extras.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Apr 17 16:47:21 UTC 2025 - Andreas Stieger + +- fix build with cmake4 (boo#1239788) cmake-extras-1.8-cmake4.patch + ------------------------------------------------------------------- Mon Mar 24 06:56:18 UTC 2025 - Christoph G diff --git a/cmake-extras.spec b/cmake-extras.spec index 0e7faae..7e58ae3 100644 --- a/cmake-extras.spec +++ b/cmake-extras.spec @@ -23,6 +23,7 @@ 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 -- 2.51.1 From c3a85139ba3c5a884a96c9dc811bc6803a7bff8aabd72c7afea410e3aefa6cb3 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Thu, 16 Oct 2025 11:26:41 +0000 Subject: [PATCH 3/5] - 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/package/show/devel:tools:building/cmake-extras?expand=0&rev=8 --- .gitattributes | 23 +++++++ .gitignore | 1 + cmake-extras-1.8-cmake4.patch | 120 ++++++++++++++++++++++++++++++++++ cmake-extras-1.8.tar.gz | 3 + cmake-extras-1.9.tar.gz | 3 + cmake-extras.changes | 23 +++++++ cmake-extras.spec | 81 +++++++++++++++++++++++ 7 files changed, 254 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 cmake-extras-1.8-cmake4.patch create mode 100644 cmake-extras-1.8.tar.gz create mode 100644 cmake-extras-1.9.tar.gz create mode 100644 cmake-extras.changes create mode 100644 cmake-extras.spec diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/cmake-extras-1.8-cmake4.patch b/cmake-extras-1.8-cmake4.patch new file mode 100644 index 0000000..919faff --- /dev/null +++ b/cmake-extras-1.8-cmake4.patch @@ -0,0 +1,120 @@ +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 new file mode 100644 index 0000000..7c64a38 --- /dev/null +++ b/cmake-extras-1.8.tar.gz @@ -0,0 +1,3 @@ +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 new file mode 100644 index 0000000..5b98c40 --- /dev/null +++ b/cmake-extras.changes @@ -0,0 +1,23 @@ +------------------------------------------------------------------- +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 + +- fix build with cmake4 (boo#1239788) cmake-extras-1.8-cmake4.patch + +------------------------------------------------------------------- +Mon Mar 24 06:56:18 UTC 2025 - Christoph G + +- upate to 1.8 + * GMock: wire dependencies between GMock step and library files + * QmlPlugins: Crude support for qt6 + +------------------------------------------------------------------- +Sun Mar 24 12:37:46 UTC 2024 - Hillwood Yang + +- Initial package for version 1.7 diff --git a/cmake-extras.spec b/cmake-extras.spec new file mode 100644 index 0000000..2df4533 --- /dev/null +++ b/cmake-extras.spec @@ -0,0 +1,81 @@ +# +# spec file for package cmake-extras +# +# Copyright (c) 2025 SUSE LLC +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + +Name: cmake-extras +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 +BuildRequires: cmake +BuildRequires: vala +BuildRequires: qmlpluginexports-qt5 +BuildRequires: lcov +BuildRequires: intltool +BuildRequires: clang +BuildRequires: llvm-gold +BuildRequires: gettext +BuildRequires: gmock +BuildRequires: gcovr +BuildRequires: doxygen +BuildRequires: pkg-config +# BuildRequires: licensecheck +BuildRequires: pkgconfig(gio-2.0) +BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(gobject-introspection-1.0) +Requires: cmake +Requires: vala +Requires: qmlpluginexports-qt5 +Requires: lcov +Requires: intltool +Requires: clang +Requires: llvm-gold +Requires: gettext +Requires: gmock +Requires: gcovr +Requires: doxygen +Requires: pkg-config +Requires: pkgconfig(gio-2.0) +Requires: pkgconfig(glib-2.0) +Requires: pkgconfig(gobject-introspection-1.0) +BuildArch: noarch + +%description +A collection of add-ons for the CMake build tool. + +%prep +%autosetup -p1 +sed -i 's/qmlplugindump_exe/qmlplugindump_exe-qt5/g' src/QmlPlugins/QmlPluginsConfig.cmake +sed -i 's|/usr/bin/env python|/usr/bin/python3|g' src/IncludeChecker/include_checker.py +# rm -rf src/CopyrightTest examples/copyrighttest-demo + +%build +%cmake +%cmake_build + +%install +%cmake_install + +%files +%license LICENSE +%doc README.md ChangeLog AUTHORS +%{_datadir}/cmake/* + +%changelog + -- 2.51.1 From 90fac627dea719630cd5a7c0f8056cac91a26fe2d5998f13f8d6a66167ddbe37 Mon Sep 17 00:00:00 2001 From: Hillwood Yang Date: Fri, 5 Dec 2025 14:05:56 +0000 Subject: [PATCH 4/5] - Fix filename and path of qmlplugindump-qt5 for openSUSE OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake-extras?expand=0&rev=10 --- .gitattributes | 23 +++++++ .gitignore | 1 + cmake-extras-1.8-cmake4.patch | 120 ++++++++++++++++++++++++++++++++++ cmake-extras-1.8.tar.gz | 3 + cmake-extras-1.9.tar.gz | 3 + cmake-extras.changes | 28 ++++++++ cmake-extras.spec | 82 +++++++++++++++++++++++ 7 files changed, 260 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 cmake-extras-1.8-cmake4.patch create mode 100644 cmake-extras-1.8.tar.gz create mode 100644 cmake-extras-1.9.tar.gz create mode 100644 cmake-extras.changes create mode 100644 cmake-extras.spec diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/cmake-extras-1.8-cmake4.patch b/cmake-extras-1.8-cmake4.patch new file mode 100644 index 0000000..919faff --- /dev/null +++ b/cmake-extras-1.8-cmake4.patch @@ -0,0 +1,120 @@ +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 new file mode 100644 index 0000000..7c64a38 --- /dev/null +++ b/cmake-extras-1.8.tar.gz @@ -0,0 +1,3 @@ +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 new file mode 100644 index 0000000..ebeab44 --- /dev/null +++ b/cmake-extras.changes @@ -0,0 +1,28 @@ +------------------------------------------------------------------- +Fri Dec 5 12:51:31 UTC 2025 - Hillwood Yang + +- Fix filename and path of qmlplugindump-qt5 for openSUSE + +------------------------------------------------------------------- +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 + +- fix build with cmake4 (boo#1239788) cmake-extras-1.8-cmake4.patch + +------------------------------------------------------------------- +Mon Mar 24 06:56:18 UTC 2025 - Christoph G + +- upate to 1.8 + * GMock: wire dependencies between GMock step and library files + * QmlPlugins: Crude support for qt6 + +------------------------------------------------------------------- +Sun Mar 24 12:37:46 UTC 2024 - Hillwood Yang + +- Initial package for version 1.7 diff --git a/cmake-extras.spec b/cmake-extras.spec new file mode 100644 index 0000000..4eca8a1 --- /dev/null +++ b/cmake-extras.spec @@ -0,0 +1,82 @@ +# +# spec file for package cmake-extras +# +# Copyright (c) 2025 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 +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + + +Name: cmake-extras +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 +BuildRequires: clang +BuildRequires: cmake +BuildRequires: doxygen +BuildRequires: gcovr +BuildRequires: gettext +BuildRequires: gmock +BuildRequires: intltool +BuildRequires: lcov +BuildRequires: llvm-gold +BuildRequires: pkg-config +BuildRequires: qmlpluginexports-qt5 +BuildRequires: vala +# BuildRequires: licensecheck +BuildRequires: pkgconfig(gio-2.0) +BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(gobject-introspection-1.0) +Requires: clang +Requires: cmake +Requires: doxygen +Requires: gcovr +Requires: gettext +Requires: gmock +Requires: intltool +Requires: lcov +Requires: llvm-gold +Requires: pkg-config +Requires: qmlpluginexports-qt5 +Requires: vala +Requires: pkgconfig(gio-2.0) +Requires: pkgconfig(glib-2.0) +Requires: pkgconfig(gobject-introspection-1.0) +BuildArch: noarch + +%description +A collection of add-ons for the CMake build tool. + +%prep +%autosetup -p1 +sed -i 's/qmlplugindump_exe/qmlplugindump_exe-qt5/g' src/QmlPlugins/QmlPluginsConfig.cmake +sed -i 's|/usr/bin/env python|/usr/bin/python3|g' src/IncludeChecker/include_checker.py +sed -i '/find_program/s|qmlplugindump HINTS /usr/lib/qt${QT_VERSION_MAJOR}/bin|qmlplugindump-qt5 HINTS /usr/bin|g' src/QmlPlugins/QmlPluginsConfig.cmake +# rm -rf src/CopyrightTest examples/copyrighttest-demo + +%build +%cmake +%cmake_build + +%install +%cmake_install + +%files +%license LICENSE +%doc README.md ChangeLog AUTHORS +%{_datadir}/cmake/* + +%changelog -- 2.51.1 From d8c85a3210256beaf74f8380185a5dd5106d3c5de01879d6913f5374918d53c5 Mon Sep 17 00:00:00 2001 From: Hillwood Yang Date: Sat, 6 Dec 2025 08:20:03 +0000 Subject: [PATCH 5/5] Accepting request 1321340 from home:hillwood:branches:X11:Deepin:Factory - Add fix-filename-and-path-of-qmlplugindump.patch, support both qmlplugindump-qt5 and qmlplugindump-qt6 (boo#1254531) OBS-URL: https://build.opensuse.org/request/show/1321340 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake-extras?expand=0&rev=12 --- .gitattributes | 23 ++++ .gitignore | 1 + cmake-extras-1.8-cmake4.patch | 120 +++++++++++++++++++ cmake-extras-1.8.tar.gz | 3 + cmake-extras-1.9.tar.gz | 3 + cmake-extras.changes | 34 ++++++ cmake-extras.spec | 82 +++++++++++++ fix-filename-and-path-of-qmlplugindump.patch | 24 ++++ 8 files changed, 290 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 cmake-extras-1.8-cmake4.patch create mode 100644 cmake-extras-1.8.tar.gz create mode 100644 cmake-extras-1.9.tar.gz create mode 100644 cmake-extras.changes create mode 100644 cmake-extras.spec create mode 100644 fix-filename-and-path-of-qmlplugindump.patch diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/cmake-extras-1.8-cmake4.patch b/cmake-extras-1.8-cmake4.patch new file mode 100644 index 0000000..919faff --- /dev/null +++ b/cmake-extras-1.8-cmake4.patch @@ -0,0 +1,120 @@ +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 new file mode 100644 index 0000000..7c64a38 --- /dev/null +++ b/cmake-extras-1.8.tar.gz @@ -0,0 +1,3 @@ +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 new file mode 100644 index 0000000..caab32c --- /dev/null +++ b/cmake-extras.changes @@ -0,0 +1,34 @@ +------------------------------------------------------------------- +Sat Dec 6 08:05:56 UTC 2025 - Hillwood Yang + +- Add fix-filename-and-path-of-qmlplugindump.patch, support both qmlplugindump-qt5 + and qmlplugindump-qt6 (boo#1254531) + +------------------------------------------------------------------- +Fri Dec 5 12:51:31 UTC 2025 - Hillwood Yang + +- Fix filename and path of qmlplugindump-qt5 for openSUSE + +------------------------------------------------------------------- +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 + +- fix build with cmake4 (boo#1239788) cmake-extras-1.8-cmake4.patch + +------------------------------------------------------------------- +Mon Mar 24 06:56:18 UTC 2025 - Christoph G + +- upate to 1.8 + * GMock: wire dependencies between GMock step and library files + * QmlPlugins: Crude support for qt6 + +------------------------------------------------------------------- +Sun Mar 24 12:37:46 UTC 2024 - Hillwood Yang + +- Initial package for version 1.7 diff --git a/cmake-extras.spec b/cmake-extras.spec new file mode 100644 index 0000000..102c26c --- /dev/null +++ b/cmake-extras.spec @@ -0,0 +1,82 @@ +# +# spec file for package cmake-extras +# +# Copyright (c) 2025 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 +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + + +Name: cmake-extras +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 +# PATCH-FIX-OPENSUSE hillwood@opensuse.org fix-filename-and-path-of-qmlplugindump.patch +Patch: fix-filename-and-path-of-qmlplugindump.patch +BuildRequires: clang +BuildRequires: cmake +BuildRequires: doxygen +BuildRequires: gcovr +BuildRequires: gettext +BuildRequires: gmock +BuildRequires: intltool +BuildRequires: lcov +BuildRequires: llvm-gold +BuildRequires: pkg-config +BuildRequires: qmlpluginexports-qt5 +BuildRequires: vala +# BuildRequires: licensecheck +BuildRequires: pkgconfig(gio-2.0) +BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(gobject-introspection-1.0) +Requires: clang +Requires: cmake +Requires: doxygen +Requires: gcovr +Requires: gettext +Requires: gmock +Requires: intltool +Requires: lcov +Requires: llvm-gold +Requires: pkg-config +Requires: qmlpluginexports-qt5 +Requires: vala +Requires: pkgconfig(gio-2.0) +Requires: pkgconfig(glib-2.0) +Requires: pkgconfig(gobject-introspection-1.0) +BuildArch: noarch + +%description +A collection of add-ons for the CMake build tool. + +%prep +%autosetup -p1 +sed -i 's|/usr/bin/env python|/usr/bin/python3|g' src/IncludeChecker/include_checker.py +# rm -rf src/CopyrightTest examples/copyrighttest-demo + +%build +%cmake +%cmake_build + +%install +%cmake_install + +%files +%license LICENSE +%doc README.md ChangeLog AUTHORS +%{_datadir}/cmake/* + +%changelog diff --git a/fix-filename-and-path-of-qmlplugindump.patch b/fix-filename-and-path-of-qmlplugindump.patch new file mode 100644 index 0000000..f28d4f7 --- /dev/null +++ b/fix-filename-and-path-of-qmlplugindump.patch @@ -0,0 +1,24 @@ +diff -Nur cmake-extras-1.9/src/QmlPlugins/QmlPluginsConfig.cmake cmake-extras-1.9-new/src/QmlPlugins/QmlPluginsConfig.cmake +--- cmake-extras-1.9/src/QmlPlugins/QmlPluginsConfig.cmake 2025-09-01 17:24:00.000000000 +0800 ++++ cmake-extras-1.9-new/src/QmlPlugins/QmlPluginsConfig.cmake 2025-12-06 15:57:56.857255160 +0800 +@@ -7,10 +7,17 @@ + endif() + + if(NOT TARGET qmlplugindump) +- find_program(qmlplugindump_exe qmlplugindump HINTS /usr/lib/qt${QT_VERSION_MAJOR}/bin/) +- ++ if (QT_VERSION_MAJOR GREATER_EQUAL 6) ++ find_program(qmlplugindump_exe qmlplugindump6 HINTS /usr/bin/) ++ else() ++ find_program(qmlplugindump_exe qmlplugindump-qt5 HINTS /usr/bin/) ++ endif() + if(NOT qmlplugindump_exe) +- message(FATAL_ERROR "Could not locate qmlplugindump.") ++ if (QT_VERSION_MAJOR GREATER_EQUAL 6) ++ message(FATAL_ERROR "Could not locate qmlplugindump6. Maybe qt6-declarative-tools is not be installed.") ++ else() ++ message(FATAL_ERROR "Could not locate qmlplugindump-qt5. Maybe libqt5-qtdeclarative-tools is not be installed.") ++ endif() + endif() + + add_executable(qmlplugindump IMPORTED) -- 2.51.1