[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/23: gnu: qtwebkit: Fix rpath for the qmlwebkit plugins.
From: |
Hartmut Goebel |
Subject: |
04/23: gnu: qtwebkit: Fix rpath for the qmlwebkit plugins. |
Date: |
Fri, 22 Sep 2017 09:30:26 -0400 (EDT) |
htgoebel pushed a commit to branch wip-qt-paths
in repository guix.
commit 95d2d57d1a0b20fb0bbf1f5c2363d695d6c4c394
Author: Hartmut Goebel <address@hidden>
Date: Sat Sep 2 23:20:15 2017 +0200
gnu: qtwebkit: Fix rpath for the qmlwebkit plugins.
After the qtbase installation directories have been changed,
the relative RPATH in the libs no longer matched the sructure.
* gnu/packages/qt.scm(qtwebkit)[arguments]: New phase
fix-qmlwebkit-plugins-rpath.
---
gnu/packages/qt.scm | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 8070e27..263e025 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1672,6 +1672,15 @@ different kinds of sliders, and much more.")
(arguments
`(#:phases
(modify-phases %standard-phases
+ (add-before 'configure 'fix-qmlwebkit-plugins-rpath
+ (lambda _
+ (substitute*
"Source/WebKit/qt/declarative/experimental/experimental.pri"
+ (("RPATHDIR_RELATIVE_TO_DESTDIR = \\.\\./\\.\\./lib")
+ "RPATHDIR_RELATIVE_TO_DESTDIR = ../../../../../lib"))
+ (substitute* "Source/WebKit/qt/declarative/public.pri"
+ (("RPATHDIR_RELATIVE_TO_DESTDIR = \\.\\./\\.\\./lib")
+ "RPATHDIR_RELATIVE_TO_DESTDIR = ../../../../lib"))
+ #t))
(replace 'configure
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
- branch wip-qt-paths created (now 44fa058), Hartmut Goebel, 2017/09/22
- 03/23: gnu: qwt: Adjust installation directory layout., Hartmut Goebel, 2017/09/22
- 05/23: gnu: qscintilla: Adjust installation directory layout., Hartmut Goebel, 2017/09/22
- 10/23: gnu: kconfigwidgets: Add optional native-input kdoctools., Hartmut Goebel, 2017/09/22
- 12/23: gnu: kdesignerplugin: Add optional inputs., Hartmut Goebel, 2017/09/22
- 06/23: gnu: grantlee: Enable all tests., Hartmut Goebel, 2017/09/22
- 11/23: gnu: kwallet: Add optional input qgpgme., Hartmut Goebel, 2017/09/22
- 13/23: gnu: phonon: Enable building the Qt Designer plugin., Hartmut Goebel, 2017/09/22
- 20/23: gnu: kidletime: Enable fallback mode to X-Screensaver based poller., Hartmut Goebel, 2017/09/22
- 23/23: gnu: kdeclarative: Reduce the number of warnings when configuring., Hartmut Goebel, 2017/09/22
- 04/23: gnu: qtwebkit: Fix rpath for the qmlwebkit plugins.,
Hartmut Goebel <=
- 01/23: gnu: qtbase: Use a more standard directory layout., Hartmut Goebel, 2017/09/22
- 07/23: gnu: qtkeychain: Reduce the number of warnings when configuring., Hartmut Goebel, 2017/09/22
- 15/23: gnu: kfilemetadata: Enable support for PDF files and audio files., Hartmut Goebel, 2017/09/22
- 08/23: gnu: Update prison to 5.37.0., Hartmut Goebel, 2017/09/22
- 21/23: gnu: sonnet: Reduce the number of warnings when configuring., Hartmut Goebel, 2017/09/22
- 19/23: gnu: kio: Remove unused input acl., Hartmut Goebel, 2017/09/22
- 16/23: gnu: bluez-qt: Install udev-rules., Hartmut Goebel, 2017/09/22
- 14/23: gnu: kdnssd: Enable service discovery on local network via avahi., Hartmut Goebel, 2017/09/22
- 18/23: gnu: kparts: Make tests pass again., Hartmut Goebel, 2017/09/22
- 09/23: gnu: kcoreaddons: Add native-input shared-mime-info and a comment., Hartmut Goebel, 2017/09/22