From debbugs-submit-bounces@debbugs.gnu.org Mon Jul 25 19:08:25 2022 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 To: 56771@debbugs.gnu.org Subject: [PATCH 02/33] gnu: qtbase: Honor CMAKE_PREFIX_PATH. 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-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 56771 Cc: Maxim Cournoyer 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 (-) * 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