From patchwork Sat Apr 27 09:36:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 13779 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 B74CB16F51; Sat, 27 Apr 2019 14:13:33 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 43F4F16F4F for ; Sat, 27 Apr 2019 14:13:33 +0100 (BST) Received: from localhost ([127.0.0.1]:60223 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hKN92-0000Xr-NT for patchwork@mira.cbaines.net; Sat, 27 Apr 2019 09:13:32 -0400 Received: from eggs.gnu.org ([209.51.188.92]:55296) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hKJmZ-00078b-Mr for guix-patches@gnu.org; Sat, 27 Apr 2019 05:38:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hKJmX-0004HX-Ox for guix-patches@gnu.org; Sat, 27 Apr 2019 05:38:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49077) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hKJmV-0004Es-VS for guix-patches@gnu.org; Sat, 27 Apr 2019 05:38:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hKJmV-00014r-RZ for guix-patches@gnu.org; Sat, 27 Apr 2019 05:38:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35446] [PATCH 08/26] gnu: calibre: Use system mathjax. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 27 Apr 2019 09:38:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35446 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35446@debbugs.gnu.org Received: via spool by 35446-submit@debbugs.gnu.org id=B35446.15563578694019 (code B ref 35446); Sat, 27 Apr 2019 09:38:03 +0000 Received: (at 35446) by debbugs.gnu.org; 27 Apr 2019 09:37:49 +0000 Received: from localhost ([127.0.0.1]:34369 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hKJmG-00012k-Nc for submit@debbugs.gnu.org; Sat, 27 Apr 2019 05:37:48 -0400 Received: from mx1.mailbox.org ([80.241.60.212]:37260) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hKJmC-00011h-5V for 35446@debbugs.gnu.org; Sat, 27 Apr 2019 05:37:44 -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 mx1.mailbox.org (Postfix) with ESMTPS id BB60B4CC41 for <35446@debbugs.gnu.org>; Sat, 27 Apr 2019 11:37: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=1556357858; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=TS112YmrqUKnaTnn9Ldi2rOzeToNRCmVbMESXyfL3AY=; b=BwPcBtmUCkPeWD9iipKxhLohlzsdf86CLJDUCQ7va70Ibevdd3qrhUep0LW/mq786Wgl1B MDazoND5fEdmgbeglDtni5m4It6I0y6IMgsQLmE9jBLAI1KqWRMqfQKZiEKq6gxwoDUr2Q uNYumCsJQOysBx1+9FBzoBUdlgALKmDH1h4ThTfU0I73Hy7VBQh6k87pk67Yrvs7uENGti wPgsyKN5vZ9cInuqZaWA2UldaaaIijI2aLA/QzlXOK9udBRvB7wAOHTF1b8zeI+CREGrxB LGEIAHkDbkhXcM/o9Nv/NhG2L+V49+l1SWyd1tYzAmk39l6JpuEpPEYRx1qp+w== 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 NuAUhk63Eq4S for <35446@debbugs.gnu.org>; Sat, 27 Apr 2019 11:37:31 +0200 (CEST) From: Brendan Tildesley Date: Sat, 27 Apr 2019 19:36:41 +1000 Message-Id: <20190427093659.21851-8-mail@brendan.scot> In-Reply-To: <20190427093659.21851-1-mail@brendan.scot> References: <20190427093659.21851-1-mail@brendan.scot> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-Mailman-Approved-At: Sat, 27 Apr 2019 09:12:43 -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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ebook.scm (calibre): Use system mathjax. The build phase can be replaced because the install phase builds everything anyway. --- gnu/packages/ebook.scm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index 45a456a63b..e5bc023f33 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -42,6 +42,7 @@ #:use-module (gnu packages glib) #:use-module (gnu packages icu4c) #:use-module (gnu packages image) + #:use-module (gnu packages javascript) #:use-module (gnu packages libusb) #:use-module (gnu packages pdf) #:use-module (gnu packages pkg-config) @@ -113,6 +114,7 @@ ("fontconfig" ,fontconfig) ("glib" ,glib) ("icu4c" ,icu4c) + ("js-mathjax" ,js-mathjax) ("libmtp" ,libmtp) ("libpng" ,libpng) ("libusb" ,libusb) @@ -181,6 +183,10 @@ (setenv "PODOFO_INC_DIR" (string-append podofo "/include/podofo")) (setenv "PODOFO_LIB_DIR" (string-append podofo "/lib")) #t))) + (add-after 'build 'build-mathjax + (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")))) (add-after 'install 'install-font-liberation (lambda* (#:key inputs outputs #:allow-other-keys) (for-each (lambda (file)