[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#29114] [PATCH 01/10] gnu: extra-cmake-modules: Install pri-files in
From: |
Hartmut Goebel |
Subject: |
[bug#29114] [PATCH 01/10] gnu: extra-cmake-modules: Install pri-files into lib/qt5/. |
Date: |
Thu, 2 Nov 2017 09:47:41 +0100 |
This in accordance with the documentation in
ECMGeneratePriFile.cmake: "Packagers … want to set
`ECM_MKSPECS_INSTALL_DIR` to something like
`share/qt5/mkspecs/modules`." Our Qt5 is putting pri-files into
`lib/qt5/mkspecs/modules`.
* gnu/packages/kde-frameworks.scm(extra-cmake-modules)[#:phase fix-lib-path]:
New substitute for file 'modules/ECMGeneratePriFile.cmake'.
---
gnu/packages/kde-frameworks.scm | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 6a46f2868..59022f3f0 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -104,7 +104,11 @@
"_define_relative(QTQUICKIMPORTSDIR LIBDIR \"qt5/imports\"")
;; Install qml-files into lib/qt5/qml
(("_define_relative\\(QMLDIR LIBDIR \"qml\"")
- "_define_relative(QMLDIR LIBDIR \"qt5/qml\""))))
+ "_define_relative(QMLDIR LIBDIR \"qt5/qml\""))
+ (substitute* "modules/ECMGeneratePriFile.cmake"
+ ;; Install pri-files into lib/qt5/mkspecs
+ (("set\\(ECM_MKSPECS_INSTALL_DIR mkspecs/modules")
+ "set(ECM_MKSPECS_INSTALL_DIR lib/qt5/mkspecs/modules"))))
;; install and check phase are swapped to prevent install from failing
;; after testsuire has run
(add-after 'install 'check-post-install
--
2.13.5
- [bug#29114] [PATCH 00/10] KDE Updates and cleanups, Hartmut Goebel, 2017/11/02
- [bug#29114] [PATCH 01/10] gnu: extra-cmake-modules: Install pri-files into lib/qt5/.,
Hartmut Goebel <=
- [bug#29114] [PATCH 04/10] gnu: kdelibs4support: Make test kstandarddirstest pass., Hartmut Goebel, 2017/11/02
- [bug#29114] [PATCH 10/10] gnu: prison: Move to be in alphabetical order., Hartmut Goebel, 2017/11/02
- [bug#29114] [PATCH 08/10] gnu: kactivities: Move to tier 2., Hartmut Goebel, 2017/11/02
- [bug#29114] [PATCH 03/10] gnu: kimageformats: Update comment., Hartmut Goebel, 2017/11/02
- [bug#29114] [PATCH 09/10] gnu: kdewebkit: Move to be in alphabetical order., Hartmut Goebel, 2017/11/02
- [bug#29114] [PATCH 06/10] gnu: solid: Enable building interface for qml., Hartmut Goebel, 2017/11/02
- [bug#29114] [PATCH 05/10] gnu: krunner: Make some tests pass., Hartmut Goebel, 2017/11/02