packages/extra-cmake-modules
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to upstream version 5.95.0

Browse Source
This commit is contained in:
loong_C 2022-07-04 13:49:14 +08:00
parent e254091805
commit 030d604438
4 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
extra-cmake-modules-5.89.0-qt_prefix.patch
View File

@ -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 <loong_c@yeah.net>
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

BIN
extra-cmake-modules-5.90.0.tar.xz
View File

Binary file not shown.

BIN
extra-cmake-modules-5.95.0.tar.xz Normal file
View File

Binary file not shown.

5
extra-cmake-modules.spec
View File

@ -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 <loong_c@yeah.net> - 5.95.0-1
- update to upstream version 5.95.0
* Fri Feb 11 2022 pei-jiankang<peijiankang@kylinos.com> - 5.90.0-1
- update to upstream version 5.90.0