Re: QT install and search paths

[Hartmut Goebel <h.goebel@crazy-compilers.com>]

[-- Attachment #1: Type: text/plain, Size: 270 bytes --]

Hi,

enclosed the required patch for qscintilla to make python-qscintilla
build and qtwebkit.

-- 
Regards
Hartmut Goebel

| Hartmut Goebel          | h.goebel@crazy-compilers.com               |
| www.crazy-compilers.com | compilers which you thought are impossible |


[-- Attachment #2: 0001-gnu-qtwebkit-Fix-rpath-for-the-qmlwebkit-plugins.patch --]
[-- Type: text/x-patch, Size: 1503 bytes --]

From 3e4a25c412632095b1415296f9d46a4b93fad212 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel <h.goebel@crazy-compilers.com>
Date: Sat, 2 Sep 2017 23:20:15 +0200
Subject: [PATCH 1/2] 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 3478fdaae..86b35bdc8 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1613,6 +1613,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")))
-- 
2.13.5


[-- Attachment #3: 0002-gnu-qscintilla-Adopt-paths-REWORD.patch --]
[-- Type: text/x-patch, Size: 1245 bytes --]

From c3fab9284454c90461dc601970e2a67942f84373 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel <h.goebel@crazy-compilers.com>
Date: Sun, 3 Sep 2017 11:36:42 +0200
Subject: [PATCH 2/2] gnu: qscintilla: Adopt paths REWORD

* gnu/packages/qt.scm(qscintilla)[configure]: XXX
---
 gnu/packages/qt.scm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 86b35bdc8..f9e743348 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1412,8 +1412,10 @@ contain over 620 classes.")
                   (string-append out "/include"))
                  (("\\$\\$\\[QT_INSTALL_TRANSLATIONS\\]")
                   (string-append out "/translations"))
-                 (("\\$\\$\\[QT_INSTALL_DATA\\]") out)
-                 (("\\$\\$\\[QT_HOST_DATA\\]") out))
+                 (("\\$\\$\\[QT_INSTALL_DATA\\]")
+                  (string-append out "/lib/qt$${QT_MAJOR_VERSION}"))
+                 (("\\$\\$\\[QT_HOST_DATA\\]")
+                 (string-append out "/lib/qt$${QT_MAJOR_VERSION}")))
                (zero? (system* "qmake"))))))))
     (native-inputs `(("qtbase" ,qtbase)))
     (home-page "http://www.riverbankcomputing.co.uk/software/qscintilla/intro")
-- 
2.13.5