diff --git a/extra-cmake-modules-5.46.0-qt_prefix.patch b/extra-cmake-modules-5.46.0-qt_prefix.patch new file mode 100644 index 0000000..47de00a --- /dev/null +++ b/extra-cmake-modules-5.46.0-qt_prefix.patch @@ -0,0 +1,16 @@ +modify KDEInstallDirs.cmake's naive check for qt_prefix = cmake_prefix +to also check if cmake_prefix=/usr and qt_prefix=fedora_qt_prefix (libdir/qt5) + +diff -up extra-cmake-modules-5.46.0/kde-modules/KDEInstallDirs.cmake.qt_prefix extra-cmake-modules-5.46.0/kde-modules/KDEInstallDirs.cmake +--- extra-cmake-modules-5.46.0/kde-modules/KDEInstallDirs.cmake.qt_prefix 2018-05-04 12:34:33.000000000 -0500 ++++ extra-cmake-modules-5.46.0/kde-modules/KDEInstallDirs.cmake 2018-05-31 09:06:12.054310355 -0500 +@@ -461,7 +461,7 @@ include("${ECM_MODULE_DIR}/ECMQueryQmake + 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) +- 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 --git a/extra-cmake-modules.spec b/extra-cmake-modules.spec index 817ae90..41c39e5 100644 --- a/extra-cmake-modules.spec +++ b/extra-cmake-modules.spec @@ -9,7 +9,7 @@ Name: extra-cmake-modules Summary: Additional modules for CMake build system Version: 5.46.0 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD URL: https://api.kde.org/ecm/ @@ -125,6 +125,9 @@ make test ARGS="--output-on-failure --timeout 300" -C %{_target_platform} ||: %changelog +* Thu May 31 2018 Rex Dieter - 5.46.0-2 +- Issue with KDE_INSTALL_QMLDIR (#1435525) + * Sat May 05 2018 Rex Dieter - 5.46.0-1 - 5.46.0