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.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 1dccc20..caab32c 100644 --- a/cmake-extras.changes +++ b/cmake-extras.changes @@ -1,3 +1,33 @@ +------------------------------------------------------------------- +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 diff --git a/cmake-extras.spec b/cmake-extras.spec index d904036..102c26c 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 and contributors # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,42 +15,45 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # + Name: cmake-extras -Version: 1.7 +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 +# PATCH-FIX-OPENSUSE hillwood@opensuse.org fix-filename-and-path-of-qmlplugindump.patch +Patch: fix-filename-and-path-of-qmlplugindump.patch BuildRequires: clang -BuildRequires: llvm-gold +BuildRequires: cmake +BuildRequires: doxygen +BuildRequires: gcovr BuildRequires: gettext BuildRequires: gmock -BuildRequires: gcovr -BuildRequires: doxygen +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: cmake -Requires: vala -Requires: qmlpluginexports-qt5 -Requires: lcov -Requires: intltool Requires: clang -Requires: llvm-gold +Requires: cmake +Requires: doxygen +Requires: gcovr Requires: gettext Requires: gmock -Requires: gcovr -Requires: doxygen +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) @@ -61,7 +64,6 @@ 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 @@ -78,4 +80,3 @@ sed -i 's|/usr/bin/env python|/usr/bin/python3|g' src/IncludeChecker/include_che %{_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)