From patchwork Sun Feb 2 04:34:50 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: tusharhero--- via Guix-patches via X-Patchwork-Id: 38163 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 5D16A27BBE9; Sun, 2 Feb 2025 04:33:09 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-5.9 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URI_NOVOWEL autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 97A0927BBE2 for ; Sun, 2 Feb 2025 04:33:08 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1teRed-0007VY-K6; Sat, 01 Feb 2025 23:32:19 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1teReN-0007Tp-Bo for guix-patches@gnu.org; Sat, 01 Feb 2025 23:32:05 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1teReN-0003il-1F for guix-patches@gnu.org; Sat, 01 Feb 2025 23:32:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:In-Reply-To:References:Subject; bh=e+wpZ0U/T4ueSc8RQy9HsWilVj3Gc2mC2pER+IeeaNs=; b=q5oUaXYSE71VWhnu0uhrwDIGrUUkko1N7cr7QM/kT6C2SX+majbIGAwFDK0/lHIOr9bewdurt7YI0grK4xWhGDbza/9KnFGX1NFPwaSvuOGz6e/3nJmr3HqgJads4l/uvxSHYjWgrVM5GvHKA6IkGbxOSzM9fntlItm6R3xEVamPmL9Q1TkCPd3NK2nxk1NZ3p04Q061mJtslsCNcE/5+UHWj3s6FsYiphnCtcfVvbrdSWnLyNOB5z3XO834gtFZfNAZZfWxqKilf2rk2NSY/4WYDL62ryb59PCUgyaChGm8uWRC6tbX0oV5LeyEQzegStC8YF32z1G5Np1wsVzkYQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1teReM-00009o-10; Sat, 01 Feb 2025 23:32:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75966] [PATCH v3 01/10] gnu: qtwebengine: Fix default path for QtWebEngineProcess. References: In-Reply-To: Resent-From: iyzsong@envs.net Original-Sender: "Debbugs-submit" Resent-CC: maxim.cournoyer@gmail.com, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Sun, 02 Feb 2025 04:32:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75966 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75966@debbugs.gnu.org Cc: =?utf-8?b?5a6L5paH5q2m?= , Maxim Cournoyer , =?utf-8?b?5a6L5paH5q2m?= X-Debbugs-Original-Xcc: Maxim Cournoyer , =?utf-8?b?5a6L5paH5q2m?= Received: via spool by 75966-submit@debbugs.gnu.org id=B75966.1738470708479 (code B ref 75966); Sun, 02 Feb 2025 04:32:01 +0000 Received: (at 75966) by debbugs.gnu.org; 2 Feb 2025 04:31:48 +0000 Received: from localhost ([127.0.0.1]:60782 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1teRe7-00007f-GC for submit@debbugs.gnu.org; Sat, 01 Feb 2025 23:31:47 -0500 Received: from mail.envs.net ([5.199.136.28]:59716) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1teRe2-00007H-Jl for 75966@debbugs.gnu.org; Sat, 01 Feb 2025 23:31:45 -0500 Received: from localhost (mail.envs.net [127.0.0.1]) by mail.envs.net (Postfix) with ESMTP id 9C25238A2C06; Sun, 2 Feb 2025 04:31:40 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at mail.envs.net Received: from mail.envs.net ([127.0.0.1]) by localhost (mail.envs.net [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id bQ3wInPR9s9e; Sun, 2 Feb 2025 04:31:37 +0000 (UTC) Received: from localhost (unknown [112.44.100.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail.envs.net (Postfix) with ESMTPSA; Sun, 2 Feb 2025 04:31:36 +0000 (UTC) Received: from localhost.localdomain (localhost.lan [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 52018ba6; Sun, 2 Feb 2025 04:35:14 +0000 (UTC) Date: Sun, 2 Feb 2025 12:34:50 +0800 Message-ID: X-Mailer: git-send-email 2.48.1 MIME-Version: 1.0 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: , Reply-to: iyzsong@envs.net X-ACL-Warn: , iyzsong--- via Guix-patches X-Patchwork-Original-From: iyzsong--- via Guix-patches via From: tusharhero--- via Guix-patches via Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: 宋文武 Since qtwebengine and qtbase are not installed into the same prefix, the default path for QtWebEngineProcess won't work. Fix it so that we no longer need to set QTWEBENGINEPROCESS_PATH anymore. * gnu/packages/qt.scm (qtwebengine-5, qtwebengine)[arguments]: Substitute 'QLibraryInfo::LibraryExecutablesPath' in 'substitute-source phase. [native-search-paths]: Remove QTWEBENGINEPROCESS_PATH. * guix/build/qt-utils.scm (variables-for-wrapping): Remove QTWEBENGINEPROCESS_PATH. Change-Id: Ie0dfaf8c2355a679e2a3ddeacf09654830f9ab2f Reviewed-by: Maxim Cournoyer --- gnu/packages/qt.scm | 22 ++++++++-------------- guix/build/qt-utils.scm | 6 +----- 2 files changed, 9 insertions(+), 19 deletions(-) base-commit: 070c073d508d3197f0235adc424aec287e7dd916 diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 432282f9cf..430f0bb96d 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -3415,7 +3415,10 @@ (define-public qtwebengine-5 "/share/qt5/translations\")")) (("QLibraryInfo::location\\(QLibraryInfo::DataPath\\)") (string-append "QLatin1String(\"" #$output - "/share/qt5\")"))) + "/share/qt5\")")) + (("QLibraryInfo::location\\(QLibraryInfo::LibraryExecutablesPath)") + (string-append "QLatin1String(\"" #$output + "/lib/qt5/libexec\")"))) ;; Substitute full dynamic library path for nss. (substitute* "src/3rdparty/chromium/crypto/nss_util.cc" (("libnssckbi.so") @@ -3453,12 +3456,6 @@ (define-public qtwebengine-5 ;; It's possible this can be fixed by setting QTWEBENGINEPROCESS_PATH ;; before running tests. ((#:tests? _ #f) #f))) - (native-search-paths - (list (search-path-specification - (file-type 'regular) - (separator #f) - (variable "QTWEBENGINEPROCESS_PATH") - (files '("lib/qt5/libexec/QtWebEngineProcess"))))) (home-page "https://wiki.qt.io/QtWebEngine") (synopsis "Qt WebEngine module") (description "The Qt5WebEngine module provides support for web applications @@ -3824,7 +3821,10 @@ (define-public qtwebengine "/share/qt6/translations\")")) (("QLibraryInfo::path\\(QLibraryInfo::DataPath)") (string-append "QLatin1String(\"" #$output - "/share/qt6\")"))) + "/share/qt6\")")) + (("QLibraryInfo::path\\(QLibraryInfo::LibraryExecutablesPath)") + (string-append "QLatin1String(\"" #$output + "/lib/qt6/libexec\")"))) ;; Substitute full dynamic library path for nss. (substitute* "src/3rdparty/chromium/crypto/nss_util.cc" (("libnssckbi.so") @@ -3884,12 +3884,6 @@ (define-public qtwebengine (replace "qtbase" qtbase) (replace "qtdeclarative" qtdeclarative) (replace "qtwebchannel" qtwebchannel))) - (native-search-paths - (list (search-path-specification - (file-type 'regular) - (separator #f) - (variable "QTWEBENGINEPROCESS_PATH") - (files '("lib/qt6/libexec/QtWebEngineProcess"))))) (home-page "https://wiki.qt.io/QtWebEngine") (synopsis "Qt WebEngine module") (description "The Qt WebEngine module provides support for web diff --git a/guix/build/qt-utils.scm b/guix/build/qt-utils.scm index d7609b9f21..65592757e6 100644 --- a/guix/build/qt-utils.scm +++ b/guix/build/qt-utils.scm @@ -93,11 +93,7 @@ (define* (variables-for-wrapping base-directories output-directory `(,(if (>= (string->number qt-major-version) 6) "QML_IMPORT_PATH" "QML2_IMPORT_PATH") - prefix directory ,(format #f "/lib/qt~a/qml" qt-major-version)) - ;; QTWEBENGINEPROCESS_PATH accepts a single value, which makes 'exact the - ;; most suitable environment variable type for it. - `("QTWEBENGINEPROCESS_PATH" = regular - ,(format #f "/lib/qt~a/libexec/QtWebEngineProcess" qt-major-version))))) + prefix directory ,(format #f "/lib/qt~a/qml" qt-major-version))))) (define* (wrap-qt-program* program #:key sh inputs output-dir qt-wrap-excluded-inputs