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: "ashish.is--- 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: "ashish.is--- 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 From patchwork Sun Feb 2 04:34:51 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "ashish.is--- via Guix-patches\" via" X-Patchwork-Id: 38162 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 3AE6227BBEA; Sun, 2 Feb 2025 04:32:53 +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=-6.4 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 autolearn=ham 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 E2E3127BBE2 for ; Sun, 2 Feb 2025 04:32:52 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1teRec-0007VR-S1; Sat, 01 Feb 2025 23:32:18 -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-0007Tq-LW for guix-patches@gnu.org; Sat, 01 Feb 2025 23:32:06 -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-0003iz-5v 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:References:In-Reply-To:Date:From:To:Subject; bh=ezpa1Tc1qlLoxmaRuQZhk99jyMe7NgDwsIK8ZV3jdFQ=; b=Y7VZDNFpCYPjiU70OC0dCIsPrZOSyKYuSmQHbIVNdHCQjrXJWh7GYMjU8is0ssrEzssp7YLUiBUHUHStYtHuhcRenHYK1hNoA4eHlLVP8kMHiNUHTUNHOVh30+XNIAYQio5JbEz1XxGqtxEoZZYYSadhp5tr9YNMTsoWf8g8Rlwun1G/Du35Tm15jTiCxOm+frdPAut+/MCvcFYxkrHaT6JuGgSqbrxMHHHXAWUukeKTnIfWJgT1MWYg+f/r2mQqD02YJ/yKLLRaPXPsUT0XWaDFvWqnMjkJTog2PCwzW0YwIht5t6g9kn3WlDhR7fY9KSGVFE/HfG3kSec0QV6+gg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1teReN-0000AF-1b for guix-patches@gnu.org; Sat, 01 Feb 2025 23:32:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75966] [PATCH v3 02/10] gnu: calibre: Do not wrap with QTWEBENGINEPROCESS_PATH. Resent-From: iyzsong@envs.net Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 02 Feb 2025 04:32:02 +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?= Received: via spool by 75966-submit@debbugs.gnu.org id=B75966.1738470711510 (code B ref 75966); Sun, 02 Feb 2025 04:32:02 +0000 Received: (at 75966) by debbugs.gnu.org; 2 Feb 2025 04:31:51 +0000 Received: from localhost ([127.0.0.1]:60787 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1teReA-000083-K3 for submit@debbugs.gnu.org; Sat, 01 Feb 2025 23:31:51 -0500 Received: from mail.envs.net ([5.199.136.28]:59724) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1teRe4-00007K-9T for 75966@debbugs.gnu.org; Sat, 01 Feb 2025 23:31:46 -0500 Received: from localhost (mail.envs.net [127.0.0.1]) by mail.envs.net (Postfix) with ESMTP id 7E99538A2C32; Sun, 2 Feb 2025 04:31:43 +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 B66naCWNaqVX; Sun, 2 Feb 2025 04:31:40 +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:39 +0000 (UTC) Received: from localhost.localdomain (localhost.lan [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id de8a2f80; Sun, 2 Feb 2025 04:35:14 +0000 (UTC) Date: Sun, 2 Feb 2025 12:34:51 +0800 Message-ID: X-Mailer: git-send-email 2.48.1 In-Reply-To: References: 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: "ashish.is--- 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: 宋文武 * gnu/packages/ebook.scm (calibre)[arguments]: Remove 'wrap-program phase. Change-Id: If289d6d5bcd1582134bbb02a179425a4f9c6a4d0 Reviewed-by: Maxim Cournoyer --- gnu/packages/ebook.scm | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index 0cd2b31724..73fea2f66a 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -320,26 +320,7 @@ (define-public calibre (string-append #$(this-package-input "font-liberation") "/share/fonts/truetype"))) (delete-file-recursively font-dest) - (symlink font-src font-dest)))) - ;; Make run-time dependencies available to the binaries. - (add-after 'wrap 'wrap-program - (lambda* (#:key inputs #:allow-other-keys) - (with-directory-excursion (string-append #$output "/bin") - (for-each - (lambda (binary) - (wrap-program binary - ;; Make QtWebEngineProcess available. - `("QTWEBENGINEPROCESS_PATH" = - ,(list - (search-input-file - inputs "/lib/qt5/libexec/QtWebEngineProcess"))))) - ;; Wrap all the binaries shipping with the package, except - ;; for the wrappings created during the 'wrap standard - ;; phase. This extends existing .calibre-real wrappers - ;; rather than create ..calibre-real-real-s. For more - ;; information see: https://issues.guix.gnu.org/43249. - (find-files "." (lambda (file stat) - (not (wrapped-program? file))))))))))) + (symlink font-src font-dest))))))) (home-page "https://calibre-ebook.com/") (synopsis "E-book library management software") (description "Calibre is an e-book library manager. It can view, convert From patchwork Sun Feb 2 04:34:52 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "ashish.is--- via Guix-patches\" via" X-Patchwork-Id: 38161 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 71C0627BBE2; Sun, 2 Feb 2025 04:32:50 +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=-6.4 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 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 4F4D527BBE9 for ; Sun, 2 Feb 2025 04:32:48 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1teRec-0007VQ-Qr; Sat, 01 Feb 2025 23:32:18 -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-0007To-5u 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 1teReM-0003io-Qa for guix-patches@gnu.org; Sat, 01 Feb 2025 23:32:02 -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:References:In-Reply-To:Date:From:To:Subject; bh=VhrZ41oM3O8877Y2VD2It0CpZQLsg50C0G3lzoyPP+c=; b=cANJfipU8gEhF4dxnEhTFbac/9R3Zh5FX9TEsr7KpZPTEn7fnfLiuAl0rE/BdzLztbWzxn/PKC3BFyf+Lrhf+5eMH6EczdNdVkZI1bsSargy8hVNObKc0LP21IMExXU7NhQdWunUq1mSgxYLH7X9kxskMRgRchyE92PgQnBe/e6fy3TSkI74h4Z19jOf0sHapyhFkmHDLtp4rvOmGAnhm9MFjKPAfjq0de/KjGsaGIyC/iVklzWQyKVUt9wx3LBNeq+LOuFmQe7KsfZPDOzx24iq8D7C6QRtRngZ1HuZECza6xhGoph/i+xkVocqhdTZh3seMrBI5ah1GdUxcv10+A==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1teReM-0000A2-Hs for guix-patches@gnu.org; Sat, 01 Feb 2025 23:32:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75966] [PATCH v3 03/10] gnu: anki: Do not wrap with QTWEBENGINEPROCESS_PATH. Resent-From: iyzsong@envs.net Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 02 Feb 2025 04:32:02 +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?= Received: via spool by 75966-submit@debbugs.gnu.org id=B75966.1738470710497 (code B ref 75966); Sun, 02 Feb 2025 04:32:02 +0000 Received: (at 75966) by debbugs.gnu.org; 2 Feb 2025 04:31:50 +0000 Received: from localhost ([127.0.0.1]:60785 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1teReA-00007w-4h for submit@debbugs.gnu.org; Sat, 01 Feb 2025 23:31:50 -0500 Received: from mail.envs.net ([5.199.136.28]:59738) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1teRe6-00007R-4t for 75966@debbugs.gnu.org; Sat, 01 Feb 2025 23:31:46 -0500 Received: from localhost (mail.envs.net [127.0.0.1]) by mail.envs.net (Postfix) with ESMTP id 1A59838A3E90; Sun, 2 Feb 2025 04:31:45 +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 KuMLMfo3yIis; Sun, 2 Feb 2025 04:31:42 +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:40 +0000 (UTC) Received: from localhost.localdomain (localhost.lan [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 7bbe4e8d; Sun, 2 Feb 2025 04:35:14 +0000 (UTC) Date: Sun, 2 Feb 2025 12:34:52 +0800 Message-ID: <3ab14499f91127ac45500e86ce6a4d71772e60a8.1738470835.git.iyzsong@member.fsf.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: References: 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: "ashish.is--- 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: 宋文武 * gnu/packages/education.scm (anki):[arguments]: Remove QTWEBENGINEPROCESS_PATH from the 'wrap phase. Change-Id: If8b2cd5bcb0624033b6f7a29c9b865b70943032d Reviewed-by: Maxim Cournoyer --- gnu/packages/education.scm | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index f42a216972..f0c0e931bf 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -836,18 +836,11 @@ (define-public anki (filter (match-lambda ((label . _) (string-prefix? "python-" label))) - inputs))) - (qtwebengineprocess - (search-input-file inputs - "lib/qt5/libexec/QtWebEngineProcess"))) - ;; The program fails to find the QtWebEngineProcess program, so - ;; we set QTWEBENGINEPROCESS_PATH to help it. PYTHONPATH is - ;; wrapped to avoid declaring Python libraries as propagated - ;; inputs. + inputs)))) + ;; PYTHONPATH is wrapped to avoid declaring Python libraries as + ;; propagated inputs. (for-each (lambda (program) (wrap-program program - `("QTWEBENGINEPROCESS_PATH" = - (,qtwebengineprocess)) `("PATH" prefix (,(string-append (assoc-ref inputs "mpv") "/bin"))) From patchwork Sun Feb 2 04:34:53 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "ashish.is--- via Guix-patches\" via" X-Patchwork-Id: 38167 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 DE76827BBE9; Sun, 2 Feb 2025 04:33:13 +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=-6.4 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 autolearn=ham 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 CE0C027BBEB for ; Sun, 2 Feb 2025 04:33:12 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1teReh-0007Xf-Hw; Sat, 01 Feb 2025 23:32:23 -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 1teReP-0007Tr-K8 for guix-patches@gnu.org; Sat, 01 Feb 2025 23:32:08 -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-0003j9-Km 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:References:In-Reply-To:Date:From:To:Subject; bh=p32TyymU/05G/09OPbwxJQJcoPSet7vAspNs7escv2s=; b=A+um0/GnEqC6x6Ek8vxtFMBT6kyUVLSkueUyF47PtWjKTfqrDZ3YJHqijJAgpX9QVY/xt2wBqGeTzD0bsZpIBGiUy0T2abuoemmSpumurH+mKZ4RMjtLb2z1W996gYjyOtmz7TkssJ7bbaPTszWRciIsfSiYtOBSn2jeWhM5yzh9dYDgQc+tkxuX4+JzXF+BjLIyABD9BQS2traxMv7+D+pQ9sUMeMYwH8wk7G56fFS1/u0eenpaS6hE/dHVROiEVE7Xg+kob55XiGh1AAxRpl97y3EceSncLPkmZ19kCDIH+KilE3LgWEM4mMZshWz7p4N46vEAHtWc32uUl/72iA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1teReN-0000AN-GX for guix-patches@gnu.org; Sat, 01 Feb 2025 23:32:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75966] [PATCH v3 04/10] gnu: falkon: Do not wrap with QTWEBENGINEPROCESS_PATH. Resent-From: iyzsong@envs.net Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 02 Feb 2025 04:32:03 +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?= Received: via spool by 75966-submit@debbugs.gnu.org id=B75966.1738470714526 (code B ref 75966); Sun, 02 Feb 2025 04:32:03 +0000 Received: (at 75966) by debbugs.gnu.org; 2 Feb 2025 04:31:54 +0000 Received: from localhost ([127.0.0.1]:60790 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1teReC-00008I-EB for submit@debbugs.gnu.org; Sat, 01 Feb 2025 23:31:54 -0500 Received: from mail.envs.net ([5.199.136.28]:36390) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1teRe8-00007o-Sm for 75966@debbugs.gnu.org; Sat, 01 Feb 2025 23:31:49 -0500 Received: from localhost (mail.envs.net [127.0.0.1]) by mail.envs.net (Postfix) with ESMTP id 1C74B38A2C06; Sun, 2 Feb 2025 04:31:48 +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 CM223cJTxKiQ; Sun, 2 Feb 2025 04:31:45 +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:43 +0000 (UTC) Received: from localhost.localdomain (localhost.lan [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 5105b7ed; Sun, 2 Feb 2025 04:35:15 +0000 (UTC) Date: Sun, 2 Feb 2025 12:34:53 +0800 Message-ID: X-Mailer: git-send-email 2.48.1 In-Reply-To: References: 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: "ashish.is--- 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: 宋文武 * gnu/packages/kde-internet.scm (falkon)[arguments]: Remove 'wrap phase. Change-Id: Iad27eace218b15e847d5918170e68427176cc3ff --- gnu/packages/kde-internet.scm | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/gnu/packages/kde-internet.scm b/gnu/packages/kde-internet.scm index 4bf40afe88..d54126ed12 100644 --- a/gnu/packages/kde-internet.scm +++ b/gnu/packages/kde-internet.scm @@ -130,19 +130,6 @@ (define-public falkon (base32 "0j930i2nvg71p05z881inbk59c54gx8dzhyjb8iaqkw8i5s5r983")))) (build-system qt-build-system) - (arguments - (list #:phases - #~(modify-phases %standard-phases - (add-after 'install 'wrap - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((qtwebengineprocess - (search-input-file inputs - "lib/qt6/libexec/QtWebEngineProcess"))) - ;; The program fails to find the QtWebEngineProcess program, so - ;; we set QTWEBENGINEPROCESS_PATH to help it. - (wrap-program (string-append #$output "/bin/falkon") - `("QTWEBENGINEPROCESS_PATH" = - (,qtwebengineprocess))))))))) (native-inputs (list extra-cmake-modules pkg-config qttools)) (inputs From patchwork Sun Feb 2 04:34:54 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "ashish.is--- via Guix-patches\" via" X-Patchwork-Id: 38160 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 6057227BBEC; Sun, 2 Feb 2025 04:32:49 +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=-6.4 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 autolearn=ham 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 4CBAA27BBE2 for ; Sun, 2 Feb 2025 04:32:48 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1teRee-0007Vf-OF; Sat, 01 Feb 2025 23:32:20 -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 1teReP-0007Ts-MD for guix-patches@gnu.org; Sat, 01 Feb 2025 23:32:09 -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 1teReO-0003jB-4C for guix-patches@gnu.org; Sat, 01 Feb 2025 23:32:05 -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:References:In-Reply-To:Date:From:To:Subject; bh=8SpiZY69cSQOE0X+V79OWm9mYb5j0o1VLZp1Cl54lew=; b=U0I/Bqp8V3SDHpmRyvcn5N4hiv3in/SuNm+7juPwgxBnOQ01zq9i6sOmB6ZVXyq0eSa8zFIZUjx8gGa9LOOvNOrCn0WQs8F3UhWMmLMpnvQm0guyeEKZLt0J5PEOjuE7J1d+OXJWh8oNtfTb4PtWpOE622KSfVCi8bMiEgepCks9YbnHVtNjrY47D232o9rk1xU1HmjDk9ypHVbbjLxGoL+1N6fiVVjMrYd+HsWkDulJlESc5rXfMxltCuakVEzZZ1cgNukZdk07BkYkTpFDhCPBtzzuja8NCbsv5spFcdHSZSMw6p1o/lnxlYdLOI/NRCWe9h3BflaOjVREQNgv7w==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1teReN-0000AV-Ve for guix-patches@gnu.org; Sat, 01 Feb 2025 23:32:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75966] [PATCH v3 05/10] gnu: khelpcenter: Do not wrap with QTWEBENGINEPROCESS_PATH. Resent-From: iyzsong@envs.net Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 02 Feb 2025 04:32:03 +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?= Received: via spool by 75966-submit@debbugs.gnu.org id=B75966.1738470714533 (code B ref 75966); Sun, 02 Feb 2025 04:32:03 +0000 Received: (at 75966) by debbugs.gnu.org; 2 Feb 2025 04:31:54 +0000 Received: from localhost ([127.0.0.1]:60793 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1teReE-00008W-9O for submit@debbugs.gnu.org; Sat, 01 Feb 2025 23:31:54 -0500 Received: from mail.envs.net ([5.199.136.28]:36402) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1teReA-00007v-KQ for 75966@debbugs.gnu.org; Sat, 01 Feb 2025 23:31:51 -0500 Received: from localhost (mail.envs.net [127.0.0.1]) by mail.envs.net (Postfix) with ESMTP id D615138A3EBB; Sun, 2 Feb 2025 04:31:49 +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 JgvnzmmUdrcm; Sun, 2 Feb 2025 04:31:46 +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:45 +0000 (UTC) Received: from localhost.localdomain (localhost.lan [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 9decb1b1; Sun, 2 Feb 2025 04:35:15 +0000 (UTC) Date: Sun, 2 Feb 2025 12:34:54 +0800 Message-ID: X-Mailer: git-send-email 2.48.1 In-Reply-To: References: 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: "ashish.is--- 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: 宋文武 * gnu/packages/kde-systemtools.scm (khelpcenter):[arguments]: Remove 'wrap-executable phase. Change-Id: I6e1ab2c41638a60d5ab1942f101f3ff34b8d1a86 --- gnu/packages/kde-systemtools.scm | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/gnu/packages/kde-systemtools.scm b/gnu/packages/kde-systemtools.scm index 4923854a7c..a86b550a7f 100644 --- a/gnu/packages/kde-systemtools.scm +++ b/gnu/packages/kde-systemtools.scm @@ -178,15 +178,7 @@ (define-public khelpcenter PrintSupport") (("Qt6::WebEngineWidgets") "Qt6::PrintSupport - Qt6::WebEngineWidgets")))) - (add-after 'install 'wrap-executable - (lambda* (#:key inputs #:allow-other-keys) - (wrap-program (string-append #$output - "/bin/khelpcenter") - `("QTWEBENGINEPROCESS_PATH" = - (,(search-input-file - inputs - "lib/qt6/libexec/QtWebEngineProcess"))))))))) + Qt6::WebEngineWidgets"))))))) (home-page "https://apps.kde.org/khelpcenter/") (synopsis "KDE documentation viewer") (description "KHelpCenter uses meta data files which describe the From patchwork Sun Feb 2 04:34:55 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "ashish.is--- via Guix-patches\" via" X-Patchwork-Id: 38166 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 A181427BBE9; Sun, 2 Feb 2025 04:33:13 +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=-6.4 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 autolearn=ham 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 CDCE227BBEA for ; Sun, 2 Feb 2025 04:33:12 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1teRed-0007VZ-Qa; 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 1teReP-0007Tt-Mo for guix-patches@gnu.org; Sat, 01 Feb 2025 23:32:09 -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 1teReO-0003jD-K1 for guix-patches@gnu.org; Sat, 01 Feb 2025 23:32:05 -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:References:In-Reply-To:Date:From:To:Subject; bh=PSragYzPHPuM3xPhomhcHtKHnlxlkKDTdPz0biQwXno=; b=FfES+PjV5KSygRAcRxgLxG9PJun0sbds95YDU6Yx8kG1vdJpd5yMgCkyfZ/kkFbCpnGYCw9K2ougJ+n+NJ61WfF0PGIdX1XFRH1xDBElvLO7rzMJCyMfHDM43qUHtrvYOXyQ6+5GsmfdHq+jDHSerfijdmwAYJEcSP5cPtSnMmIeyPVDUE2etqYyXhE9YVbljoVMAMWbB+PVpeMv3+V0Y0AML+1vfxhEh7op7TdyGesj/4NnDMEnRFd1tjnvl6Mad3hF12gHqAcOs4aivgSfnhYW+U6pXUmkmFxcyp0T3sObymnMGzCkgau+IgsyYsFxUdGEgq3SShbGF9zNz8CKbQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1teReO-0000Ac-G3 for guix-patches@gnu.org; Sat, 01 Feb 2025 23:32:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75966] [PATCH v3 06/10] gnu: akregator: Do not wrap with QTWEBENGINEPROCESS_PATH. Resent-From: iyzsong@envs.net Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 02 Feb 2025 04:32:04 +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?= Received: via spool by 75966-submit@debbugs.gnu.org id=B75966.1738470716548 (code B ref 75966); Sun, 02 Feb 2025 04:32:04 +0000 Received: (at 75966) by debbugs.gnu.org; 2 Feb 2025 04:31:56 +0000 Received: from localhost ([127.0.0.1]:60796 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1teReG-00008i-0E for submit@debbugs.gnu.org; Sat, 01 Feb 2025 23:31:56 -0500 Received: from mail.envs.net ([5.199.136.28]:36410) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1teReD-00008K-Ls for 75966@debbugs.gnu.org; Sat, 01 Feb 2025 23:31:54 -0500 Received: from localhost (mail.envs.net [127.0.0.1]) by mail.envs.net (Postfix) with ESMTP id DE7A538A2C06; Sun, 2 Feb 2025 04:31:52 +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 FflvXJqcsB5m; Sun, 2 Feb 2025 04:31:49 +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:48 +0000 (UTC) Received: from localhost.localdomain (localhost.lan [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id ed0fc8f5; Sun, 2 Feb 2025 04:35:15 +0000 (UTC) Date: Sun, 2 Feb 2025 12:34:55 +0800 Message-ID: X-Mailer: git-send-email 2.48.1 In-Reply-To: References: 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: "ashish.is--- 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: 宋文武 * gnu/packages/kde.scm (akregator):[arguments]: Remove 'wrap-qt-process-path phase. Change-Id: I827e8375186492064c934c35196790af6e999e0d --- gnu/packages/kde.scm | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 765176f42b..9a4115eda6 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -205,18 +205,7 @@ (define-public akregator (base32 "07flc3617px9w1c729p0lsixf1g0h297hkbip259ykkbwxizn71q")))) (build-system qt-build-system) (arguments - (list #:qtbase qtbase - #:phases - #~(modify-phases %standard-phases - (add-after 'install 'wrap-qt-process-path - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin/akregator")) - (qt-process-path - (search-input-file - inputs "/lib/qt6/libexec/QtWebEngineProcess"))) - (wrap-program bin - `("QTWEBENGINEPROCESS_PATH" = (,qt-process-path))))))))) + (list #:qtbase qtbase)) (native-inputs (list extra-cmake-modules kdoctools)) (inputs From patchwork Sun Feb 2 04:34:56 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "ashish.is--- via Guix-patches\" via" X-Patchwork-Id: 38165 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 1988727BBE9; Sun, 2 Feb 2025 04:33:11 +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=-6.4 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 autolearn=ham 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 7617B27BBE2 for ; Sun, 2 Feb 2025 04:33:10 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1teReh-0007XX-15; Sat, 01 Feb 2025 23:32:23 -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 1teReR-0007Tw-J6 for guix-patches@gnu.org; Sat, 01 Feb 2025 23:32:09 -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 1teReQ-0003jg-50 for guix-patches@gnu.org; Sat, 01 Feb 2025 23:32:07 -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:References:In-Reply-To:Date:From:To:Subject; bh=qqO5ytjLzwXMNabZiFWXHUHiDSCZEmvLdHhNeWAzPKA=; b=DfEobPohSdPV3C7qXsMV0YJZ3hDRFNk3yIcBvAENeqUESOjLuHCQ8OB6TYrSCHBaHeUHjexEBcC0M3HyPlf7eM+EwjmuOsTPHPoIjVVyt+Nc0pI2UM1MT0Rajtwl0fDloxvmyuYAijfh2Xe69Fdv2Z4top80tPO3tBNaYPaPM2sZxtMAVEV/yObQ2Gef7NRpsKr1e0Pq52E0KhoXchjRJRpXxjmCo/pPpH0GM4gfz68pLnMY2RVYfvrqBFdQsgcBrH04vrx6uCBhQCbcoy75kugxOGUma8180jt1z/eYk6gCfrl689zswYrlypjIzLAiHpeewOCqwbdC9hrqHf5ALA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1teReQ-0000Az-0o for guix-patches@gnu.org; Sat, 01 Feb 2025 23:32:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75966] [PATCH v3 07/10] gnu: openshot: Do not wrap with QTWEBENGINEPROCESS_PATH. Resent-From: iyzsong@envs.net Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 02 Feb 2025 04:32:05 +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?= Received: via spool by 75966-submit@debbugs.gnu.org id=B75966.1738470722614 (code B ref 75966); Sun, 02 Feb 2025 04:32:05 +0000 Received: (at 75966) by debbugs.gnu.org; 2 Feb 2025 04:32:02 +0000 Received: from localhost ([127.0.0.1]:60804 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1teReL-00009k-Lx for submit@debbugs.gnu.org; Sat, 01 Feb 2025 23:32:02 -0500 Received: from mail.envs.net ([5.199.136.28]:47774) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1teReI-00008w-O8 for 75966@debbugs.gnu.org; Sat, 01 Feb 2025 23:31:59 -0500 Received: from localhost (mail.envs.net [127.0.0.1]) by mail.envs.net (Postfix) with ESMTP id EAAF538A2C06; Sun, 2 Feb 2025 04:31:57 +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 ogoTr1y7_rS5; Sun, 2 Feb 2025 04:31:54 +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:50 +0000 (UTC) Received: from localhost.localdomain (localhost.lan [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 950fc115; Sun, 2 Feb 2025 04:35:15 +0000 (UTC) Date: Sun, 2 Feb 2025 12:34:56 +0800 Message-ID: <06ea53b41d3dce61ff0b6e5e669016568d5bd516.1738470835.git.iyzsong@member.fsf.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: References: 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: "ashish.is--- 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: 宋文武 * gnu/packages/video.scm (openshot)[arguments]: Remove 'wrap-program phase. Change-Id: Id09d18cb0f2f9e6542cdeeaa3026a0ff71164121 --- gnu/packages/video.scm | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index d0b5907bdd..4881f6ba64 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -6049,19 +6049,7 @@ (define-public openshot (lambda _ ;; src/classes/info.py "needs" to create several ;; directories in $HOME when loaded during build - (setenv "HOME" "/tmp"))) - (add-after 'install 'wrap-program - (lambda* (#:key outputs inputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (qtwebengine-process-path - (search-input-file - inputs "/lib/qt5/libexec/QtWebEngineProcess"))) - (wrap-qt-program "openshot-qt" - #:output out #:inputs inputs) - ;; Help the program discover QtWebEngine at runtime. - (wrap-program (string-append out "/bin/openshot-qt") - `("QTWEBENGINEPROCESS_PATH" = - (,qtwebengine-process-path))))))))) + (setenv "HOME" "/tmp")))))) (home-page "https://www.openshot.org/") (synopsis "Video editor") (description "OpenShot takes your videos, photos, and music files and From patchwork Sun Feb 2 04:34:57 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "ashish.is--- via Guix-patches\" via" X-Patchwork-Id: 38168 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 6FC4627BBE9; Sun, 2 Feb 2025 04:33:14 +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=-6.4 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 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 B914F27BBE2 for ; Sun, 2 Feb 2025 04:33:12 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1teRee-0007Vb-7k; Sat, 01 Feb 2025 23:32:20 -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 1teReP-0007Tu-Mp for guix-patches@gnu.org; Sat, 01 Feb 2025 23:32:09 -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 1teReP-0003jG-5U for guix-patches@gnu.org; Sat, 01 Feb 2025 23:32:05 -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:References:In-Reply-To:Date:From:To:Subject; bh=NZkHxPS2x+xwrwtIm/NOFPAMyaheO27EioNuQH2ijl4=; b=tKuXPxkY0fH4AP+qakpS6eS+mfcHm5q43tR35YE9jPaFYlIcIuHRKn8vPB8rp6uPLTcWxqCiN9YAHP+gyx63KdI7cN+JNiDHLaXYZVaxn63uxSkQye+CKWy0sOAw3HsmOyac3GobOfJNHW9P53HGgNilh3dceftMx+JFXzBPgB3hNJx+lxWMkUhaefyP31ah/eTwxSNag9IP4N1LK87Y7Gq0U4l7lCQz0SH38bcHmnctrRaO0mI5zxwHySMK0vGE0O7Tn4Z4c3bjsZeueuAyF6+hJM2C1P1dHvzqmXq2I5XKPqtUbKuxmrqsP7rUEJN/BwpiK/LwGVx02DdpfO8N1Q==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1teReP-0000Ak-0c for guix-patches@gnu.org; Sat, 01 Feb 2025 23:32:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75966] [PATCH v3 08/10] gnu: openconnect-sso: Do not wrap with QTWEBENGINEPROCESS_PATH. Resent-From: iyzsong@envs.net Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 02 Feb 2025 04:32:04 +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?= Received: via spool by 75966-submit@debbugs.gnu.org id=B75966.1738470720573 (code B ref 75966); Sun, 02 Feb 2025 04:32:04 +0000 Received: (at 75966) by debbugs.gnu.org; 2 Feb 2025 04:32:00 +0000 Received: from localhost ([127.0.0.1]:60800 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1teReJ-00009A-I0 for submit@debbugs.gnu.org; Sat, 01 Feb 2025 23:31:59 -0500 Received: from mail.envs.net ([5.199.136.28]:36412) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1teReF-00008f-HH for 75966@debbugs.gnu.org; Sat, 01 Feb 2025 23:31:55 -0500 Received: from localhost (mail.envs.net [127.0.0.1]) by mail.envs.net (Postfix) with ESMTP id BACB238A3EBB; Sun, 2 Feb 2025 04:31:54 +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 r7K7FvgwejmH; Sun, 2 Feb 2025 04:31:51 +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:50 +0000 (UTC) Received: from localhost.localdomain (localhost.lan [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 79172604; Sun, 2 Feb 2025 04:35:16 +0000 (UTC) Date: Sun, 2 Feb 2025 12:34:57 +0800 Message-ID: <7e8cec7bc3ed4d2e39332b648ef462bdca5885ba.1738470835.git.iyzsong@member.fsf.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: References: 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: "ashish.is--- 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: 宋文武 * gnu/packages/vpn.scm (openconnect-sso):[arguments]: Remove 'wrap-qt-process-path phase. Change-Id: I10332aac3d482c991cccd583c12489a9291c89bf --- gnu/packages/vpn.scm | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index 0b62e8c7cf..b64617c5df 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -800,17 +800,7 @@ (define-public openconnect-sso (("\"openconnect\"") (string-append "\"" (search-input-file inputs "/sbin/openconnect") - "\""))))) - (add-after 'check 'wrap-qt-process-path - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin/openconnect-sso")) - (qt-process-path - (search-input-file inputs - "/lib/qt5/libexec/QtWebEngineProcess"))) - (wrap-program bin - #:sh (search-input-file inputs "bin/bash") - `("QTWEBENGINEPROCESS_PATH" = (,qt-process-path))))))))) + "\"")))))))) (inputs (list openconnect poetry From patchwork Sun Feb 2 04:34:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "ashish.is--- via Guix-patches\" via" X-Patchwork-Id: 38164 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 B1BF027BBEC; Sun, 2 Feb 2025 04:33:10 +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=-6.4 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 autolearn=ham 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 78CD927BBE9 for ; Sun, 2 Feb 2025 04:33:10 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1teRee-0007Vc-Go; Sat, 01 Feb 2025 23:32:20 -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 1teReR-0007Tx-J6 for guix-patches@gnu.org; Sat, 01 Feb 2025 23:32:09 -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 1teReP-0003jY-Lp for guix-patches@gnu.org; Sat, 01 Feb 2025 23:32:07 -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:References:In-Reply-To:Date:From:To:Subject; bh=n2uKdq+5GY1GghuUCW683Qs5QzctJUzmmaX1gqv/T78=; b=pRz9OcqpScEESdeqkBKXTOvha2EzST856FmxqWP3gFLJ6h3YZ5TixBIaQtFrJEnXm6UIJIFGbzyVfsBbMV1Qa3RPwim5UXs25re95YDzU8gfOTTIKNOzSFhbjPKOOuHTmoV8upbUhNr5UZayICRAsCocvo60j0uHe3Z+EN3AMlK1T7DGbPXOeogDTbnwtMjkDglQ+5jzkNVbSAQt+MvAroFtoVokpRdU0Am5AKES9hJ4/4SM/y1/DAvfvoIYKihok5Xe6/bpa+M2cUoWDoGWGIBOwY6Stb8OvpInoh+39vrdbsYjFPXQwK21eipwF7kUmaLC/24zLWkeHFhOpH2leQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1teReP-0000Ar-Hu for guix-patches@gnu.org; Sat, 01 Feb 2025 23:32:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75966] [PATCH v3 09/10] gnu: kiwix-desktop: Do not wrap with QTWEBENGINEPROCESS_PATH. Resent-From: iyzsong@envs.net Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 02 Feb 2025 04:32:05 +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?= Received: via spool by 75966-submit@debbugs.gnu.org id=B75966.1738470721597 (code B ref 75966); Sun, 02 Feb 2025 04:32:05 +0000 Received: (at 75966) by debbugs.gnu.org; 2 Feb 2025 04:32:01 +0000 Received: from localhost ([127.0.0.1]:60802 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1teReL-00009S-87 for submit@debbugs.gnu.org; Sat, 01 Feb 2025 23:32:01 -0500 Received: from mail.envs.net ([5.199.136.28]:47780) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1teReI-00008x-U0 for 75966@debbugs.gnu.org; Sat, 01 Feb 2025 23:31:59 -0500 Received: from localhost (mail.envs.net [127.0.0.1]) by mail.envs.net (Postfix) with ESMTP id 23BCF38A3EBB; Sun, 2 Feb 2025 04:31:58 +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 Qv_qfik5kjTV; Sun, 2 Feb 2025 04:31:55 +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:53 +0000 (UTC) Received: from localhost.localdomain (localhost.lan [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 2df5ffc5; Sun, 2 Feb 2025 04:35:16 +0000 (UTC) Date: Sun, 2 Feb 2025 12:34:58 +0800 Message-ID: <87fc24ae32b650b129f1fe714bf400a17fcfa1c1.1738470835.git.iyzsong@member.fsf.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: References: 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: "ashish.is--- 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: 宋文武 * gnu/packages/web.scm (kiwix-desktop):[arguments]: Remove 'wrap-qt-process-path phase. Change-Id: Iaf33c180268358a3b1bf1695b37313f20b410f9d --- gnu/packages/web.scm | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index a23a0f3dcd..0cf1c18a56 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -9404,15 +9404,7 @@ (define-public kiwix-desktop (lambda* (#:key outputs #:allow-other-keys) (invoke "qmake" (string-append "PREFIX=" - (assoc-ref outputs "out"))))) - (add-after 'install 'wrap-qt-process-path - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin/kiwix-desktop")) - (qt-process-path (search-input-file - inputs "/lib/qt5/libexec/QtWebEngineProcess"))) - (wrap-program bin - `("QTWEBENGINEPROCESS_PATH" = (,qt-process-path))))))))) + (assoc-ref outputs "out")))))))) (inputs (list bash-minimal curl From patchwork Sun Feb 2 04:34:59 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "ashish.is--- via Guix-patches\" via" X-Patchwork-Id: 38169 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 18AE127BBEA; Sun, 2 Feb 2025 04:33:17 +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=-6.4 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 autolearn=ham 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 BE94B27BBE2 for ; Sun, 2 Feb 2025 04:33:16 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1teRfS-0007q3-QX; Sat, 01 Feb 2025 23:33:10 -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 1teRfL-0007kv-I4 for guix-patches@gnu.org; Sat, 01 Feb 2025 23:33:06 -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 1teRfK-0003uw-OS for guix-patches@gnu.org; Sat, 01 Feb 2025 23:33: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:References:In-Reply-To:Date:From:To:Subject; bh=AzXWKh410ZIavZlomwxcpAV9DyFqhqy6K2J5radYuzY=; b=dwdJvc0HZrZRfFtRakgc1NGIAXTKZU/BWBFwdf4Ov7R7vwwgrUfjiXMuMk7SOx4vaAmyqLt/Qr31qstJicvQq9dGjDw4VaQ6YRuc3XkLBcGYT6OHawTTy0TDiv/Or+R9LBOguDo3FI6vD0uza9c2GrvCZVzhh1XsziTeXOJidtVZ9QxrTIbd+rDaT+/MMhSFQfWwQMWtCa6GX6HwFceNZeEoY/hI60OZN9v0w6t1Q4kF/zz6Z9bZnoAhtxv6rBMhdUebNRcMbn5ijDbLBrXdNI/ysixI0FiXizzAbjobCbggwGRCqcQJW0qi59bjHMG+i9t/VIpMNlkX1VYsjZvrHA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1teRfK-0000Cl-JT for guix-patches@gnu.org; Sat, 01 Feb 2025 23:33:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75966] [PATCH v3 10/10] gnu: qutebrowser: Do not wrap with QTWEBENGINEPROCESS_PATH. Resent-From: iyzsong@envs.net Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 02 Feb 2025 04:33:02 +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?= Received: via spool by 75966-submit@debbugs.gnu.org id=B75966.1738470728709 (code B ref 75966); Sun, 02 Feb 2025 04:33:02 +0000 Received: (at 75966) by debbugs.gnu.org; 2 Feb 2025 04:32:08 +0000 Received: from localhost ([127.0.0.1]:60818 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1teReS-0000BN-3t for submit@debbugs.gnu.org; Sat, 01 Feb 2025 23:32:08 -0500 Received: from mail.envs.net ([5.199.136.28]:47788) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1teReM-00009m-C4 for 75966@debbugs.gnu.org; Sat, 01 Feb 2025 23:32:06 -0500 Received: from localhost (mail.envs.net [127.0.0.1]) by mail.envs.net (Postfix) with ESMTP id 95C5338A2C06; Sun, 2 Feb 2025 04:32:01 +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 UoShqinoNEl0; Sun, 2 Feb 2025 04:31:58 +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:55 +0000 (UTC) Received: from localhost.localdomain (localhost.lan [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id c422eaa2; Sun, 2 Feb 2025 04:35:16 +0000 (UTC) Date: Sun, 2 Feb 2025 12:34:59 +0800 Message-ID: <01b9a27f0667f70e1370265f28045136460edc1a.1738470835.git.iyzsong@member.fsf.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: References: 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: "ashish.is--- 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: 宋文武 * gnu/packages/web-browsers.scm (qutebrowser): [arguments]: Remove QTWEBENGINEPROCESS_PATH from the 'wrap-qt-process-path phase. Change-Id: I7227e1f5abd9e9db98d603ca74ece6ea268b7eaa Reviewed-by: Maxim Cournoyer --- gnu/packages/web-browsers.scm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index c0138eea17..2bc79de3b5 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -492,7 +492,7 @@ (define-public qutebrowser python-pyqtwebengine-6 python-tldextract ;; While qtwebengine is provided by python-pyqtwebengine-6, it's - ;; included here so we can wrap QTWEBENGINEPROCESS_PATH. + ;; included here so we can wrap QTWEBENGINE_RESOURCES_PATH. qtwebengine)) (arguments `(;; FIXME: With the existence of qtwebengine, tests can now run. But @@ -547,10 +547,7 @@ (define-public qutebrowser (wrap-program (search-input-file outputs "bin/qutebrowser") `("QTWEBENGINE_RESOURCES_PATH" = (,(search-input-directory - inputs "/share/qt6/resources"))) - `("QTWEBENGINEPROCESS_PATH" = - (,(search-input-file - inputs "/lib/qt6/libexec/QtWebEngineProcess"))))))))) + inputs "/share/qt6/resources"))))))))) (home-page "https://qutebrowser.org/") (synopsis "Minimal, keyboard-focused, vim-like web browser") (description "qutebrowser is a keyboard-focused browser with a minimal