From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id QHPrFbYi32IF5gAAbAwnHQ (envelope-from ) for ; Tue, 26 Jul 2022 01:09:42 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id aMX+FLYi32K94gAAG6o9tA (envelope-from ) for ; Tue, 26 Jul 2022 01:09:42 +0200 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 18A623FD09 for ; Tue, 26 Jul 2022 01:09:42 +0200 (CEST) Received: from localhost ([::1]:33816 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oG7Cn-00062i-9R for larch@yhetil.org; Mon, 25 Jul 2022 19:09:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36674) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oG7CA-0005Wd-MO for guix-patches@gnu.org; Mon, 25 Jul 2022 19:09:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33680) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oG7CA-0005Hu-Ca for guix-patches@gnu.org; Mon, 25 Jul 2022 19:09:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oG7CA-0000A3-7h for guix-patches@gnu.org; Mon, 25 Jul 2022 19:09:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56771] [PATCH 02/33] gnu: qtbase: Honor CMAKE_PREFIX_PATH. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 25 Jul 2022 23:09:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56771 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 56771@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 56771-submit@debbugs.gnu.org id=B56771.1658790505420 (code B ref 56771); Mon, 25 Jul 2022 23:09:02 +0000 Received: (at 56771) by debbugs.gnu.org; 25 Jul 2022 23:08:25 +0000 Received: from localhost ([127.0.0.1]:51617 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oG7BY-00006P-OQ for submit@debbugs.gnu.org; Mon, 25 Jul 2022 19:08:25 -0400 Received: from mail-qt1-f178.google.com ([209.85.160.178]:43745) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oG7BT-00005G-8t for 56771@debbugs.gnu.org; Mon, 25 Jul 2022 19:08:22 -0400 Received: by mail-qt1-f178.google.com with SMTP id a9so9373792qtw.10 for <56771@debbugs.gnu.org>; Mon, 25 Jul 2022 16:08:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5UR09vrjirnINoceihryGkAxECj+A46o+DsdAln5ay8=; b=RrvMbncjJHmkLOgYGeVIsvbOsfQnAOleTwBrKpzJU3DX8xAbsQR5dKNAxrhfYx7Ter siW25hpsu5OJKuRh7q3Tjv2XLODjd4l80TWm8cCuke70mll+j5GOx+8qAaQOxNehwYqm ZnPtRyW3OZB2O3M22zkW2zqhKKssr0aLaSd6d4o+ZOsk9b0Ql/IVzk8Lib8kdfWDadJA z4pjpZ+FsYT3Laqi+d4uR8GoRU7m6GX2BN7ipU+pCWWc2G0FmvYxwbpSvdcP1CJ7plDd TrqSVFWGxBisY7TCiseMIrvNo5C9s/pObPNr8b/ewt58IKeTgcESDHpKTyl9IQzlO7GU dlxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=5UR09vrjirnINoceihryGkAxECj+A46o+DsdAln5ay8=; b=aWpu938aBSPXbIwLm0YD0EH15D3kwRylCpsaleKRt76C/5v7CxurwodGrgzoTvRHd6 el+KEpfg5ugAx5pez71MVxT+O0PMzPL3QULG8hjsL+oaLQq+gVmqPDZH+wWIQOy2dSq+ NJ1TEg/fdJWtpqUeTyHl0XjLiVEfEp91UanJLwFvvCQSUJLYjTIqKR9JM3sWKAMfTm4+ Xsflf+erPtpoH2EDX2BgEdqtXMA/Eayq7PzVqaco6zkDnPo4zoNJXEIXwsabNcohAmke 5HRxEORuLW1u+ZdHyL30LA08zbY1G+DdFs995VgfTfTmpH+87UiOxATDtaIhGDfY89F6 DP/A== X-Gm-Message-State: AJIora/Yuu2VLnDEHY2hkfgFnHfg/DZBHmJU0aNrfOmHTHcQybO/FjT4 ewb3QqPTJOk46+8lVoZt+3uvf3oCalI= X-Google-Smtp-Source: AGRyM1vsKps2FGuSWQskKup8LvBznt8aGpHWM5bIeHB2yMl63rzX/sGAHfs3G/x+SuBlzXmIlyuraA== X-Received: by 2002:a05:622a:1904:b0:31e:cce0:4bc2 with SMTP id w4-20020a05622a190400b0031ecce04bc2mr12015676qtc.605.1658790493575; Mon, 25 Jul 2022 16:08:13 -0700 (PDT) Received: from localhost.localdomain (dsl-205-233-125-69.b2b2c.ca. [205.233.125.69]) by smtp.gmail.com with ESMTPSA id c15-20020ac8008f000000b0031ee9afafccsm8110580qtg.14.2022.07.25.16.08.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Jul 2022 16:08:13 -0700 (PDT) From: Maxim Cournoyer Date: Mon, 25 Jul 2022 19:07:32 -0400 Message-Id: <20220725230803.10002-2-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220725230803.10002-1-maxim.cournoyer@gmail.com> References: <20220725230803.10002-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1658790582; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=5UR09vrjirnINoceihryGkAxECj+A46o+DsdAln5ay8=; b=K7xbID1IIJB9K7HfxafunIsb2vpWWwAq+Uy9GDZhHornh+nPhLphNOIz12h+Tme22T5ul9 Kcg5IMZd0jJitbO6DwprpdQfOPqRy6QiGL12hfl2TZ8c6n2bxmpQT0GEfI0yKoFfqj7tD9 CnQgKlaIgiTAA5LyRPHCA0HpIq1J1vGLstLyZRZq/h0RAHflvnicNpjZZaB7mG4qLj+fMh yMn80coqjYSzvhNhqSKg/gbpivr9i4HmJrkf+fm3uvxPs8b1tF/1B12J8C4wJEQ11n7d6k 2gFf++1RIEh4Wi2Utw+ic+sFfS5MlVYY0ZeVzHxLK2ocMYpXsEneyaf3UwQbHA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1658790582; a=rsa-sha256; cv=none; b=kVkgZ2zmUyYN9HNxFxU+1wMJaSGSlU4J8wrv8wChchf1ZlJuxdm415DrjC2nPpfALpxrVI 1sX+k6YOAkT6A/WE7vU7QJDzHFyjYPz54dydjL4mhO3zPMW83YJt+zksy/em1VL3vwO5ag BgpLyUxNwLqxaIshNRIYJaHvCWedsSAJfkEEM/D3i6KLiA7twB/ab6X/sO68M97/e1u8QR eBHxFKbIAxQw8l6KT+9ST6SfPbpHiRufPhQkQYosAMc1g8rqm8XZIeUzXhngoE8rJpKiV5 uoIBymwgxdZmgHt4fBeB08HfzhYBX3AYv1gMZeOfLmFAZF2L/uvxMt/Sai4CoQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=RrvMbncj; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 6.57 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=RrvMbncj; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 18A623FD09 X-Spam-Score: 6.57 X-Migadu-Scanner: scn1.migadu.com X-TUID: tGsjQoh7JCpD * gnu/packages/qt.scm (qtbase)[phases]{honor-CMAKE_PREFIX_PATH}: New phase. --- gnu/packages/qt.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index fd26264892..c2e509fcdf 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -618,6 +618,27 @@ (define-public qtbase "-DFEATURE_mips_dspr2=OFF"))) ((#:phases phases) #~(modify-phases #$phases + (add-after 'unpack 'honor-CMAKE_PREFIX_PATH + (lambda _ + ;; The configuration files for other Qt packages are searched + ;; through a call to "find_package" in Qt5Config.cmake, which + ;; disables the use of CMAKE_PREFIX_PATH via the parameter + ;; "NO_DEFAULT_PATH". Re-enable it so that the different + ;; components can be installed in different places. + (substitute* (find-files "." "\\.cmake(\\.in)?$") + (("\\bNO_DEFAULT_PATH\\b") "")) + ;; Because Qt goes against the grain of CMake and set + ;; NO_DEFAULT_PATH, it needs to invent yet another variable + ;; to do what CMAKE_PREFIX_PATH could have done: + ;; QT_ADDITIONAL_PACKAGES_PREFIX_PATH. Since we patch out + ;; the NO_DEFAULT_PATH, we can set the default value of + ;; QT_ADDITIONAL_PACKAGES_PREFIX_PATH to that of + ;; CMAKE_PREFIX_PATH to ensure tools such as + ;; 'qmlimportscanner' from qtdeclarative work out of the + ;; box. + (substitute* "cmake/QtConfig.cmake.in" + (("(set\\(QT_ADDITIONAL_PACKAGES_PREFIX_PATH )\"\"" _ head) + (string-append head "\"$ENV{CMAKE_PREFIX_PATH}\""))))) (delete 'patch-bin-sh) (delete 'patch-xdg-open) (add-after 'patch-paths 'patch-more-paths -- 2.36.1