From patchwork Fri May 3 16:42:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 13862 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 6015D16F96; Fri, 3 May 2019 17:44:23 +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 C72B816F91 for ; Fri, 3 May 2019 17:44:21 +0100 (BST) Received: from localhost ([127.0.0.1]:44381 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMbIK-0004od-VD for patchwork@mira.cbaines.net; Fri, 03 May 2019 12:44:21 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54903) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMbIH-0004id-5b for guix-patches@gnu.org; Fri, 03 May 2019 12:44:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hMbI9-0003zf-RP for guix-patches@gnu.org; Fri, 03 May 2019 12:44:12 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:35955) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hMbI4-0003w9-Gz for guix-patches@gnu.org; Fri, 03 May 2019 12:44:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hMbI4-0007Gs-Di for guix-patches@gnu.org; Fri, 03 May 2019 12:44:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35446] [PATCH v2 02/24] gnu: calibre: Use system mathjax. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 May 2019 16:44:04 +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.155690183727833 (code B ref 35446); Fri, 03 May 2019 16:44:04 +0000 Received: (at 35446) by debbugs.gnu.org; 3 May 2019 16:43:57 +0000 Received: from localhost ([127.0.0.1]:49478 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMbHx-0007Ep-Bj for submit@debbugs.gnu.org; Fri, 03 May 2019 12:43:57 -0400 Received: from mx2.mailbox.org ([80.241.60.215]:61736) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMbHt-0007Do-JD for 35446@debbugs.gnu.org; Fri, 03 May 2019 12:43:53 -0400 Received: from smtp1.mailbox.org (smtp1.mailbox.org [80.241.60.240]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by mx2.mailbox.org (Postfix) with ESMTPS id 2A724A0189 for <35446@debbugs.gnu.org>; Fri, 3 May 2019 18:43:48 +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=1556901828; 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=nEwPEK7SKR4vyxs7fXnbceoir3YZZSDNCzuaEqyfP9M=; b=a4KVuWTsCl4nhzrps1aXKnjWCqrI4/jmVCEqHFZkqTIr8fN9OlebhnZp5I2b7kMg/sVdTV HhfJHXU1yI9wNKkvHlpAYz+IRoWMvrEiJafeUBe+RBxfuBZDK0LoyrnyXNatUm650NU2pv Fhxdbvuwdcf8lyP3H6VR12AdSyX6DdvL0IX9LEUUh2ZqP6kAdBQw68rj/VSfXa0YJKkReZ LbTyPWvB2JXL1hHDA9A7tjqH9kOyGhTc7E2QCR09usJ+EIOoHNJrCeSSbWe1bRstVe5W6e T/Vku7KrvTmZnuDkVVJ6wh3OLa4ARmxKKUjhuYkqM4LxbFEotRO+t24AlsKqqw== Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter06.heinlein-hosting.de (spamfilter06.heinlein-hosting.de [80.241.56.125]) (amavisd-new, port 10030) with ESMTP id j5cVSilKb0AL for <35446@debbugs.gnu.org>; Fri, 3 May 2019 18:43:34 +0200 (CEST) From: Brendan Tildesley Date: Sat, 4 May 2019 02:42:10 +1000 Message-Id: <20190503164232.1799-2-mail@brendan.scot> In-Reply-To: <20190503164232.1799-1-mail@brendan.scot> References: <20190503164232.1799-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-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 a603519590..1d815489a6 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-extra + (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)