From: Hartmut Goebel <h.goebel@crazy-compilers.com>
To: 28719@debbugs.gnu.org
Subject: [bug#28719] [PATCH 6/6] gnu: kde-framworks: Fix installation directories.
Date: Fri, 6 Oct 2017 14:02:14 +0200 [thread overview]
Message-ID: <20171006120214.29511-6-h.goebel@crazy-compilers.com> (raw)
In-Reply-To: <20171006120214.29511-1-h.goebel@crazy-compilers.com>
After the qtbase installation directories have been changed, kf5's plugins
etc. need to be install into lib/qt5/…, too. We change the global definitions
in "KDEInstallDirs.cmake", so this changes will apply to all packages without
these to need to define the paths. THis is okay, since "KDEInstallDirs.cmake"
defines the directory-layout guix is using.
* gnu/packages/kde-frameworks.scm (extra-cmake-modules)[#:phase fix-lib-path]:
In modules/KDEInstallDirs.cmake also patch QTPLUGINDIR, QTQUICKIMPORTSDIR,
QMLDIR.
(kwindowsystem)[#:phase check]: Adjust QT_PLUGIN_PATH.
(kfilemetadata)[#:phase check-setup]: dito.
---
gnu/packages/kde-frameworks.scm | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 58bc74236..a503226d6 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -92,7 +92,17 @@
(lambda _
;; Always install into /lib and not into /lib64.
(substitute* "kde-modules/KDEInstallDirs.cmake"
- (("\"lib64\"") "\"lib\""))))
+ (("\"lib64\"") "\"lib\"")
+ ;; TODO: Base the following on values taken from Qt
+ ;; Install plugins into lib/qt5/plugins
+ (("_define_relative\\(QTPLUGINDIR LIBDIR \"plugins\"")
+ "_define_relative(QTPLUGINDIR LIBDIR \"qt5/plugins\"")
+ ;; Install imports into lib/qt5/imports
+ (("_define_relative\\(QTQUICKIMPORTSDIR QTPLUGINDIR \"imports\"")
+ "_define_relative(QTQUICKIMPORTSDIR LIBDIR \"qt5/imports\"")
+ ;; Install qml-files into lib/qt5/qml
+ (("_define_relative\\(QMLDIR LIBDIR \"qml\"")
+ "_define_relative(QMLDIR LIBDIR \"qt5/qml\""))))
;; install and check phase are swapped to prevent install from failing
;; after testsuire has run
(add-after 'install 'check-post-install
@@ -1042,7 +1052,7 @@ configuration pages, message boxes, and password requests.")
(begin
(let ((out (assoc-ref outputs "out")))
(setenv "QT_PLUGIN_PATH"
- (string-append out "/lib/plugins:"
+ (string-append out "/lib/qt5/plugins:"
(getenv "QT_PLUGIN_PATH"))))
;; The test suite requires a running X server, setting
;; QT_QPA_PLATFORM=offscreen does not suffice and even make
@@ -1485,7 +1495,7 @@ from DocBook files.")
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(setenv "QT_PLUGIN_PATH"
- (string-append out "/lib/plugins:"
+ (string-append out "/lib/qt5/plugins:"
(getenv "QT_PLUGIN_PATH"))))
#t)))))
(native-inputs
--
2.13.5
prev parent reply other threads:[~2017-10-06 12:03 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-06 11:59 [bug#28719] [PATCH 0/6] Qt: Use a more standard directory layout Hartmut Goebel
2017-10-06 12:02 ` [bug#28719] [PATCH 1/6] gnu: qtbase: " Hartmut Goebel
2017-10-06 12:02 ` [bug#28719] [PATCH 2/6] gnu: qt: Fix install paths in submodules Hartmut Goebel
2017-10-10 11:01 ` 宋文武
2017-10-06 12:02 ` [bug#28719] [PATCH 3/6] gnu: qwt: Adjust installation directory layout Hartmut Goebel
2017-10-06 12:02 ` [bug#28719] [PATCH 4/6] gnu: qtwebkit: Fix rpath for the qmlwebkit plugins Hartmut Goebel
2017-10-06 12:02 ` [bug#28719] [PATCH 5/6] gnu: qscintilla: Adjust installation directory layout Hartmut Goebel
2017-10-10 11:05 ` 宋文武
2017-10-10 14:43 ` Hartmut Goebel
2017-10-10 15:39 ` Hartmut Goebel
2017-10-12 11:27 ` 宋文武
2017-10-13 13:37 ` bug#28719: " Hartmut Goebel
2017-10-14 6:30 ` [bug#28719] " 宋文武
2017-10-06 12:02 ` Hartmut Goebel [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171006120214.29511-6-h.goebel@crazy-compilers.com \
--to=h.goebel@crazy-compilers.com \
--cc=28719@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.