From patchwork Sun Aug 16 07:03:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 23627 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 91D5027BBE7; Sun, 16 Aug 2020 08:04:17 +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 078C827BBE5 for ; Sun, 16 Aug 2020 08:04:17 +0100 (BST) Received: from localhost ([::1]:53802 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7CiG-0004Ru-Jx for patchwork@mira.cbaines.net; Sun, 16 Aug 2020 03:04:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44312) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7Ci2-0004RH-UB for guix-patches@gnu.org; Sun, 16 Aug 2020 03:04:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45196) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7Ci2-0002ZT-Ku for guix-patches@gnu.org; Sun, 16 Aug 2020 03:04:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1k7Ci2-0002zK-GY for guix-patches@gnu.org; Sun, 16 Aug 2020 03:04:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42885] [PATCH 1/4] gnu: ebook.scm: remove duplicate module import. 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.159756143511453 (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]:56735 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k7Chp-0002yM-De for submit@debbugs.gnu.org; Sun, 16 Aug 2020 03:03:55 -0400 Received: from mout-p-201.mailbox.org ([80.241.56.171]:14670) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k7Chl-0002xv-4C for 42885@debbugs.gnu.org; Sun, 16 Aug 2020 03:03:47 -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 4BTp6y6WbSzQl94 for <42885@debbugs.gnu.org>; Sun, 16 Aug 2020 09:03:38 +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=1597561417; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=em0v0sZTofYVDbDMvk5Dd2PEn1dSjZJ/8mm5foJPecM=; b=IlJ03GCowgqTzgsnUWMg9X3PaeRTNR/7z+kvNfWmo+u/RMxdSjIDylKS+7bC6p+BFHrjol CPRac2Iic+T9EuL3CiCcZdOI/7A3M+AYnGhnSPrBtx3TEzp/SL1yOHRO2MxS3j2uMDd2tF Ybfrpb3kF8aNa+Nu8T82HSK21QmKxokwTufBaXwUtv20J6t197I7z2PvbeTWtf9rgMcAvN +NC/OPrIQWbc/W9Dc5Ava+TM3KaR0w4NwPQrJwCOZUW3Nc7chR05g+NZ7OH+cgMo52DfXV pJHa62HgGQ6tXPsT/dDaaFGH1D9ylp9YTG52/3ogrsJp2uXMyvEZiy0WyWl+UA== Received: from smtp2.mailbox.org ([80.241.60.241]) by gerste.heinlein-support.de (gerste.heinlein-support.de [91.198.250.173]) (amavisd-new, port 10030) with ESMTP id kEs7_hmx0BFg for <42885@debbugs.gnu.org>; Sun, 16 Aug 2020 09:03:35 +0200 (CEST) From: Brendan Tildesley Date: Sun, 16 Aug 2020 17:03:15 +1000 Message-Id: <20200816070318.18642-1-mail@brendan.scot> In-Reply-To: References: MIME-Version: 1.0 X-MBO-SPAM-Probability: X-Rspamd-Score: -7.62 / 15.00 / 15.00 X-Rspamd-Queue-Id: D5980175A X-Rspamd-UID: 44f0af 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 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index d290b19f5f..aab4155d3d 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2015, 2016 Andreas Enge ;;; Copyright © 2016, 2018 Efraim Flashner ;;; Copyright © 2016, 2017 Alex Griffin -;;; Copyright © 2017, 2019 Brendan Tildesley +;;; Copyright © 2017, 2019, 2020 Brendan Tildesley ;;; Copyright © 2017 Roel Janssen ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2020 Marius Bakke @@ -28,7 +28,6 @@ #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix build-system gnu) - #:use-module (gnu packages) #:use-module (guix build-system python) #:use-module (gnu packages) #:use-module (gnu packages compression) From patchwork Sun Aug 16 07:03:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 23628 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 CA35627BBE5; Sun, 16 Aug 2020 08:04:17 +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 154A127BBE6 for ; Sun, 16 Aug 2020 08:04:17 +0100 (BST) Received: from localhost ([::1]:53800 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7CiG-0004Rt-LB for patchwork@mira.cbaines.net; Sun, 16 Aug 2020 03:04:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44316) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7Ci3-0004RU-Ns for guix-patches@gnu.org; Sun, 16 Aug 2020 03:04:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45198) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7Ci3-0002Zk-Eg 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 1k7Ci3-0002zY-Ao for guix-patches@gnu.org; Sun, 16 Aug 2020 03:04:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42885] [PATCH 2/4] gnu: Add mathjax-bin (MathJax 3). Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 16 Aug 2020 07:04:03 +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.159756143611468 (code B ref 42885); Sun, 16 Aug 2020 07:04:03 +0000 Received: (at 42885) by debbugs.gnu.org; 16 Aug 2020 07:03:56 +0000 Received: from localhost ([127.0.0.1]:56740 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k7Chv-0002yo-QN for submit@debbugs.gnu.org; Sun, 16 Aug 2020 03:03:56 -0400 Received: from mout-p-103.mailbox.org ([80.241.56.161]:23428) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k7Chn-0002xy-Gq for 42885@debbugs.gnu.org; Sun, 16 Aug 2020 03:03:49 -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-103.mailbox.org (Postfix) with ESMTPS id 4BTp713jFzzKmTq for <42885@debbugs.gnu.org>; Sun, 16 Aug 2020 09:03:41 +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=1597561419; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=B8lvaknBboFC5vR8SPPfokYeRWbIwWC74dORN3C4+Xo=; b=lxh5IbDiPgW2p1XaBPIvvoHwLe3AFFSlBhdGm0nlbxZgaCykavYGsuZzt6FAWZeCrj+xGM A4yv9TQ8IGNfXi03GAMA7ogjlABHNRRAwE3ku0UTjroOFvYjjr6mVWHer5eRpZQy2o1VXu fNq3uMdoj2RHi5qzNiQHd3J7h6/m/phRgDTWtlYQyIHd8uVpMiHEZnajj7/CVjM+I4LcDS K56eDQvn+KVxQIiAWuQpoDwgMqlZo/4rU+rmaVEI0lozoI/f3p2zd/dsW4fvVbyaZXpSwc EUB9xBR7Cx8UlJccaN2UTQFlLhTl3uPNdJeFCMD1g1atpUlTsZUDOCrVFkGuTw== Received: from smtp2.mailbox.org ([80.241.60.241]) by gerste.heinlein-support.de (gerste.heinlein-support.de [91.198.250.173]) (amavisd-new, port 10030) with ESMTP id xrkMkThMCsHS for <42885@debbugs.gnu.org>; Sun, 16 Aug 2020 09:03:37 +0200 (CEST) From: Brendan Tildesley Date: Sun, 16 Aug 2020 17:03:16 +1000 Message-Id: <20200816070318.18642-2-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: -6.19 / 15.00 / 15.00 X-Rspamd-Queue-Id: 22761175A X-Rspamd-UID: 7490e4 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/javascript.scm: (mathjax-bin): New variable --- gnu/packages/javascript.scm | 40 +++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/gnu/packages/javascript.scm b/gnu/packages/javascript.scm index d5ff5bffee..d6a66a1482 100644 --- a/gnu/packages/javascript.scm +++ b/gnu/packages/javascript.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2017, 2018, 2019, 2020 Efraim Flashner ;;; Copyright © 2018 Nicolas Goaziou +;;; Copyright © 2020 Brendan Tildesley ;;; ;;; This file is part of GNU Guix. ;;; @@ -128,6 +129,45 @@ plugins or software to be installed on the browser. So the page author can write web documents that include mathematics and be confident that readers will be able to view it naturally and easily."))) +(define-public mathjax-bin + (package + (name "mathjax") + (version "3.0.5") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mathjax/MathJax") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1zd0chn0cjahi28qv3nzshwljz2hgmj6lizyvvd8qs89gsx0z3h9")))) + (build-system trivial-build-system) + (arguments + `(#:modules ((guix build utils)) + #:builder + (begin + (use-modules (guix build utils) + (ice-9 match)) + (let ((install-directory (string-append %output "/lib/node_modules/mathjax"))) + (mkdir-p install-directory) + (copy-recursively (string-append (assoc-ref %build-inputs "source")) + install-directory))))) + (home-page "https://www.mathjax.org/") + (synopsis "JavaScript display engine for LaTeX, MathML, and AsciiMath (prebuilt)") + (description "MathJax is a JavaScript display engine for LaTeX, MathML, +and AsciiMath notation that works in all modern browsers. It requires no +plugins or software to be installed on the browser. So the page author can +write web documents that include mathematics and be confident that readers will +be able to view it naturally and easily. + +The package is derived from not the true source but the built version of +MathJax 3 for distribution by upstream. This package should eventually be +replaced my a package built directly from the source at +https://github.com/mathjax/MathJax-src.") + (license license:asl2.0))) + (define-public js-respond (package (name "js-respond") 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) From patchwork Sun Aug 16 07:03:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 23630 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 7C4DA27BBE5; 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 11C7227BBE6 for ; Sun, 16 Aug 2020 08:04:26 +0100 (BST) Received: from localhost ([::1]:54216 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7CiP-0004eH-Jo for patchwork@mira.cbaines.net; Sun, 16 Aug 2020 03:04:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44320) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7Ci4-0004Rc-6c for guix-patches@gnu.org; Sun, 16 Aug 2020 03:04:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45199) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7Ci3-0002Zo-Sd 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 1k7Ci3-0002zh-OK for guix-patches@gnu.org; Sun, 16 Aug 2020 03:04:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42885] [PATCH 4/4] gnu: calibre: Add wrap phase for qtwebengine. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 16 Aug 2020 07:04:03 +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.159756143611475 (code B ref 42885); Sun, 16 Aug 2020 07:04:03 +0000 Received: (at 42885) by debbugs.gnu.org; 16 Aug 2020 07:03:56 +0000 Received: from localhost ([127.0.0.1]:56742 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k7Chw-0002yv-9m for submit@debbugs.gnu.org; Sun, 16 Aug 2020 03:03:56 -0400 Received: from mout-p-102.mailbox.org ([80.241.56.152]:38326) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k7Chq-0002y5-8k for 42885@debbugs.gnu.org; Sun, 16 Aug 2020 03:03:51 -0400 Received: from smtp2.mailbox.org (smtp2.mailbox.org [IPv6:2001:67c:2050:105:465:1:2:0]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by mout-p-102.mailbox.org (Postfix) with ESMTPS id 4BTp741wK8zKmRG for <42885@debbugs.gnu.org>; Sun, 16 Aug 2020 09:03:44 +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=1597561422; 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=A+XPo0B365MqUcsjP3ScBwgKVFLPGoM+IPhUt9pcfys=; b=A9VWZyu2mXpM45sG0yxKg8zWOeDFWjjC2rnIZfY7664LDOtV59L1pzkbYLtdPcBLQlDJu/ NorbnIk0D0FH43MhU4zlXecxa365vIpflIFQ9FQG9yG4Ejwa7q7F1KhV/i02DcJQztPKws ceHLNP58fzEQmxy6AxW4hAPaseQlIjbOrQVIRP5R8P/ZIjcjaDE//fV2X5LDmSX4BWv3p/ sMvp3ampfXVadIH7hfHUCql6ZbPc2drolirQv7fzN13CnNqLcoYSywTfLMet3T8if5bJt/ WTDRknlyNajcb4JEn6MssqvrflGdB4Aw56v/M/WSCMBydSj+uPy7tU7mTn2btg== Received: from smtp2.mailbox.org ([80.241.60.241]) by spamfilter03.heinlein-hosting.de (spamfilter03.heinlein-hosting.de [80.241.56.117]) (amavisd-new, port 10030) with ESMTP id XCMkxp6QCSRT for <42885@debbugs.gnu.org>; Sun, 16 Aug 2020 09:03:41 +0200 (CEST) From: Brendan Tildesley Date: Sun, 16 Aug 2020 17:03:18 +1000 Message-Id: <20200816070318.18642-4-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.54 / 15.00 / 15.00 X-Rspamd-Queue-Id: 2CD761738 X-Rspamd-UID: 72c7d2 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 (calibre): [arguments]: Copy the wrap phase from Anki to wrap QTWEBENGINEPROCESS_PATH. This fixes the 'Could not find QtWebEngineProcess error' when opening a book with the ebook-viewer. --- gnu/packages/ebook.scm | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index a434f56bc1..31864a0786 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -165,7 +165,10 @@ ("qtwebengine" ,qtwebengine) ("sqlite" ,sqlite))) (arguments - `(#:python ,python-2 + `(#:modules ((guix build python-build-system) + (guix build utils) + (ice-9 match)) + #:python ,python-2 ;; Calibre is using setuptools by itself, but the setup.py is not ;; compatible with the shim wrapper (taken from pip) we are using. #:use-setuptools? #f @@ -252,6 +255,35 @@ "man-pages" (string-append (assoc-ref outputs "out") "/share/man")) #t)) + ;; wrap phase copied from anki package. + (add-after 'install 'wrap + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((bin (string-append (assoc-ref outputs "out") "/bin")) + ;; List of paths to the site-packages directories of Python + ;; library inputs. + (site-packages + (map (lambda (pyinput) + (string-append + (cdr pyinput) + "/lib/python2.7/site-packages")) + (filter (match-lambda + ((label . _) + (string-prefix? "python2-" label))) + inputs))) + (qtwebengineprocess + (string-append (assoc-ref inputs "qtwebengine") + "/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. + (for-each (lambda (program) + (wrap-program program + `("QTWEBENGINEPROCESS_PATH" = + (,qtwebengineprocess)) + `("PYTHONPATH" = ,site-packages))) + (find-files bin "."))) + #t)) ;; The font TTF files are used in some miscellaneous tests, so we ;; unbundle them here to avoid patching the tests. (add-after 'install 'unbundle-font-liberation