Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package cmake-extras for openSUSE:Factory checked in at 2025-12-08 11:54:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cmake-extras (Old) and /work/SRC/openSUSE:Factory/.cmake-extras.new.1939 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cmake-extras" Mon Dec 8 11:54:02 2025 rev:6 rq:1321341 version:1.9 Changes: -------- --- /work/SRC/openSUSE:Factory/cmake-extras/cmake-extras.changes 2025-12-05 17:42:35.984240581 +0100 +++ /work/SRC/openSUSE:Factory/.cmake-extras.new.1939/cmake-extras.changes 2025-12-08 11:55:10.336549193 +0100 @@ -1,0 +2,6 @@ +Sat Dec 6 08:05:56 UTC 2025 - Hillwood Yang <[email protected]> + +- Add fix-filename-and-path-of-qmlplugindump.patch, support both qmlplugindump-qt5 + and qmlplugindump-qt6 (boo#1254531) + +------------------------------------------------------------------- New: ---- fix-filename-and-path-of-qmlplugindump.patch ----------(New B)---------- New: - Add fix-filename-and-path-of-qmlplugindump.patch, support both qmlplugindump-qt5 and qmlplugindump-qt6 (boo#1254531) ----------(New E)---------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cmake-extras.spec ++++++ --- /var/tmp/diff_new_pack.vNygYB/_old 2025-12-08 11:55:12.236628796 +0100 +++ /var/tmp/diff_new_pack.vNygYB/_new 2025-12-08 11:55:12.252629466 +0100 @@ -24,6 +24,8 @@ 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 [email protected] fix-filename-and-path-of-qmlplugindump.patch +Patch: fix-filename-and-path-of-qmlplugindump.patch BuildRequires: clang BuildRequires: cmake BuildRequires: doxygen @@ -62,9 +64,7 @@ %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 ++++++ fix-filename-and-path-of-qmlplugindump.patch ++++++ 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)
