From patchwork Sun Aug 16 07:03:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 23629 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 26BB027BBE7; Sun, 16 Aug 2020 08:04:26 +0100 (BST) 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, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,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 ESMTP id DD09527BBE5 for ; Sun, 16 Aug 2020 08:04:25 +0100 (BST) Received: from localhost ([::1]:54208 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7CiP-0004e8-EA for patchwork@mira.cbaines.net; Sun, 16 Aug 2020 03:04:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44314) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7Ci3-0004RO-Bn for guix-patches@gnu.org; Sun, 16 Aug 2020 03:04:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45197) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7Ci3-0002Zb-1p for guix-patches@gnu.org; Sun, 16 Aug 2020 03:04:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1k7Ci2-0002zR-Tr for guix-patches@gnu.org; Sun, 16 Aug 2020 03:04:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42885] [PATCH 3/4] gnu: calibre: Update to 4.22.0. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 16 Aug 2020 07:04:02 +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 Received: via spool by 42885-submit@debbugs.gnu.org id=B42885.159756143511461 (code B ref 42885); Sun, 16 Aug 2020 07:04:02 +0000 Received: (at 42885) by debbugs.gnu.org; 16 Aug 2020 07:03:55 +0000 Received: from localhost ([127.0.0.1]:56738 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k7Chv-0002yg-CT for submit@debbugs.gnu.org; Sun, 16 Aug 2020 03:03:55 -0400 Received: from mout-p-201.mailbox.org ([80.241.56.171]:14674) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k7Chn-0002y0-N9 for 42885@debbugs.gnu.org; Sun, 16 Aug 2020 03:03:48 -0400 Received: from smtp2.mailbox.org (smtp2.mailbox.org [80.241.60.241]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by mout-p-201.mailbox.org (Postfix) with ESMTPS id 4BTp722cffzQlJm for <42885@debbugs.gnu.org>; Sun, 16 Aug 2020 09:03:42 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1597561420; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xjbJ7GbyXV4w+DEziuTT2lTVxfubCK0UDZPe366p7ig=; b=KeNvExQKRik+65gN9bCyB0wjR3J2ALZGKBD3+g2F80n4QkJXjbuZmKV+8p7Gp4//4xb1jP Ogsehp9NYjeK4LHKiS23DSCrGUuwYIbsBUUB5xKdoWfRCNCgnIpZ++Vs5kWBW9E/jjBhir PjHIQVTnzRbOXQxpeh7CYjpeUwMr5nJrvTLN5GikMtZu1BMYV6ObRzMjPxEpuDbENdWEDh 8yHD/LeuPfWEaRGOZGnsF8pkS43DbjG5aPJxVYW0vqfbvh3QNOke0LGefSFw8nJO95aiWw LAu7edKSn4gMWJINB/lJoo+LCOFS2RB7Qj44c2AlbFp2gs/ebhqm5TGF0zmiSQ== Received: from smtp2.mailbox.org ([80.241.60.241]) by spamfilter01.heinlein-hosting.de (spamfilter01.heinlein-hosting.de [80.241.56.115]) (amavisd-new, port 10030) with ESMTP id zwUNV5mHDqTF for <42885@debbugs.gnu.org>; Sun, 16 Aug 2020 09:03:39 +0200 (CEST) From: Brendan Tildesley Date: Sun, 16 Aug 2020 17:03:17 +1000 Message-Id: <20200816070318.18642-3-mail@brendan.scot> In-Reply-To: <20200816070318.18642-1-mail@brendan.scot> References: <20200816070318.18642-1-mail@brendan.scot> MIME-Version: 1.0 X-MBO-SPAM-Probability: * X-Rspamd-Score: 0.79 / 15.00 / 15.00 X-Rspamd-Queue-Id: 5FB7E178B X-Rspamd-UID: 81020c 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ebook.scm (calbre): Update to 4.22.0. Replace MathJax 2 input with newly required MathJax 3. --- gnu/packages/ebook.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index aab4155d3d..a434f56bc1 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -82,7 +82,7 @@ (define-public calibre (package (name "calibre") - (version "4.18.0") + (version "4.22.0") (source (origin (method url-fetch) @@ -91,7 +91,7 @@ version ".tar.xz")) (sha256 (base32 - "0w9pcfvskjh4v00vjw3i6hzrafy863pgsmmqdx4lffip3p856brw")) + "0d0wmd3ijk8px1d662igal4lfmpyzynfzs6ms1bb9nf42mq2pxai")) (modules '((guix build utils))) (snippet '(begin @@ -126,7 +126,7 @@ ("hunspell" ,hunspell) ("hyphen" ,hyphen) ("icu4c" ,icu4c) - ("js-mathjax" ,js-mathjax) + ("mathjax" ,mathjax-bin) ("libmtp" ,libmtp) ("libpng" ,libpng) ("libusb" ,libusb) @@ -243,8 +243,8 @@ (lambda* (#:key inputs #:allow-other-keys) (invoke "python2" "setup.py" "mathjax""--system-mathjax" "--path-to-mathjax" (string-append - (assoc-ref inputs "js-mathjax") - "/share/javascript/mathjax")) + (assoc-ref inputs "mathjax") + "/lib/node_modules/mathjax/es5")) (invoke "python2" "setup.py" "rapydscript"))) (add-after 'install 'install-man-pages (lambda* (#:key outputs #:allow-other-keys)