From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id KJ0NMsEGuF5LYwAA0tVLHw (envelope-from ) for ; Sun, 10 May 2020 13:50:57 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id 4FPYFs8GuF7vFAAAbx9fmQ (envelope-from ) for ; Sun, 10 May 2020 13:51:11 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 1B1D5940F35 for ; Sun, 10 May 2020 13:51:09 +0000 (UTC) Received: from localhost ([::1]:42386 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jXmMG-0002U2-96 for larch@yhetil.org; Sun, 10 May 2020 09:51:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41544) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jXmLD-0001Yd-Hx for guix-patches@gnu.org; Sun, 10 May 2020 09:50:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:37681) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jXmLD-0007Jn-6V for guix-patches@gnu.org; Sun, 10 May 2020 09:50:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jXmLD-00080e-5A for guix-patches@gnu.org; Sun, 10 May 2020 09:50:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40777] [PATCH 1/3] gnu: qtdeclarative: Fix reference on qmlcachegen. Resent-From: Jonathan Brielmaier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 10 May 2020 13:50:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40777 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40777@debbugs.gnu.org Cc: Jonathan Brielmaier Received: via spool by 40777-submit@debbugs.gnu.org id=B40777.158911859530746 (code B ref 40777); Sun, 10 May 2020 13:50:03 +0000 Received: (at 40777) by debbugs.gnu.org; 10 May 2020 13:49:55 +0000 Received: from localhost ([127.0.0.1]:49222 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jXmL5-0007zk-2a for submit@debbugs.gnu.org; Sun, 10 May 2020 09:49:55 -0400 Received: from mout.web.de ([212.227.15.3]:55681) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jXmKr-0007yj-Jr for 40777@debbugs.gnu.org; Sun, 10 May 2020 09:49:42 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1589118576; bh=Ygbdc331iSdSCOh88EszYIWdvlZDlHe46obhJqwSitw=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=fIRUXHwqmEDHIyGZma1epMYI55Aw/ld+JvJIvQqs/Qoy0uRmKj7oSVcDDSCiSIaNa dGQTMO7U33OmeNjwYCrcWG2eYKfQZeGDv+mb0gUuG9ofMaAJoa8Bnt19YFdJERECPI YtuaYGVTkDUwpkWnbGgfx179lh5w7Ai2pI1xeWu4= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Received: from x250.fritz.box ([92.117.130.131]) by smtp.web.de (mrweb002 [213.165.67.108]) with ESMTPSA (Nemesis) id 0LwZ5z-1j2y003bMl-018Jak; Sun, 10 May 2020 15:49:35 +0200 From: Jonathan Brielmaier Date: Sun, 10 May 2020 15:49:20 +0200 Message-Id: <20200510134922.16128-2-jonathan.brielmaier@web.de> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200510134922.16128-1-jonathan.brielmaier@web.de> References: <20200510134922.16128-1-jonathan.brielmaier@web.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:OMxfNmGirMHfgNL032FY2fxUlwWFLhjvIlJLRHGt3dQSh2rhbSi 8xKtHHB3WpfuTn25dt5SLW3X7u+9rcqNk626cBoJWlv66zlUXUZBOiQlVNFX5J9oo5uQjkK 0O7M+840ArTxifYAi9Ocjl2Nc3mlT0wifBzCJPZ1+3pOtcOmcQBp046wfg0xNtCeaR3T1tB zwrPWSMZ5fZXFvFDZaMIg== X-UI-Out-Filterresults: notjunk:1;V03:K0:8PXm7fvA6qA=:CsiUjEFuWnWFG0dzi7mKl4 U8XfDFEy/QN8e3PaEXQZSWRVT142e5CZ07ZWTuZUlIo/VImLUPeSeF/FOKedgp/aks/N4JCG8 zYGwZwj+kfRWUDAdaY+YXcSLh/zNSvhQIi0z6FtqwZx8UC8jkU75Fp2tkbDoIIdStfwQlRFeJ RlrkTq06u5RH1+H1LJB4eEr4d6K0xQs3NTS+je08vzdJlvadNha/KKLo0jTz1+reAu1370jAW oyGqVdMu03GeWxrVm+TCstzzuVn20vDCAatmWam/bqkUdZDGF1acCnog8u0RVHblizjsb8sBX NFhZXoTJn/S3cf3ltbfTngg8v3Tk6F0UyJbAFtzuyPAeLwWELCXne0/U56ks19OUmW/NbxfxA JWmSxfPb5zyUAizykscIJDEEhLRPN1qO3XqpuHjGJoaxCGG+49eycSd9eXj14MeZR/cs/deWL V100WEQZ8+roEyMipZcLfBnxhSklkEk8O5uollptfRqQDI5sr+Qdu0nK8Ts80RylbzbT4SZBK LkHx4ahfOnt5X5U4HAIeEBpbybsXdzTvHjR5gZutSl57I1E2hKHuWbdpENXlW9hWgsobvided kKzCHMcyWaii+xl+5RdvS9SSiYlhqEtEfZB7suxWk+XiH/TSGCk54SUlQFaS/FoqcYaExNIgA JIOQF6VEDG5r9jZhQyHMIPdYNXmNeptIYSUFu0XlUZKxMXErOBG4uGtLxC9REVTPO5MBvre2Y w0AEoZgbivvd/2Wyh2ufJlpQ8tpMl4nwJV7epjz66Qqsr5SrxX071yhGCr03ILW+HdXGY4snA Ag61Q5AXNniN8b99pMjBgXtThX4VY6bwYQIqIQHY9W5eHJLfieT/5McDOTi11A+3cswMWStKp jaeMkxsH4IGmhoEgKxK6gEJlNFdRYi5JmXzYBsWsDYP4YbBXl31CHRZorprLK4QuZ1eWgBhV2 4aE9BbgiCRJM/s26oc85vJDTVGLXpuqFhw5K2XVCge26KfgXdhU5MlSxF8Jf7C4rs0kgnPHxz BxSfOcEv2Erfi/N+qp71zEEKJ0E9tmmKva4lhbLQN1yKVzm9Utu7XtG8CL215/iGtiASluw6f GbzMKB9a+g3NLfWP2CC3VqbhXBCroQmzpxQxHNkxBKJQvUtWmrYR9QAv5cPh/3+WeZoTVjt/F RjyQ6UzxBAJ6UgtJ63fvHwkLvdy0qaLfJc7DqWjGYABSDKAo2afUBmRib9/ZtNhV89WDSgFSv xmx41BDSC3XsnFHjd X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.7 (-) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 X-Spam-Score: 0.99 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=web.de header.s=dbaedf251592 header.b=fIRUXHwq; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Scan-Result: default: False [0.99 / 13.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; GENERIC_REPUTATION(0.00)[-0.53886723873098]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:209.51.188.0/24:c]; FREEMAIL_FROM(0.00)[web.de]; DWL_DNSWL_FAIL(0.00)[209.51.188.17:server fail]; R_DKIM_REJECT(1.00)[web.de:s=dbaedf251592]; IP_REPUTATION_HAM(0.00)[asn: 22989(0.08), country: US(-0.00), ip: 209.51.188.17(-0.54)]; DKIM_TRACE(0.00)[web.de:-]; RCPT_COUNT_TWO(0.00)[2]; MX_GOOD(-0.50)[cached: eggs.gnu.org]; MAILLIST(-0.20)[mailman]; FORGED_RECIPIENTS_MAILLIST(0.00)[]; RCVD_IN_DNSWL_FAIL(0.00)[209.51.188.17:server fail]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:22989, ipnet:209.51.188.0/24, country:US]; TAGGED_FROM(0.00)[larch=yhetil.org]; RECEIVED_SPAMHAUS_PBL(0.00)[92.117.130.131:received]; FROM_NEQ_ENVFROM(0.00)[jonathan.brielmaier@web.de,guix-patches-bounces@gnu.org]; ARC_NA(0.00)[]; URIBL_BLOCKED(0.00)[asu.edu:email,kadziolka.net:email]; FROM_HAS_DN(0.00)[]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[web.de]; HAS_LIST_UNSUB(-0.01)[]; MID_CONTAINS_FROM(1.00)[]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.51.188.17:from]; FREEMAIL_CC(0.00)[web.de]; RCVD_COUNT_SEVEN(0.00)[8]; FORGED_SENDER_MAILLIST(0.00)[] X-TUID: Q3dPcKxKKtUK * gnu/packages/qt.scm (qtdeclarative)[arguments]: Add phase to fix the reference on qmlcachegen in an installed cmake file. =2D-- gnu/packages/qt.scm | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index c9ac750cc5..f96cbaaca4 100644 =2D-- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -15,6 +15,7 @@ ;;; Copyright =C2=A9 2018 John Soo ;;; Copyright =C2=A9 2020 Mike Rosset ;;; Copyright =C2=A9 2020 Jakub K=C4=85dzio=C5=82ka +;;; Copyright =C2=A9 2020 Jonathan Brielmaier ;;; ;;; This file is part of GNU Guix. ;;; @@ -778,7 +779,17 @@ xmlpatternsvalidator."))) "1gg9xbv8ah4p55ws97brwn0csl0k3j1x6zdknrrsnh7j6nh0bp2w")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) - ((#:tests? _ #f) #f))) ; TODO: Enable the tests + ((#:tests? _ #f) #f) ; TODO: Enable the tests + ((#:phases phases) + `(modify-phases ,phases + ;; The qt5core install prefix is set to qtbase, but qmlcachegen= is + ;; provided by qtdeclarative + (add-after 'build 'fix-qt5core-install-prefix + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (substitute* "lib/cmake/Qt5QuickCompiler/Qt5QuickCompile= rConfig.cmake" + (("\\$\\{_qt5Core_install_prefix\\}") out )= )) + #t)))))) (native-inputs `(("perl" ,perl) ("pkg-config" ,pkg-config) =2D- 2.26.2