From debbugs-submit-bounces@debbugs.gnu.org Fri Oct 06 08:00:18 2017 Received: (at submit) by debbugs.gnu.org; 6 Oct 2017 12:00:18 +0000 Received: from localhost ([127.0.0.1]:52251 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e0RIg-0006YA-1U for submit@debbugs.gnu.org; Fri, 06 Oct 2017 08:00:18 -0400 Received: from eggs.gnu.org ([208.118.235.92]:46685) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e0RIe-0006Xw-EC for submit@debbugs.gnu.org; Fri, 06 Oct 2017 08:00:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e0RIQ-0003yg-2B for submit@debbugs.gnu.org; Fri, 06 Oct 2017 08:00:11 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:60701) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e0RIQ-0003yK-06 for submit@debbugs.gnu.org; Fri, 06 Oct 2017 08:00:02 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37576) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e0RIO-0008Jk-MX for guix-patches@gnu.org; Fri, 06 Oct 2017 08:00:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e0RIK-0003u0-H6 for guix-patches@gnu.org; Fri, 06 Oct 2017 08:00:00 -0400 Received: from mail-out.m-online.net ([2001:a60:0:28:0:1:25:1]:58519) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e0RIK-0003sA-Am for guix-patches@gnu.org; Fri, 06 Oct 2017 07:59:56 -0400 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 3y7p961GnPz1qxL9 for ; Fri, 6 Oct 2017 13:59:53 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 3y7p950vHFz1sVdg for ; Fri, 6 Oct 2017 13:59:53 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id DU3eFooOdi15 for ; Fri, 6 Oct 2017 13:59:52 +0200 (CEST) Received: from hermia.goebel-consult.de (ppp-46-244-136-109.dynamic.mnet-online.de [46.244.136.109]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS for ; Fri, 6 Oct 2017 13:59:52 +0200 (CEST) Received: from lenashee.goebel-consult.de (lenashee.goebel-consult.de [192.168.110.2]) by hermia.goebel-consult.de (Postfix) with ESMTP id 496F56062A for ; Fri, 6 Oct 2017 13:59:52 +0200 (CEST) From: Hartmut Goebel To: guix-patches@gnu.org Subject: [PATCH 0/6] Qt: Use a more standard directory layout. Date: Fri, 6 Oct 2017 13:59:51 +0200 Message-Id: <20171006115951.29431-1-h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.13.5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) This patch series makes Qt install libs, plugins, etc into a standard directory layout. See http://lists.gnu.org/archive/html/guix-devel/2017-09/msg00092.html and th= e related thread for details. The three patches by Sou Bunnbu (=E5=AE=8B=E6=96=87=E6=AD=A6) are unchang= ed from what he posted earlier on guix-devel. Hartmut Goebel (3): gnu: qtwebkit: Fix rpath for the qmlwebkit plugins. gnu: qscintilla: Adjust installation directory layout. gnu: kde-framworks: Fix installation directories. Sou Bunnbu (=E5=AE=8B=E6=96=87=E6=AD=A6) (3): gnu: qtbase: Use a more standard directory layout. gnu: qt: Fix install paths in submodules. gnu: qwt: Adjust installation directory layout. gnu/packages/kde-frameworks.scm | 16 +++- gnu/packages/qt.scm | 164 +++++++++++++++++++++++++++++-----= ------ 2 files changed, 134 insertions(+), 46 deletions(-) --=20 2.13.5 From debbugs-submit-bounces@debbugs.gnu.org Fri Oct 06 08:02:20 2017 Received: (at 28719) by debbugs.gnu.org; 6 Oct 2017 12:02:20 +0000 Received: from localhost ([127.0.0.1]:52257 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e0RKe-0006bp-EX for submit@debbugs.gnu.org; Fri, 06 Oct 2017 08:02:20 -0400 Received: from mail-out.m-online.net ([212.18.0.10]:50413) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e0RKc-0006bg-UC for 28719@debbugs.gnu.org; Fri, 06 Oct 2017 08:02:19 -0400 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 3y7pCs6K1fz1qxKh; Fri, 6 Oct 2017 14:02:17 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 3y7pCs57R0z1sVdg; Fri, 6 Oct 2017 14:02:17 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id We_LBi9InZZP; Fri, 6 Oct 2017 14:02:15 +0200 (CEST) Received: from hermia.goebel-consult.de (ppp-46-244-136-109.dynamic.mnet-online.de [46.244.136.109]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS; Fri, 6 Oct 2017 14:02:15 +0200 (CEST) Received: from lenashee.goebel-consult.de (lenashee.goebel-consult.de [192.168.110.2]) by hermia.goebel-consult.de (Postfix) with ESMTP id B16106062A; Fri, 6 Oct 2017 14:02:15 +0200 (CEST) From: Hartmut Goebel To: 28719@debbugs.gnu.org Subject: [PATCH 1/6] gnu: qtbase: Use a more standard directory layout. Date: Fri, 6 Oct 2017 14:02:09 +0200 Message-Id: <20171006120214.29511-1-h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.13.5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 28719 Cc: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) From: 宋文武 * gnu/packages/qt.scm (qtbase)[arguments]: Pass docdir, headerdir, archdatadir, datadir and examplesdir to 'configure'. Ajdust the patch-qt_config.prf phase accordingly. [native-search-paths]: Adjust accordingly. (qtwayland)[arguments]: New field. Co-authored-by: Hartmut Goebel --- gnu/packages/qt.scm | 43 +++++++++++++++++++++++++++---------------- 1 file changed, 27 insertions(+), 16 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index bc275ebb0..e276eb05b 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -460,6 +460,12 @@ developers using C++ or QML, a CSS & JavaScript like language.") "./configure" "-verbose" "-prefix" out + "-docdir" (string-append out "/share/doc/qt5") + "-headerdir" (string-append out "/include/qt5") + "-archdatadir" (string-append out "/lib/qt5") + "-datadir" (string-append out "/share/qt5") + "-examplesdir" (string-append + out "/share/doc/qt5/examples") "-opensource" "-confirm-license" ;; Do not build examples; if desired, these could go @@ -489,38 +495,31 @@ developers using C++ or QML, a CSS & JavaScript like language.") (add-after 'install 'patch-qt_config.prf (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) + (mkspecs (string-append out "/lib/qt5/mkspecs")) (qt_config.prf (string-append - out "/mkspecs/features/qt_config.prf"))) + mkspecs "/features/qt_config.prf"))) ;; For each Qt module, let `qmake' uses search paths in the ;; module directory instead of all in QT_INSTALL_PREFIX. (substitute* qt_config.prf (("\\$\\$\\[QT_INSTALL_HEADERS\\]") - "$$replace(dir, mkspecs/modules, include)") + "$$clean_path($$replace(dir, mkspecs/modules, ../../include/qt5))") (("\\$\\$\\[QT_INSTALL_LIBS\\]") - "$$replace(dir, mkspecs/modules, lib)") + "$$clean_path($$replace(dir, mkspecs/modules, ../../lib))") (("\\$\\$\\[QT_HOST_LIBS\\]") - "$$replace(dir, mkspecs/modules, lib)") - (("\\$\\$\\[QT_INSTALL_PLUGINS\\]") - "$$replace(dir, mkspecs/modules, plugins)") - (("\\$\\$\\[QT_INSTALL_LIBEXECS\\]") - "$$replace(dir, mkspecs/modules, libexec)") + "$$clean_path($$replace(dir, mkspecs/modules, ../../lib))") (("\\$\\$\\[QT_INSTALL_BINS\\]") - "$$replace(dir, mkspecs/modules, bin)") - (("\\$\\$\\[QT_INSTALL_IMPORTS\\]") - "$$replace(dir, mkspecs/modules, imports)") - (("\\$\\$\\[QT_INSTALL_QML\\]") - "$$replace(dir, mkspecs/modules, qml)")) + "$$clean_path($$replace(dir, mkspecs/modules, ../../bin))")) #t)))))) (native-search-paths (list (search-path-specification (variable "QMAKEPATH") - (files '(""))) + (files '("lib/qt5"))) (search-path-specification (variable "QML2_IMPORT_PATH") - (files '("qml"))) + (files '("lib/qt5/qml"))) (search-path-specification (variable "QT_PLUGIN_PATH") - (files '("plugins"))) + (files '("lib/qt5/plugins"))) (search-path-specification (variable "XDG_DATA_DIRS") (files '("share"))) @@ -817,6 +816,18 @@ developers using C++ or QML, a CSS & JavaScript like language.") (snippet ;; The examples try to build and cause the build to fail '(delete-file-recursively "examples")))) + (arguments + (substitute-keyword-arguments (package-arguments qtsvg) + ((#:phases phases) + `(modify-phases ,phases + (add-before 'check 'set-ld-library-path + ;; + ;; + ;; Make the uninstalled libQt5WaylandClient.so.5 available to the + ;; wayland platform plugin. + (lambda _ + (setenv "LD_LIBRARY_PATH" (string-append (getcwd) "/lib")) + #t)))))) (native-inputs `(("glib" ,glib) ("perl" ,perl) -- 2.13.5 From debbugs-submit-bounces@debbugs.gnu.org Fri Oct 06 08:02:23 2017 Received: (at 28719) by debbugs.gnu.org; 6 Oct 2017 12:02:23 +0000 Received: from localhost ([127.0.0.1]:52260 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e0RKg-0006c9-R2 for submit@debbugs.gnu.org; Fri, 06 Oct 2017 08:02:23 -0400 Received: from mail-out.m-online.net ([212.18.0.9]:41228) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e0RKe-0006bj-6D for 28719@debbugs.gnu.org; Fri, 06 Oct 2017 08:02:20 -0400 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 3y7pCv26wGz1rJhD; Fri, 6 Oct 2017 14:02:19 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 3y7pCv10Z7z1qqkM; Fri, 6 Oct 2017 14:02:19 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id 8S4MWfHu2jh5; Fri, 6 Oct 2017 14:02:18 +0200 (CEST) Received: from hermia.goebel-consult.de (ppp-46-244-136-109.dynamic.mnet-online.de [46.244.136.109]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS; Fri, 6 Oct 2017 14:02:18 +0200 (CEST) Received: from lenashee.goebel-consult.de (lenashee.goebel-consult.de [192.168.110.2]) by hermia.goebel-consult.de (Postfix) with ESMTP id E0D976067C; Fri, 6 Oct 2017 14:02:15 +0200 (CEST) From: Hartmut Goebel To: 28719@debbugs.gnu.org Subject: [PATCH 2/6] gnu: qt: Fix install paths in submodules. Date: Fri, 6 Oct 2017 14:02:10 +0200 Message-Id: <20171006120214.29511-2-h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.13.5 In-Reply-To: <20171006120214.29511-1-h.goebel@crazy-compilers.com> References: <20171006120214.29511-1-h.goebel@crazy-compilers.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 28719 Cc: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) From: 宋文武 Before this, the paths in pkg-config (.pc) and libtool (.la) files of submodules are all pointing to qtbase. * gnu/packages/qt.scm (qtbase)[native-inputs]: Move 'which' to 'propagated-inputs'. [arguments]: Rename 'patch-mkspecs' phase to 'patch-mkspecs' and patch more qmake spec files there. (qtsvg)[arguments]: Add 'configure-qmake' phase. --- gnu/packages/qt.scm | 86 +++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 63 insertions(+), 23 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index e276eb05b..88e0011b1 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -376,7 +376,8 @@ developers using C++ or QML, a CSS & JavaScript like language.") #t)))) (build-system gnu-build-system) (propagated-inputs - `(("mesa" ,mesa))) + `(("mesa" ,mesa) + ("which" ,(@ (gnu packages base) which)))) (inputs `(("alsa-lib" ,alsa-lib) ("cups" ,cups) @@ -427,8 +428,7 @@ developers using C++ or QML, a CSS & JavaScript like language.") ("perl" ,perl) ("pkg-config" ,pkg-config) ("python" ,python-2) - ("ruby" ,ruby) - ("which" ,(@ (gnu packages base) which)))) + ("ruby" ,ruby))) (arguments `(#:phases (modify-phases %standard-phases @@ -492,10 +492,11 @@ developers using C++ or QML, a CSS & JavaScript like language.") '("-no-sse2")) "-no-mips_dsp" "-no-mips_dspr2"))))) - (add-after 'install 'patch-qt_config.prf + (add-after 'install 'patch-mkspecs (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) - (mkspecs (string-append out "/lib/qt5/mkspecs")) + (archdata (string-append out "/lib/qt5")) + (mkspecs (string-append archdata "/mkspecs")) (qt_config.prf (string-append mkspecs "/features/qt_config.prf"))) ;; For each Qt module, let `qmake' uses search paths in the @@ -509,6 +510,20 @@ developers using C++ or QML, a CSS & JavaScript like language.") "$$clean_path($$replace(dir, mkspecs/modules, ../../lib))") (("\\$\\$\\[QT_INSTALL_BINS\\]") "$$clean_path($$replace(dir, mkspecs/modules, ../../bin))")) + + ;; Searches Qt tools in the current PATH instead of QT_HOST_BINS. + (substitute* (string-append mkspecs "/features/qt_functions.prf") + (("cmd = \\$\\$\\[QT_HOST_BINS\\]/\\$\\$2") + "cmd = $$system(which $${2}.pl 2>/dev/null || which $${2})")) + + ;; Resolve qmake spec files within qtbase by absolute paths. + (substitute* + (map (lambda (file) + (string-append mkspecs "/features/" file)) + '("device_config.prf" "moc.prf" "qt_build_config.prf" + "qt_config.prf" "winrt/package_manifest.prf")) + (("\\$\\$\\[QT_HOST_DATA/get\\]") archdata) + (("\\$\\$\\[QT_HOST_DATA/src\\]") archdata)) #t)))))) (native-search-paths (list (search-path-specification @@ -554,26 +569,51 @@ developers using C++ or QML, a CSS & JavaScript like language.") (arguments `(#:phases (modify-phases %standard-phases - (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - ;; Valid QT_BUILD_PARTS variables are: - ;; libs tools tests examples demos docs translations - (zero? (system* "qmake" "QT_BUILD_PARTS = libs tools tests" - (string-append "PREFIX=" out)))))) - (add-before 'install 'fix-Makefiles + (add-before 'configure 'configure-qmake (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (qtbase (assoc-ref inputs "qtbase"))) - (substitute* (find-files "." "Makefile") - (((string-append "INSTALL_ROOT)" qtbase)) - (string-append "INSTALL_ROOT)" out))) + (let* ((out (assoc-ref outputs "out")) + (qtbase (assoc-ref inputs "qtbase")) + (tmpdir (string-append (getenv "TMPDIR"))) + (qmake (string-append tmpdir "/qmake")) + (qt.conf (string-append tmpdir "/qt.conf"))) + ;; Use qmake with a customized qt.conf to override install + ;; paths to $out. + (symlink (which "qmake") qmake) + (setenv "PATH" (string-append tmpdir ":" (getenv "PATH"))) + (with-output-to-file qt.conf + (lambda () + (format #t "[Paths] +Prefix=~a +ArchData=lib/qt5 +Data=share/qt5 +Documentation=share/doc/qt5 +Headers=include/qt5 +Libraries=lib +LibraryExecutables=lib/qt5/libexec +Binaries=bin +Tests=tests +Plugins=lib/qt5/plugins +Imports=lib/qt5/imports +Qml2Imports=lib/qt5/qml +Translations=share/qt5/translations +Settings=etc/xdg +Examples=share/doc/qt5/examples +HostPrefix=~a +HostData=lib/qt5 +HostBinaries=bin +HostLibraries=lib +" out out))) #t))) - (add-before 'check 'set-display - (lambda _ - ;; make Qt render "offscreen", required for tests - (setenv "QT_QPA_PLATFORM" "offscreen") - #t))))))) + (replace 'configure + (lambda* (#:key inputs outputs #:allow-other-keys) + ;; Valid QT_BUILD_PARTS variables are: + ;; libs tools tests examples demos docs translations + (zero? (system* "qmake" "QT_BUILD_PARTS = libs tools tests")))) + (add-before 'check 'set-display + (lambda _ + ;; make Qt render "offscreen", required for tests + (setenv "QT_QPA_PLATFORM" "offscreen") + #t))))))) (define-public qtimageformats (package (inherit qtsvg) -- 2.13.5 From debbugs-submit-bounces@debbugs.gnu.org Fri Oct 06 08:02:23 2017 Received: (at 28719) by debbugs.gnu.org; 6 Oct 2017 12:02:23 +0000 Received: from localhost ([127.0.0.1]:52262 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e0RKh-0006cD-6b for submit@debbugs.gnu.org; Fri, 06 Oct 2017 08:02:23 -0400 Received: from mail-out.m-online.net ([212.18.0.10]:44738) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e0RKe-0006bq-Rt for 28719@debbugs.gnu.org; Fri, 06 Oct 2017 08:02:21 -0400 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 3y7pCw2Svqz1qxLJ; Fri, 6 Oct 2017 14:02:20 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 3y7pCw2FFCz1sVdm; Fri, 6 Oct 2017 14:02:20 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id omDygTy3AeEk; Fri, 6 Oct 2017 14:02:19 +0200 (CEST) Received: from hermia.goebel-consult.de (ppp-46-244-136-109.dynamic.mnet-online.de [46.244.136.109]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS; Fri, 6 Oct 2017 14:02:19 +0200 (CEST) Received: from lenashee.goebel-consult.de (lenashee.goebel-consult.de [192.168.110.2]) by hermia.goebel-consult.de (Postfix) with ESMTP id 07A856094A; Fri, 6 Oct 2017 14:02:16 +0200 (CEST) From: Hartmut Goebel To: 28719@debbugs.gnu.org Subject: [PATCH 3/6] gnu: qwt: Adjust installation directory layout. Date: Fri, 6 Oct 2017 14:02:11 +0200 Message-Id: <20171006120214.29511-3-h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.13.5 In-Reply-To: <20171006120214.29511-1-h.goebel@crazy-compilers.com> References: <20171006120214.29511-1-h.goebel@crazy-compilers.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 28719 Cc: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) From: 宋文武 * gnu/packages/qt.scm (qwt)[arguments]<#:phases>: Modify 'qwtconfig.pri' to use a directory layout that matching qtbase. Modify 'doc/doc.pro' to remove the misplaced installation of man pages. Rename phase 'install-documentation' to 'install-man-pages'. --- gnu/packages/qt.scm | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 88e0011b1..f9f1278c7 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1600,11 +1600,27 @@ securely. It will not store any data unencrypted unless explicitly requested.") (modify-phases %standard-phases (replace 'configure (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) + (let* ((out (assoc-ref outputs "out")) + (docdir (string-append out "/share/doc/qwt")) + (incdir (string-append out "/include/qwt")) + (pluginsdir (string-append out "/lib/qt5/plugins/designer")) + (featuresdir (string-append out "/lib/qt5/mkspecs/features"))) (substitute* '("qwtconfig.pri") - (("/usr/local/qwt-\\$\\$QWT\\_VERSION") out)) + (("^(\\s*QWT_INSTALL_PREFIX)\\s*=.*" _ x) + (format #f "~a = ~a\n" x out)) + (("^(QWT_INSTALL_DOCS)\\s*=.*" _ x) + (format #f "~a = ~a\n" x docdir)) + (("^(QWT_INSTALL_HEADERS)\\s*=.*" _ x) + (format #f "~a = ~a\n" x incdir)) + (("^(QWT_INSTALL_PLUGINS)\\s*=.*" _ x) + (format #f "~a = ~a\n" x pluginsdir)) + (("^(QWT_INSTALL_FEATURES)\\s*=.*" _ x) + (format #f "~a = ~a\n" x featuresdir))) + (substitute* '("doc/doc.pro") + ;; We'll install them in the 'install-man-pages' phase. + (("^unix:doc\\.files.*") "")) (zero? (system* "qmake"))))) - (add-after 'install 'install-documentation + (add-after 'install 'install-man-pages (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (man (string-append out "/share/man"))) -- 2.13.5 From debbugs-submit-bounces@debbugs.gnu.org Fri Oct 06 08:02:24 2017 Received: (at 28719) by debbugs.gnu.org; 6 Oct 2017 12:02:24 +0000 Received: from localhost ([127.0.0.1]:52265 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e0RKi-0006cW-HY for submit@debbugs.gnu.org; Fri, 06 Oct 2017 08:02:24 -0400 Received: from mail-out.m-online.net ([212.18.0.10]:43261) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e0RKh-0006cB-9j for 28719@debbugs.gnu.org; Fri, 06 Oct 2017 08:02:23 -0400 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 3y7pCy5gWZz1qxLP for <28719@debbugs.gnu.org>; Fri, 6 Oct 2017 14:02:22 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 3y7pCy5bKhz1sVdl for <28719@debbugs.gnu.org>; Fri, 6 Oct 2017 14:02:22 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id yMEilgsv-CN0 for <28719@debbugs.gnu.org>; Fri, 6 Oct 2017 14:02:20 +0200 (CEST) Received: from hermia.goebel-consult.de (ppp-46-244-136-109.dynamic.mnet-online.de [46.244.136.109]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS for <28719@debbugs.gnu.org>; Fri, 6 Oct 2017 14:02:20 +0200 (CEST) Received: from lenashee.goebel-consult.de (lenashee.goebel-consult.de [192.168.110.2]) by hermia.goebel-consult.de (Postfix) with ESMTP id 1CB0C60AA9 for <28719@debbugs.gnu.org>; Fri, 6 Oct 2017 14:02:16 +0200 (CEST) From: Hartmut Goebel To: 28719@debbugs.gnu.org Subject: [PATCH 4/6] gnu: qtwebkit: Fix rpath for the qmlwebkit plugins. Date: Fri, 6 Oct 2017 14:02:12 +0200 Message-Id: <20171006120214.29511-4-h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.13.5 In-Reply-To: <20171006120214.29511-1-h.goebel@crazy-compilers.com> References: <20171006120214.29511-1-h.goebel@crazy-compilers.com> X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 28719 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) 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 f9f1278c7..1b5058ba1 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"))) -- 2.13.5 From debbugs-submit-bounces@debbugs.gnu.org Fri Oct 06 08:02:26 2017 Received: (at 28719) by debbugs.gnu.org; 6 Oct 2017 12:02:26 +0000 Received: from localhost ([127.0.0.1]:52268 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e0RKj-0006cj-PI for submit@debbugs.gnu.org; Fri, 06 Oct 2017 08:02:25 -0400 Received: from mail-out.m-online.net ([212.18.0.9]:38209) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e0RKi-0006cV-NY for 28719@debbugs.gnu.org; Fri, 06 Oct 2017 08:02:25 -0400 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 3y7pD01dJYz1rJhD for <28719@debbugs.gnu.org>; Fri, 6 Oct 2017 14:02:24 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 3y7pD01W8Vz1sVdn for <28719@debbugs.gnu.org>; Fri, 6 Oct 2017 14:02:24 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id vQQfXxrK93uh for <28719@debbugs.gnu.org>; Fri, 6 Oct 2017 14:02:23 +0200 (CEST) Received: from hermia.goebel-consult.de (ppp-46-244-136-109.dynamic.mnet-online.de [46.244.136.109]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS for <28719@debbugs.gnu.org>; Fri, 6 Oct 2017 14:02:23 +0200 (CEST) Received: from lenashee.goebel-consult.de (lenashee.goebel-consult.de [192.168.110.2]) by hermia.goebel-consult.de (Postfix) with ESMTP id 37B6B60BA2 for <28719@debbugs.gnu.org>; Fri, 6 Oct 2017 14:02:16 +0200 (CEST) From: Hartmut Goebel To: 28719@debbugs.gnu.org Subject: [PATCH 5/6] gnu: qscintilla: Adjust installation directory layout. Date: Fri, 6 Oct 2017 14:02:13 +0200 Message-Id: <20171006120214.29511-5-h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.13.5 In-Reply-To: <20171006120214.29511-1-h.goebel@crazy-compilers.com> References: <20171006120214.29511-1-h.goebel@crazy-compilers.com> X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 28719 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) * gnu/packages/qt.scm (qscintilla)[#:phase configure]: Set QT_INSTALL_DATA and QT_HOST_DATA to $OUT/lib/qt5. --- 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 1b5058ba1..775982757 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1467,8 +1467,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 From debbugs-submit-bounces@debbugs.gnu.org Fri Oct 06 08:02:29 2017 Received: (at 28719) by debbugs.gnu.org; 6 Oct 2017 12:02:29 +0000 Received: from localhost ([127.0.0.1]:52271 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e0RKn-0006cz-0H for submit@debbugs.gnu.org; Fri, 06 Oct 2017 08:02:29 -0400 Received: from mail-out.m-online.net ([212.18.0.9]:39931) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e0RKk-0006cr-SI for 28719@debbugs.gnu.org; Fri, 06 Oct 2017 08:02:27 -0400 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 3y7pD22hhCz1rJhP for <28719@debbugs.gnu.org>; Fri, 6 Oct 2017 14:02:26 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 3y7pD22cztz1sVdl for <28719@debbugs.gnu.org>; Fri, 6 Oct 2017 14:02:26 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id 3qTTpAhg3SQi for <28719@debbugs.gnu.org>; Fri, 6 Oct 2017 14:02:24 +0200 (CEST) Received: from hermia.goebel-consult.de (ppp-46-244-136-109.dynamic.mnet-online.de [46.244.136.109]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS for <28719@debbugs.gnu.org>; Fri, 6 Oct 2017 14:02:24 +0200 (CEST) Received: from lenashee.goebel-consult.de (lenashee.goebel-consult.de [192.168.110.2]) by hermia.goebel-consult.de (Postfix) with ESMTP id 4D4BF60D73 for <28719@debbugs.gnu.org>; Fri, 6 Oct 2017 14:02:16 +0200 (CEST) From: Hartmut Goebel To: 28719@debbugs.gnu.org Subject: [PATCH 6/6] gnu: kde-framworks: Fix installation directories. Date: Fri, 6 Oct 2017 14:02:14 +0200 Message-Id: <20171006120214.29511-6-h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.13.5 In-Reply-To: <20171006120214.29511-1-h.goebel@crazy-compilers.com> References: <20171006120214.29511-1-h.goebel@crazy-compilers.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 28719 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) 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 From debbugs-submit-bounces@debbugs.gnu.org Tue Oct 10 08:01:14 2017 Received: (at 28719) by debbugs.gnu.org; 10 Oct 2017 12:01:14 +0000 Received: from localhost ([127.0.0.1]:59349 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e1tDm-0007rt-C8 for submit@debbugs.gnu.org; Tue, 10 Oct 2017 08:01:14 -0400 Received: from rezeros.cc ([45.76.207.221]:56544) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e1tDj-0007rj-W4 for 28719@debbugs.gnu.org; Tue, 10 Oct 2017 08:01:12 -0400 Received: from localhost (36.24.16.8 [36.24.16.8]) by rezeros.cc (OpenSMTPD) with ESMTPSA id 0eec7c78 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO); Tue, 10 Oct 2017 12:00:39 +0000 (UTC) Received: from gift (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id f0bd6228; Tue, 10 Oct 2017 11:01:04 +0000 (UTC) From: iyzsong@member.fsf.org (=?utf-8?B?5a6L5paH5q2m?=) To: Hartmut Goebel Subject: Re: [PATCH 2/6] gnu: qt: Fix install paths in submodules. References: <20171006120214.29511-1-h.goebel@crazy-compilers.com> <20171006120214.29511-2-h.goebel@crazy-compilers.com> Date: Tue, 10 Oct 2017 19:01:04 +0800 In-Reply-To: <20171006120214.29511-2-h.goebel@crazy-compilers.com> (Hartmut Goebel's message of "Fri, 6 Oct 2017 14:02:10 +0200") Message-ID: <87infn1d3j.fsf@member.fsf.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: 28719 Cc: 28719@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.0 (+) Hartmut Goebel writes: > From: =E5=AE=8B=E6=96=87=E6=AD=A6 > > Before this, the paths in pkg-config (.pc) and libtool (.la) files of > submodules are all pointing to qtbase. > > * gnu/packages/qt.scm (qtbase)[native-inputs]: Move 'which' to > 'propagated-inputs'. > [arguments]: Rename 'patch-mkspecs' phase to 'patch-mkspecs' and patch > more qmake spec files there. Typo.. Should be: Rename 'patch-qt_config.prf' phase to 'patch-mkspecs' ... From debbugs-submit-bounces@debbugs.gnu.org Tue Oct 10 08:05:32 2017 Received: (at 28719) by debbugs.gnu.org; 10 Oct 2017 12:05:32 +0000 Received: from localhost ([127.0.0.1]:59353 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e1tHs-0007yX-Sx for submit@debbugs.gnu.org; Tue, 10 Oct 2017 08:05:32 -0400 Received: from rezeros.cc ([45.76.207.221]:56546) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e1tHn-0007yK-U1 for 28719@debbugs.gnu.org; Tue, 10 Oct 2017 08:05:27 -0400 Received: from localhost (36.24.16.8 [36.24.16.8]) by rezeros.cc (OpenSMTPD) with ESMTPSA id 9308afd8 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO); Tue, 10 Oct 2017 12:04:47 +0000 (UTC) Received: from gift (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 27bdfc13; Tue, 10 Oct 2017 11:05:12 +0000 (UTC) From: iyzsong@member.fsf.org (=?utf-8?B?5a6L5paH5q2m?=) To: Hartmut Goebel Subject: Re: [bug#28719] [PATCH 5/6] gnu: qscintilla: Adjust installation directory layout. References: <20171006120214.29511-1-h.goebel@crazy-compilers.com> <20171006120214.29511-5-h.goebel@crazy-compilers.com> Date: Tue, 10 Oct 2017 19:05:12 +0800 In-Reply-To: <20171006120214.29511-5-h.goebel@crazy-compilers.com> (Hartmut Goebel's message of "Fri, 6 Oct 2017 14:02:13 +0200") Message-ID: <87efqb1cwn.fsf@member.fsf.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: 28719 Cc: 28719@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.0 (+) Hartmut Goebel writes: > * gnu/packages/qt.scm (qscintilla)[#:phase configure]: Set QT_INSTALL_DATA and > QT_HOST_DATA to $OUT/lib/qt5. > --- > 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 1b5058ba1..775982757 100644 > --- a/gnu/packages/qt.scm > +++ b/gnu/packages/qt.scm > @@ -1467,8 +1467,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") Idelly, With the previous "Fix install paths" patch, this substitute for qscintilla.pro could be removed. Can you check it? Thanks! From debbugs-submit-bounces@debbugs.gnu.org Tue Oct 10 10:43:20 2017 Received: (at 28719) by debbugs.gnu.org; 10 Oct 2017 14:43:20 +0000 Received: from localhost ([127.0.0.1]:60744 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e1vke-0005eP-BA for submit@debbugs.gnu.org; Tue, 10 Oct 2017 10:43:20 -0400 Received: from mail-out.m-online.net ([212.18.0.10]:33440) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e1vkb-0005eD-JK for 28719@debbugs.gnu.org; Tue, 10 Oct 2017 10:43:18 -0400 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 3yBKbm3d2kz1qx3Y; Tue, 10 Oct 2017 16:43:16 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 3yBKbm2Z5Qz1qvMv; Tue, 10 Oct 2017 16:43:16 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id sjbPsgTfiSiL; Tue, 10 Oct 2017 16:43:15 +0200 (CEST) Received: from hermia.goebel-consult.de (ppp-46-244-139-23.dynamic.mnet-online.de [46.244.139.23]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS; Tue, 10 Oct 2017 16:43:15 +0200 (CEST) Received: from [192.168.110.2] (lenashee.goebel-consult.de [192.168.110.2]) by hermia.goebel-consult.de (Postfix) with ESMTP id AEEF2601A1; Tue, 10 Oct 2017 16:43:35 +0200 (CEST) Subject: Re: [bug#28719] [PATCH 5/6] gnu: qscintilla: Adjust installation directory layout. To: =?UTF-8?B?5a6L5paH5q2m?= References: <20171006120214.29511-1-h.goebel@crazy-compilers.com> <20171006120214.29511-5-h.goebel@crazy-compilers.com> <87efqb1cwn.fsf@member.fsf.org> From: Hartmut Goebel Organization: crazy-compilers.com Message-ID: <9f9121f4-f797-df32-6f43-a5181f0b0b6e@crazy-compilers.com> Date: Tue, 10 Oct 2017 16:43:15 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.3.0 MIME-Version: 1.0 In-Reply-To: <87efqb1cwn.fsf@member.fsf.org> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Content-Language: en-US X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 28719 Cc: 28719@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) Am 10.10.2017 um 13:05 schrieb 宋文武: > Idelly, With the previous "Fix install paths" patch, this substitute for > qscintilla.pro could be removed. Can you check it? Yes, I'll check it in the next days. -- Regards Hartmut Goebel | Hartmut Goebel | h.goebel@crazy-compilers.com | | www.crazy-compilers.com | compilers which you thought are impossible | From debbugs-submit-bounces@debbugs.gnu.org Tue Oct 10 11:39:12 2017 Received: (at 28719) by debbugs.gnu.org; 10 Oct 2017 15:39:12 +0000 Received: from localhost ([127.0.0.1]:60799 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e1wci-0000UK-6D for submit@debbugs.gnu.org; Tue, 10 Oct 2017 11:39:12 -0400 Received: from mail-out.m-online.net ([212.18.0.9]:53347) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e1wch-0000UB-5O for 28719@debbugs.gnu.org; Tue, 10 Oct 2017 11:39:11 -0400 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 3yBLrG0P9kz1qw8c; Tue, 10 Oct 2017 17:39:09 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 3yBLrF6FX3z1qySs; Tue, 10 Oct 2017 17:39:09 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id J2BPoLl7FI8M; Tue, 10 Oct 2017 17:39:04 +0200 (CEST) Received: from hermia.goebel-consult.de (ppp-46-244-139-23.dynamic.mnet-online.de [46.244.139.23]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS; Tue, 10 Oct 2017 17:39:04 +0200 (CEST) Received: from [192.168.110.2] (lenashee.goebel-consult.de [192.168.110.2]) by hermia.goebel-consult.de (Postfix) with ESMTP id D01CB60162; Tue, 10 Oct 2017 17:39:23 +0200 (CEST) Subject: Re: [bug#28719] [PATCH 5/6] gnu: qscintilla: Adjust installation directory layout. To: =?UTF-8?B?5a6L5paH5q2m?= References: <20171006120214.29511-1-h.goebel@crazy-compilers.com> <20171006120214.29511-5-h.goebel@crazy-compilers.com> <87efqb1cwn.fsf@member.fsf.org> From: Hartmut Goebel Organization: crazy-compilers.com Message-ID: <41f1882d-41a5-4992-bb7d-d0b5481c6ca5@crazy-compilers.com> Date: Tue, 10 Oct 2017 17:39:03 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.3.0 MIME-Version: 1.0 In-Reply-To: <87efqb1cwn.fsf@member.fsf.org> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Content-Language: en-US X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 28719 Cc: 28719@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) Am 10.10.2017 um 13:05 schrieb =E5=AE=8B=E6=96=87=E6=AD=A6: > Idelly, With the previous "Fix install paths" patch, this substitute fo= r > qscintilla.pro could be removed. Can you check it? Thanks! Found time to test it earlier :-) I tested it and this substitute is still needed. The reason AFAICT is that QScintilla - is referring to variables defined in qmake, while the other packages are using some definition-file in qtbase. The variables are set as follows: $ /gnu/store/=E2=80=A6-qtbase-5.9.1/bin/qmake -query QT_SYSROOT: QT_INSTALL_PREFIX:/gnu/store/=E2=80=A6-qtbase-5.9.1 QT_INSTALL_ARCHDATA:/gnu/store/=E2=80=A6-qtbase-5.9.1/lib/qt5 =E2=80=A6 I tried =C2=A0=C2=A0=C2=A0 qmake -set QT_INSTALL_PREFIX /gnu/store/=E2=80=A6-qtba= se-5.9.1 without success. This - only set QT_INSTALL_PREFIX but not the other variables. - stores this setting tin the users home and thus effects all projects (not much of a problem in guix build, though). --=20 Regards Hartmut Goebel | Hartmut Goebel | h.goebel@crazy-compilers.com | | www.crazy-compilers.com | compilers which you thought are impossible | From debbugs-submit-bounces@debbugs.gnu.org Thu Oct 12 07:27:38 2017 Received: (at 28719) by debbugs.gnu.org; 12 Oct 2017 11:27:39 +0000 Received: from localhost ([127.0.0.1]:34930 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e2beM-0002OR-Nz for submit@debbugs.gnu.org; Thu, 12 Oct 2017 07:27:38 -0400 Received: from rezeros.cc ([45.76.207.221]:56552) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e2beJ-0002OF-Bq for 28719@debbugs.gnu.org; Thu, 12 Oct 2017 07:27:37 -0400 Received: from localhost (36.24.16.8 [36.24.16.8]) by rezeros.cc (OpenSMTPD) with ESMTPSA id 95c1dc80 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO); Thu, 12 Oct 2017 11:26:59 +0000 (UTC) Received: from gift (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 11228bd1; Thu, 12 Oct 2017 11:27:22 +0000 (UTC) From: iyzsong@member.fsf.org (=?utf-8?B?5a6L5paH5q2m?=) To: Hartmut Goebel Subject: Re: [bug#28719] [PATCH 5/6] gnu: qscintilla: Adjust installation directory layout. References: <20171006120214.29511-1-h.goebel@crazy-compilers.com> <20171006120214.29511-5-h.goebel@crazy-compilers.com> <87efqb1cwn.fsf@member.fsf.org> <41f1882d-41a5-4992-bb7d-d0b5481c6ca5@crazy-compilers.com> Date: Thu, 12 Oct 2017 19:27:22 +0800 In-Reply-To: <41f1882d-41a5-4992-bb7d-d0b5481c6ca5@crazy-compilers.com> (Hartmut Goebel's message of "Tue, 10 Oct 2017 17:39:03 +0200") Message-ID: <87y3ogip2d.fsf@member.fsf.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: 28719 Cc: 28719@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.0 (+) Hartmut Goebel writes: > Am 10.10.2017 um 13:05 schrieb =E5=AE=8B=E6=96=87=E6=AD=A6: >> Idelly, With the previous "Fix install paths" patch, this substitute for >> qscintilla.pro could be removed. Can you check it? Thanks! > > Found time to test it earlier :-) > > I tested it and this substitute is still needed. The reason AFAICT is > that QScintilla - is referring to variables defined in qmake, while the > other packages are using some definition-file in qtbase. The variables > are set as follows: > > $ /gnu/store/=E2=80=A6-qtbase-5.9.1/bin/qmake -query > QT_SYSROOT: > QT_INSTALL_PREFIX:/gnu/store/=E2=80=A6-qtbase-5.9.1 > QT_INSTALL_ARCHDATA:/gnu/store/=E2=80=A6-qtbase-5.9.1/lib/qt5 > =E2=80=A6 > Oh, my bad. I forget that those variables will only be correct when qmake is using the customized qt.conf (like qtsvg), you can make qscintilla inherit from qtsvg to use its 'configure-qmake' phase. From debbugs-submit-bounces@debbugs.gnu.org Fri Oct 13 09:37:46 2017 Received: (at 28719-close) by debbugs.gnu.org; 13 Oct 2017 13:37:46 +0000 Received: from localhost ([127.0.0.1]:37015 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e309q-00011e-MM for submit@debbugs.gnu.org; Fri, 13 Oct 2017 09:37:46 -0400 Received: from mail-out.m-online.net ([212.18.0.10]:37283) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e309o-00011T-UG for 28719-close@debbugs.gnu.org; Fri, 13 Oct 2017 09:37:45 -0400 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 3yD80l0hWmz1qtNv; Fri, 13 Oct 2017 15:37:42 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 3yD80k3xG7z1qql8; Fri, 13 Oct 2017 15:37:42 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id pjFvW5s7SC-s; Fri, 13 Oct 2017 15:37:41 +0200 (CEST) Received: from hermia.goebel-consult.de (ppp-93-104-82-79.dynamic.mnet-online.de [93.104.82.79]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS; Fri, 13 Oct 2017 15:37:41 +0200 (CEST) Received: from [192.168.110.2] (lenashee.goebel-consult.de [192.168.110.2]) by hermia.goebel-consult.de (Postfix) with ESMTP id B77EC6063E; Fri, 13 Oct 2017 15:37:41 +0200 (CEST) Subject: Re: [bug#28719] [PATCH 5/6] gnu: qscintilla: Adjust installation directory layout. To: =?UTF-8?B?5a6L5paH5q2m?= References: <20171006120214.29511-1-h.goebel@crazy-compilers.com> <20171006120214.29511-5-h.goebel@crazy-compilers.com> <87efqb1cwn.fsf@member.fsf.org> <41f1882d-41a5-4992-bb7d-d0b5481c6ca5@crazy-compilers.com> <87y3ogip2d.fsf@member.fsf.org> From: Hartmut Goebel Organization: crazy-compilers.com Message-ID: <3c7fe2dc-dedc-e927-6ac2-522e840207e7@crazy-compilers.com> Date: Fri, 13 Oct 2017 15:37:41 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.3.0 MIME-Version: 1.0 In-Reply-To: <87y3ogip2d.fsf@member.fsf.org> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Content-Language: en-US X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 28719-close Cc: 28719-close@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) I pushed the changes as 5430732b22dcee5ae162826ee1dfefb9510eaeca, including the fixed commit-message for "qt: Fix install paths in submodules". Thanks for the review. Am 12.10.2017 um 13:27 schrieb 宋文武: > Oh, my bad. I forget that those variables will only be correct when > qmake is using the customized qt.conf (like qtsvg), you can make > qscintilla inherit from qtsvg to use its 'configure-qmake' phase. I did not implement this for two reasons: - qtsvg is unrelated to QScintilla, so I would find it confusing to inherit it. - Creating a qt.conf file is much more code than just chaining some variable in an existing file. - I want to get it finished :-) So I somebody wants to implement a 'configure-qmake' phase I will not object. -- Regards Hartmut Goebel | Hartmut Goebel | h.goebel@crazy-compilers.com | | www.crazy-compilers.com | compilers which you thought are impossible | From debbugs-submit-bounces@debbugs.gnu.org Sat Oct 14 02:30:21 2017 Received: (at 28719-close) by debbugs.gnu.org; 14 Oct 2017 06:30:22 +0000 Received: from localhost ([127.0.0.1]:38696 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e3Fxl-0008H2-Nb for submit@debbugs.gnu.org; Sat, 14 Oct 2017 02:30:21 -0400 Received: from rezeros.cc ([45.76.207.221]:56564) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e3Fxi-0008Gg-B7 for 28719-close@debbugs.gnu.org; Sat, 14 Oct 2017 02:30:19 -0400 Received: from localhost (183.158.177.34 [183.158.177.34]) by rezeros.cc (OpenSMTPD) with ESMTPSA id a38f1b6a (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO); Sat, 14 Oct 2017 06:29:43 +0000 (UTC) Received: from gift (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 9dd3a270; Sat, 14 Oct 2017 06:30:10 +0000 (UTC) From: iyzsong@member.fsf.org (=?utf-8?B?5a6L5paH5q2m?=) To: Hartmut Goebel Subject: Re: [bug#28719] [PATCH 5/6] gnu: qscintilla: Adjust installation directory layout. References: <20171006120214.29511-1-h.goebel@crazy-compilers.com> <20171006120214.29511-5-h.goebel@crazy-compilers.com> <87efqb1cwn.fsf@member.fsf.org> <41f1882d-41a5-4992-bb7d-d0b5481c6ca5@crazy-compilers.com> <87y3ogip2d.fsf@member.fsf.org> <3c7fe2dc-dedc-e927-6ac2-522e840207e7@crazy-compilers.com> Date: Sat, 14 Oct 2017 14:30:09 +0800 In-Reply-To: <3c7fe2dc-dedc-e927-6ac2-522e840207e7@crazy-compilers.com> (Hartmut Goebel's message of "Fri, 13 Oct 2017 15:37:41 +0200") Message-ID: <87zi8up7gu.fsf@member.fsf.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: 28719-close Cc: 28719-close@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.0 (+) Hartmut Goebel writes: > I pushed the changes as 5430732b22dcee5ae162826ee1dfefb9510eaeca, > including the fixed commit-message for "qt: Fix install paths in > submodules". > > Thanks for the review. > Cool, thanks for the work! From unknown Sun Sep 07 16:50:18 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sat, 11 Nov 2017 12:24:04 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator