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: tusharhero--- 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: 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: 宋文武 * 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