diff --git a/extra-cmake-modules-5.89.0-qt_prefix.patch b/extra-cmake-modules-5.89.0-qt_prefix.patch index 2c291f2..83238c8 100644 --- a/extra-cmake-modules-5.89.0-qt_prefix.patch +++ b/extra-cmake-modules-5.89.0-qt_prefix.patch @@ -1,13 +1,25 @@ -diff -up extra-cmake-modules-5.89.0/kde-modules/KDEInstallDirs5.cmake.qt_prefix extra-cmake-modules-5.89.0/kde-modules/KDEInstallDirs5.cmake ---- extra-cmake-modules-5.89.0/kde-modules/KDEInstallDirs5.cmake.qt_prefix 2021-12-02 00:14:53.000000000 -0600 -+++ extra-cmake-modules-5.89.0/kde-modules/KDEInstallDirs5.cmake 2021-12-08 09:23:47.194443267 -0600 -@@ -236,7 +236,7 @@ include("${ECM_MODULE_DIR}/ECMQueryQmake +From 296dfb9eb4a408d40a8c99d710bdf86f19d3149e Mon Sep 17 00:00:00 2001 +From: loong_C +Date: Mon, 4 Jul 2022 14:56:38 +0800 +Subject: [PATCH] extra-cmake-modules-5.89.0-qt_prefix + +--- + kde-modules/KDEInstallDirs5.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/kde-modules/KDEInstallDirs5.cmake b/kde-modules/KDEInstallDirs5.cmake +index 0341196..55282a7 100644 +--- a/kde-modules/KDEInstallDirs5.cmake ++++ b/kde-modules/KDEInstallDirs5.cmake +@@ -236,7 +236,7 @@ include("${ECM_MODULE_DIR}/ECMQueryQt.cmake") set(_default_KDE_INSTALL_USE_QT_SYS_PATHS OFF) if(NOT DEFINED KDE_INSTALL_USE_QT_SYS_PATHS) - query_qmake(qt_install_prefix_dir QT_INSTALL_PREFIX TRY) + ecm_query_qt(qt_install_prefix_dir QT_INSTALL_PREFIX TRY) - if(qt_install_prefix_dir STREQUAL "${CMAKE_INSTALL_PREFIX}") + if( (qt_install_prefix_dir STREQUAL "${CMAKE_INSTALL_PREFIX}") OR ( ("${CMAKE_INSTALL_PREFIX}" STREQUAL "/usr") AND (qt_install_prefix_dir STREQUAL "${CMAKE_INSTALL_FULL_LIBDIR}/qt5")) ) message(STATUS "Installing in the same prefix as Qt, adopting their path scheme.") set(_default_KDE_INSTALL_USE_QT_SYS_PATHS ON) endif() -diff -up extra-cmake-modules-5.89.0/kde-modules/KDEInstallDirs6.cmake.qt_prefix extra-cmake-modules-5.89.0/kde-modules/KDEInstallDirs6.cmake +-- +2.20.1 + diff --git a/extra-cmake-modules-5.90.0.tar.xz b/extra-cmake-modules-5.90.0.tar.xz deleted file mode 100644 index 930249e..0000000 Binary files a/extra-cmake-modules-5.90.0.tar.xz and /dev/null differ diff --git a/extra-cmake-modules-5.95.0.tar.xz b/extra-cmake-modules-5.95.0.tar.xz new file mode 100644 index 0000000..2b77560 Binary files /dev/null and b/extra-cmake-modules-5.95.0.tar.xz differ diff --git a/extra-cmake-modules.spec b/extra-cmake-modules.spec index 0541ab2..a5d5bb3 100644 --- a/extra-cmake-modules.spec +++ b/extra-cmake-modules.spec @@ -1,6 +1,6 @@ Name: extra-cmake-modules Summary: Additional modules for CMake build system -Version: 5.90.0 +Version: 5.95.0 Release: 1 License: BSD URL: https://api.kde.org/ecm/ @@ -52,6 +52,9 @@ make test ARGS="--output-on-failure --timeout 300" -C %{_target_platform} ||: %changelog +* Mon Jul 04 2022 loong_C - 5.95.0-1 +- update to upstream version 5.95.0 + * Fri Feb 11 2022 pei-jiankang - 5.90.0-1 - update to upstream version 5.90.0