From patchwork Wed Apr 22 19:54:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jonathan Brielmaier X-Patchwork-Id: 21425 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 2F26427BBE4; Wed, 22 Apr 2020 20:59:02 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id D75C827BBE1 for ; Wed, 22 Apr 2020 20:59:01 +0100 (BST) Received: from localhost ([::1]:57063 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jRLWP-0001MM-5P for patchwork@mira.cbaines.net; Wed, 22 Apr 2020 15:59:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58466) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jRLVU-0001Fz-M5 for guix-patches@gnu.org; Wed, 22 Apr 2020 15:58:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jRLVS-0000nc-3G for guix-patches@gnu.org; Wed, 22 Apr 2020 15:58:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:41823) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jRLVR-0000m7-Nh for guix-patches@gnu.org; Wed, 22 Apr 2020 15:58:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jRLVR-0006kX-Li for guix-patches@gnu.org; Wed, 22 Apr 2020 15:58:01 -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: Wed, 22 Apr 2020 19:58:01 +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.158758544025864 (code B ref 40777); Wed, 22 Apr 2020 19:58:01 +0000 Received: (at 40777) by debbugs.gnu.org; 22 Apr 2020 19:57:20 +0000 Received: from localhost ([127.0.0.1]:53363 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jRLUl-0006j5-Rg for submit@debbugs.gnu.org; Wed, 22 Apr 2020 15:57:20 -0400 Received: from mout.web.de ([212.227.17.11]:33841) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jRLUj-0006in-LO for 40777@debbugs.gnu.org; Wed, 22 Apr 2020 15:57:18 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1587585431; bh=uNwywuw+bEYyBF3ysWpYHzeiASEpfbqZhaqjYS8LkHE=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=mxmR+y4I8oXiF/VAbGzzzbdCS0hZT/7Te0PosyJVQH8bmc/v4rq9NetziQFmOE11k OFfZKXhyAmUxaDgYLB8UaDBdg44wicpzKUXMuqIrLQ2nHSTK+WWcoBFtsyO7p7WsOv 0zT8CijyN0cLXdaeQoB+jjydueSFImeZVhbBa/cI= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Received: from localhost.localdomain ([92.117.247.84]) by smtp.web.de (mrweb102 [213.165.67.124]) with ESMTPSA (Nemesis) id 0M4I6Z-1jAVIS0dTX-00rsmZ; Wed, 22 Apr 2020 21:57:11 +0200 From: Jonathan Brielmaier Date: Wed, 22 Apr 2020 21:54:09 +0200 Message-Id: <20200422195411.9961-1-jonathan.brielmaier@web.de> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200422175643.7263-1-jonathan.brielmaier@web.de> References: <20200422175643.7263-1-jonathan.brielmaier@web.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:7bprY38z+EOoJ5GdgfbkALz7F4VrnwbraO5D9xcOpCDB4n/XHBL /o+m0T5w1h0Z1ajaMjkgfG54aH+XKxOTWyHH5OCTeDx4vmCbeUhdH7klgnrQoW+ZFmI8DZV ceQl+p6KrFYJFrPkWo0hcgMVqkmG8H/KJJFBpKQCRUKL+uAXPBLMLRz7OsO3aO9Q0TllSDl xA1+Us4M8YGGSD2sX8jhw== X-UI-Out-Filterresults: notjunk:1;V03:K0:JiwLyvEy098=:x6Oo9QpE02ye7r3DBPktem 7ZH9v6f+ya9qnMBgyg4ZNYmnFB0A4f2i0dYdCnuyuJV4B8llXWKGfA8u3Bdy12Com8x1YWeqH 5bNzc+TqiwmUn8Bce8pgaruPmDkliAW24UnFww+49i83vWor8MlU/Tc/xGGoyv6FkhGTwCmHh z3zGUBMtRlL3S37mk3UrNfjd+U0qwb/OynfDSrSKxBhBvH2TkERgsgse8wrMq2nT0N6PjqRJS 4ehqsGJofXCR9Ddvy6qHDTZj2H7gNGq5Ym14kX1f44vNX/BQt/a/jCFVR7QHWaZz7eFyVBxGz 7UCyiGefyAc1lvxGIrsjXHNVJnJHaFAVp//ukEE8MLm/FI2xhYYCfdEvf2phZxEXLuiAmswhH uIscJ3nNtIf5/MhcdbPmoQNudUD/fX/XUbXRkzS3O/GJQAMA7PckzdHWgEMRVtVyLj0iInlH6 FLXyOBu5307v7GDVC5EhZzBPW8Pg4BBcx9ahT+XiVbk0Ig+MScoWBRWoFEQRzidtpuqYFTb2X U6yCIUE9uYgqujwzjIow03PA6mGRWZg/EjZ5+/Ns6E3GguJHC5taAhIeLf+ymMiU2/A0TdQm/ lgAd+lSRPnpXjFQCM+TYXqN43i3ZM5TJmH6Synw+V28da8Xtbf0/AgvDbPRCUDEXEntITyXSR YYgtrh3Hi8tSELe+Kfyc1DVqTvqK4MlxWr0FU22V4JidezOKG5k5YFHmrfpMRZb1wZKh1VG3N /JZTH7pt7TVwL8fe0Klq0wYT0XoIOFCdebL6v1Y9FAFKSEOP4//ad3aBgzSGeGqvQbZGxUqnf YKEkyXm4d4bqDZ/GCmc4Ae1o/GMEsJZcKCprTRblniowsVceT0tVFUP5zQ7Nja+034k7ssjgA LZme1WI2mbjc+SNlWmtDxXmM9zsfOrhvrrWs6N6aFtdtsB/TLow5ft+6ijCf7hWcyR2l75939 0P+APR3o1qClT5Bc4VhkKHTjf8D9lW6CNkPqZsiC6t47MCxytuOE4k0NOyZ3ZVJrL0oetELaM WHaFxnrCnHmzhAD5BOaXuSCkgcVIruW3WpHdUTs6HqhmX95lVW6zeoPlD/tdUjxEf5U5VMw/g S5PEgz4zENgxzdHKAaoSorRJA3VFlFS5up0oWZVm8A9i4J3V7wX6YREWPormzQPN8qfTY5ted 115BofVW/xtQaitDMEG3540bHDBO8Vz2qL59pqQwvgCPzbanETB2zaotGiAMM+YrrPUeF2htu fQLuyOcXOjGeOQ62F X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/qt.scm (qtdeclarative)[arguments]: Add phase to fix the reference on qmlcachegen in an installed cmake file. --- gnu/packages/qt.scm | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) -- 2.26.0 diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 6ca052c31a..f540da458e 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -15,6 +15,7 @@ ;;; Copyright © 2018 John Soo ;;; Copyright © 2020 Mike Rosset ;;; Copyright © 2020 Jakub Kądziołka +;;; Copyright © 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/Qt5QuickCompilerConfig.cmake" + (("\\$\\{_qt5Core_install_prefix\\}") out ))) + #t)))))) (native-inputs `(("perl" ,perl) ("pkg-config" ,pkg-config)