--- Begin Message ---
Subject: |
[PATCH] gnu: extra-cmake-modules: Install pri-files into lib/qt5/. |
Date: |
Tue, 31 Oct 2017 18:25:51 +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 c92e92ef3..d347ea1d9 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
--- End Message ---
--- Begin Message ---
Subject: |
Re: bug#29087: Acknowledgement ([PATCH] gnu: extra-cmake-modules: Install pri-files into lib/qt5/.) |
Date: |
Sun, 5 Nov 2017 11:02:46 +0100 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 |
Duplicate, see https://debbugs.gnu.org/cgi/bugreport.cgi?bug=29114#8
--
Regards
Hartmut Goebel
| Hartmut Goebel | address@hidden |
| www.crazy-compilers.com | compilers which you thought are impossible |
--- End Message ---