From mboxrd@z Thu Jan 1 00:00:00 1970 From: Hartmut Goebel Subject: Re: QT install and search paths Date: Sun, 3 Sep 2017 14:39:45 +0200 Message-ID: <3cf9ce7c-719d-1f8a-d011-22f416eb9159@crazy-compilers.com> References: <42cac0e9-d948-3ea1-7312-d003751fd6a8@crazy-compilers.com> <874lsxi3bx.fsf@member.fsf.org> <4a1d7083-eb0a-9c79-fd54-686b822da5ed@crazy-compilers.com> <87378fkeho.fsf@member.fsf.org> <87o9r3iqh7.fsf@member.fsf.org> <0f97b74f-282d-9996-aa61-d3084e164b09@crazy-compilers.com> <878thwbcpv.fsf@member.fsf.org> <87y3pw9f8a.fsf@member.fsf.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------5EF66174E655F0832AA96528" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:42187) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1doUC1-0007TB-KR for guix-devel@gnu.org; Sun, 03 Sep 2017 08:40:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1doUBw-0002b4-R9 for guix-devel@gnu.org; Sun, 03 Sep 2017 08:40:01 -0400 Received: from mail-out.m-online.net ([212.18.0.10]:47123) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1doUBw-0002aN-FU for guix-devel@gnu.org; Sun, 03 Sep 2017 08:39:56 -0400 In-Reply-To: <87y3pw9f8a.fsf@member.fsf.org> Content-Language: de-DE List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: =?UTF-8?B?5a6L5paH5q2m?= Cc: guix-devel , Thomas Danckaert This is a multi-part message in MIME format. --------------5EF66174E655F0832AA96528 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit 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 | --------------5EF66174E655F0832AA96528 Content-Type: text/x-patch; name="0001-gnu-qtwebkit-Fix-rpath-for-the-qmlwebkit-plugins.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename*0="0001-gnu-qtwebkit-Fix-rpath-for-the-qmlwebkit-plugins.patch" >From 3e4a25c412632095b1415296f9d46a4b93fad212 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel 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 --------------5EF66174E655F0832AA96528 Content-Type: text/x-patch; name="0002-gnu-qscintilla-Adopt-paths-REWORD.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0002-gnu-qscintilla-Adopt-paths-REWORD.patch" >From c3fab9284454c90461dc601970e2a67942f84373 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel 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 --------------5EF66174E655F0832AA96528--