From patchwork Sun Mar 21 07:00:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 27999 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 17B0E27BC58; Sun, 21 Mar 2021 10:38:01 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, HTML_MESSAGE,MAILING_LIST_MULTI,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 83CEA27BC57 for ; Sun, 21 Mar 2021 10:38:00 +0000 (GMT) Received: from localhost ([::1]:51038 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lNvT5-00024N-MB for patchwork@mira.cbaines.net; Sun, 21 Mar 2021 06:37:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51310) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lNvIU-0008UU-Dl for guix-patches@gnu.org; Sun, 21 Mar 2021 06:27:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42046) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lNvIU-0004hv-61 for guix-patches@gnu.org; Sun, 21 Mar 2021 06:27:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lNvIU-0002kD-0l for guix-patches@gnu.org; Sun, 21 Mar 2021 06:27:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42885] [PATCHES] 2 more fixes. References: <8b1e2bed-e543-44a2-574b-f3c2c5a14d3f@brendan.scot> In-Reply-To: <8b1e2bed-e543-44a2-574b-f3c2c5a14d3f@brendan.scot> Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 21 Mar 2021 10:27:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42885 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: "42885@debbugs.gnu.org" <42885@debbugs.gnu.org> Received: via spool by 42885-submit@debbugs.gnu.org id=B42885.161632239610518 (code B ref 42885); Sun, 21 Mar 2021 10:27:01 +0000 Received: (at 42885) by debbugs.gnu.org; 21 Mar 2021 10:26:36 +0000 Received: from localhost ([127.0.0.1]:53592 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lNvI3-0002jZ-IF for submit@debbugs.gnu.org; Sun, 21 Mar 2021 06:26:36 -0400 Received: from mout-p-101.mailbox.org ([80.241.56.151]:30684) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lNs4X-000405-NH for 42885@debbugs.gnu.org; Sun, 21 Mar 2021 03:00:28 -0400 Received: from smtp1.mailbox.org (smtp1.mailbox.org [IPv6:2001:67c:2050:105:465:1:1:0]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-101.mailbox.org (Postfix) with ESMTPS id 4F37mz2XfXzQjjG for <42885@debbugs.gnu.org>; Sun, 21 Mar 2021 08:00:19 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=mailbox.org; h= content-type:content-type:mime-version:subject:subject :message-id:from:from:date:date:received; s=mail20150812; t= 1616310015; bh=TLHsW0NqrmyaiHyCPmsYtpOvhPA5QV64vE0T/BpfMEE=; b=P ll06iMSrnUSss0xM9aG49tSrZGgx5t59UA+smpfv46nPLx0xfqrEtPTPTbTZ+HqN ELZvlbIR2lh0M4U5et+e9A97d3TUcaDTLtEsHR9iGzpqjmyGV2N2EKpfUnNfGY1E uEduxTfXIZXFtmaKFNK6MZfrwyR/kcYqY8lH6O3GH1/7qAcu4yAaDcJzQ5io/QXl FqBgMfqlvP/2TagThHyeVqij1czrr7rTWrddjpk8ch4MuJGW4B3PedX5wcv2DohE WGB9gTI/W+9mPOUV/7QUnEiF5MAg3RlX9TdIemuA+1zvQR0keO2mpoRVjvcGMJSC 49sldw8bHG3BIZr4wJ5WQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1616310017; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type; bh=04FKueiK72rJeYySvKC0zUTuRUlhGucWoS+EOBuoNnY=; b=JtQwGz+CHIqEbP72iMDZab9xPpxkwbdigdQhhP1dXvs75FsKGAeQvZt7meHGt3kXbTsoLm 04ozkHcDoZJASqa0yjsPKSNCdNuoI0OyxZpsALaTHFMxZXOK3ZreX5q/1ItiqMjaZWbyC5 QKmcOaegkup/Cs8+iwYs1I7MgtKaBdM4wXjyTAoyIGszmeLa2Yfx/+fZXip4ODAr9Z8I3m Z+mLMHadb2m95uJBfqCsb5ytCovjygb7F1u2fxr6wsvQmUWfYn049+zR2AgV3jjLQ874rc Wet0tkJsFr6I+OE01f5Kik7GmNLYoeDlVXzMN1RMoLfFAakukCCgCVN2ZSSxBA== X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter01.heinlein-hosting.de (spamfilter01.heinlein-hosting.de [80.241.56.115]) (amavisd-new, port 10030) with ESMTP id HfYEQH04fxbx for <42885@debbugs.gnu.org>; Sun, 21 Mar 2021 08:00:15 +0100 (CET) Date: Sun, 21 Mar 2021 08:00:15 +0100 (CET) Message-ID: <2053979569.43243.1616310015760@office.mailbox.org> MIME-Version: 1.0 X-Priority: 3 Importance: Normal X-MBO-SPAM-Probability: X-Rspamd-Score: -4.79 / 15.00 / 15.00 X-Rspamd-Queue-Id: 24E291404 X-Rspamd-UID: 8601a9 X-Mailman-Approved-At: Sun, 21 Mar 2021 06:26:34 -0400 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Sun, 21 Mar 2021 06:37:42 -0400 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: Brendan Tildesley X-ACL-Warn: , Brendan Tildesley via Guix-patches X-Patchwork-Original-From: Brendan Tildesley via Guix-patches via From: Brendan Tildesley X-getmail-retrieved-from-mailbox: Patches These two patches go after the last 27 patches, fixing up some mistakes I made earlier. From f8fe46256cbfe211b1bbbb624651cfc5b261ee32 Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Sun, 21 Mar 2021 17:18:13 +1100 Subject: [PATCH 2/2] gnu: calibre: Don't delete needed files. * gnu/packages/ebook.scm (calibre)[snippet]: Don't delete viewer.js since it's actually used by the html reader. --- gnu/packages/ebook.scm | 2 -- 1 file changed, 2 deletions(-) diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index b55af5c865..6fb525a2c2 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -136,8 +136,6 @@ "")) ;; Remove unneeded resources. - (delete-file "resources/viewer.js") - (delete-file "resources/viewer.html") (delete-file "resources/mozilla-ca-certs.pem") (delete-file "resources/calibre-portable.bat") (delete-file "resources/calibre-portable.sh") -- 2.30.2