From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id Zj/rN1WpQV/8FQAA0tVLHw (envelope-from ) for ; Sat, 22 Aug 2020 23:25:09 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id MJsVM1WpQV+eMQAAbx9fmQ (envelope-from ) for ; Sat, 22 Aug 2020 23:25:09 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 169859404E0 for ; Sat, 22 Aug 2020 23:25:09 +0000 (UTC) Received: from localhost ([::1]:33998 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k9csl-0004xb-Lm for larch@yhetil.org; Sat, 22 Aug 2020 19:25:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35628) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k9csh-0004xI-3b for guix-patches@gnu.org; Sat, 22 Aug 2020 19:25:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40172) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k9csg-0006Yg-03 for guix-patches@gnu.org; Sat, 22 Aug 2020 19:25:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1k9csf-0005ZL-Rg for guix-patches@gnu.org; Sat, 22 Aug 2020 19:25:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42885] ([PATCH 2/4] gnu: calibre: Update to 4.23.0 (new release) Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 22 Aug 2020 23:25: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 Received: via spool by 42885-submit@debbugs.gnu.org id=B42885.159813867521373 (code B ref 42885); Sat, 22 Aug 2020 23:25:01 +0000 Received: (at 42885) by debbugs.gnu.org; 22 Aug 2020 23:24:35 +0000 Received: from localhost ([127.0.0.1]:51718 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k9csF-0005Yf-GB for submit@debbugs.gnu.org; Sat, 22 Aug 2020 19:24:35 -0400 Received: from mout-p-201.mailbox.org ([80.241.56.171]:30688) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k9csB-0005YM-QZ for 42885@debbugs.gnu.org; Sat, 22 Aug 2020 19:24:33 -0400 Received: from smtp1.mailbox.org (smtp1.mailbox.org [IPv6:2001:67c:2050:105:465:1:1:0]) (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 4BYvbs22KqzQkmG for <42885@debbugs.gnu.org>; Sun, 23 Aug 2020 01:24:25 +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=1598138663; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=N/+eaoiaQug1ffvTk26WQKD9sR55b35n8CxGviQltcQ=; b=Am5ClkdJYaex4BLBWa3LuXSgNdwoLi9HbN+ya//kYVc5aAgqPieBtC+MGBIZCZupjwYUTa j+yscJ21D+N8a9ZG08Ove6XQsEFycjp0L8A4imJKIbvZa/ubBTRoNfU2AzJX0kGBMk8Gxj xHC3Qy8i+PAN6B7VbYNfzG1gVArl209M6r6x5ABn1U5Ud3JudTsPz8DXudZ2VTp8zgwuZ1 wwOnSB33OaVArKJVYsWZ7yk+8aU/kHnrr2tM9jNTGRwCZe7Yw3W7vC9ZIoK+6Dan2Rrqf+ bVe6S0c7fxTbohqQ2KDzVAoOGyPk1yK9OvYvAfpVF97X7leCgw77w19BGvMgcw== Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter05.heinlein-hosting.de (spamfilter05.heinlein-hosting.de [80.241.56.123]) (amavisd-new, port 10030) with ESMTP id Y7csEbVleBMT for <42885@debbugs.gnu.org>; Sun, 23 Aug 2020 01:24:21 +0200 (CEST) References: <8b1e2bed-e543-44a2-574b-f3c2c5a14d3f@brendan.scot> From: Brendan Tildesley Message-ID: <729297f7-8cc1-6a31-37ad-1522c339082f@brendan.scot> Date: Sun, 23 Aug 2020 09:24:15 +1000 MIME-Version: 1.0 In-Reply-To: Content-Type: multipart/mixed; boundary="------------242F4282506B3C1863342847" Content-Language: en-US X-MBO-SPAM-Probability: X-Rspamd-Score: -4.73 / 15.00 / 15.00 X-Rspamd-Queue-Id: 40B943CD X-Rspamd-UID: 231803 X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.7 (-) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=brendan.scot header.s=MBO0001 header.b=Am5ClkdJ; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: 1.49 X-TUID: s6zdY934GvRW This is a multi-part message in MIME format. --------------242F4282506B3C1863342847 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Calibre 4.23.0 was released. This just replaces the second patch. the others should still apply without conflict. --------------242F4282506B3C1863342847 Content-Type: text/x-patch; charset=UTF-8; name="0002-gnu-calibre-Update-to-4.23.0.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0002-gnu-calibre-Update-to-4.23.0.patch" >From d3b70c4c2329abbe6d210b9993a99306d93c5f29 Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Sun, 16 Aug 2020 16:16:19 +1000 Subject: [PATCH 2/3] gnu: calibre: Update to 4.23.0. * gnu/packages/ebook.scm (calbre): Update to 4.23.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..f1698900f3 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.23.0") (source (origin (method url-fetch) @@ -91,7 +91,7 @@ version ".tar.xz")) (sha256 (base32 - "0w9pcfvskjh4v00vjw3i6hzrafy863pgsmmqdx4lffip3p856brw")) + "064mnmz2w4xa2kydh5vzhlgvmyzlwjhm2wm58vwkdqzh7i3m3phn")) (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) -- 2.28.0 --------------242F4282506B3C1863342847--