[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/29: gnu: qtwebkit: Fix rpath for the qmlwebkit plugins.
From: |
Hartmut Goebel |
Subject: |
04/29: gnu: qtwebkit: Fix rpath for the qmlwebkit plugins. |
Date: |
Fri, 6 Oct 2017 08:15:06 -0400 (EDT) |
htgoebel pushed a commit to branch wip-qt-paths
in repository guix.
commit a6e9e64d228192694f2e8a7680c51d01f34970a6
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 f9f1278..1b5058b 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1684,6 +1684,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")))
- 14/29: gnu: phonon: Enable building the Qt Designer plugin., (continued)
- 14/29: gnu: phonon: Enable building the Qt Designer plugin., Hartmut Goebel, 2017/10/06
- 11/29: gnu: kconfigwidgets: Add optional native-input kdoctools., Hartmut Goebel, 2017/10/06
- 20/29: gnu: kio: Remove unused input., Hartmut Goebel, 2017/10/06
- 03/29: gnu: qwt: Adjust installation directory layout., Hartmut Goebel, 2017/10/06
- 19/29: gnu: kparts: Make tests pass again., Hartmut Goebel, 2017/10/06
- 23/29: gnu: kidletime: Enable fallback mode to X-Screensaver based poller., Hartmut Goebel, 2017/10/06
- 27/29: gnu: Add kdewebkit., Hartmut Goebel, 2017/10/06
- 28/29: gnu: ktexteditor: Symlink some files referred to by different names., Hartmut Goebel, 2017/10/06
- 16/29: gnu: kfilemetadata: Enable support for PDF files and audio files., Hartmut Goebel, 2017/10/06
- 02/29: gnu: qt: Fix install paths in submodules., Hartmut Goebel, 2017/10/06
- 04/29: gnu: qtwebkit: Fix rpath for the qmlwebkit plugins.,
Hartmut Goebel <=
- 12/29: gnu: kwallet: Add optional input qgpgme., Hartmut Goebel, 2017/10/06
- 24/29: gnu: sonnet: Reduce the number of warnings when configuring., Hartmut Goebel, 2017/10/06
- 26/29: gnu: kdeclarative: Reduce the number of warnings when configuring., Hartmut Goebel, 2017/10/06
- 25/29: gnu: kglobalaccel: Reduce the number of warnings when configuring., Hartmut Goebel, 2017/10/06
- 22/29: gnu: kio: Symlink some files referred to by different names., Hartmut Goebel, 2017/10/06
- 18/29: gnu: bluez-qt: Add comment about status of tests., Hartmut Goebel, 2017/10/06
- 17/29: gnu: bluez-qt: Install udev-rules., Hartmut Goebel, 2017/10/06
- 15/29: gnu: kdnssd: Enable service discovery on local network via avahi., Hartmut Goebel, 2017/10/06
- 21/29: gnu: kio: Adopt a patch from Nix., Hartmut Goebel, 2017/10/06
- 05/29: gnu: qscintilla: Adjust installation directory layout., Hartmut Goebel, 2017/10/06