From patchwork Fri May 3 16:42:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 13870 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 AF71016F96; Fri, 3 May 2019 17:45:11 +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 37EF216F91 for ; Fri, 3 May 2019 17:45:11 +0100 (BST) Received: from localhost ([127.0.0.1]:44440 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMbJ8-0005Yd-Jo for patchwork@mira.cbaines.net; Fri, 03 May 2019 12:45:10 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54931) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMbIH-0004k9-Pm for guix-patches@gnu.org; Fri, 03 May 2019 12:44:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hMbIC-00041t-FT for guix-patches@gnu.org; Fri, 03 May 2019 12:44:16 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:35958) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hMbI5-0003wW-1E for guix-patches@gnu.org; Fri, 03 May 2019 12:44:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hMbI4-0007Gz-UZ for guix-patches@gnu.org; Fri, 03 May 2019 12:44:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35446] [PATCH v2 06/24] gnu: calibre: Move font unbundling to after check phase. 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.155690183827840 (code B ref 35446); Fri, 03 May 2019 16:44:04 +0000 Received: (at 35446) by debbugs.gnu.org; 3 May 2019 16:43:58 +0000 Received: from localhost ([127.0.0.1]:49480 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMbHx-0007Es-LC for submit@debbugs.gnu.org; Fri, 03 May 2019 12:43:57 -0400 Received: from mx2.mailbox.org ([80.241.60.215]:61740) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMbHt-0007Dp-LX for 35446@debbugs.gnu.org; Fri, 03 May 2019 12:43:54 -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 34E2DA0199 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=kTB9Rjw4cKuokRU7cm3MK0GcqfLUpz+1HK8U1ykPhq8=; b=mCszQ/qVeSBVXLU+wZifuVI9SZXubXLAa3uPVrRHNEwO2puOlhuPCFmLKTf0EGdccMCwlS QU2Fyzwo5/13FhkDV1u42sAv2CVBqvD9XHws9d/Ycc7BQRMA60qOl2/EAM53D86hapkmAI t2Ad3Dcpmq3cSWuHjucxQvj+9WjSzmGUR4PpZIC2QhXJkruiHrtMNBs+301xeo86v4vanl RxbNrchv67I+NpaeoHjni2BLtSoMlwsxUx6YRpck7ZHfCeu36vUZyjwVRBUwv1WvDTnH8P CVAFNgKAvMeOJmW3aVsjP0kTM/5Pl3SQVyVTDK2d0nOu2rnhXk1xW4YIgvFJew== Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter02.heinlein-hosting.de (spamfilter02.heinlein-hosting.de [80.241.56.116]) (amavisd-new, port 10030) with ESMTP id TAmMMazCGZPq for <35446@debbugs.gnu.org>; Fri, 3 May 2019 18:43:40 +0200 (CEST) From: Brendan Tildesley Date: Sat, 4 May 2019 02:42:14 +1000 Message-Id: <20190503164232.1799-6-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/packagse/ebook.scm (calibre): Move font unbundling to after check phase. Some of the tests use the font files for various things. It's more convenient to just allow the font files to be there than to patche the tests. We also take the chance to switch from copying the font files in, to having font-liberation as an input and symlinking them. --- gnu/packages/ebook.scm | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index f2875ef2fc..007ca9fc47 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -95,14 +95,12 @@ (snippet '(begin (delete-file "src/odf/thumbnail.py") - (delete-file-recursively "resources/fonts/liberation") #t)) (patches (search-patches "calibre-no-updates-dialog.patch" "calibre-remove-test-unrar.patch")))) (build-system python-build-system) (native-inputs `(("pkg-config" ,pkg-config) - ("font-liberation" ,font-liberation) ("qtbase" ,qtbase) ; for qmake ;; xdg-utils is supposed to be used for desktop integration, but it ;; also creates lots of messages @@ -113,6 +111,7 @@ (inputs `(("chmlib" ,chmlib) ("fontconfig" ,fontconfig) + ("font-liberation" ,font-liberation) ("glib" ,glib) ("icu4c" ,icu4c) ("js-mathjax" ,js-mathjax) @@ -191,17 +190,18 @@ (invoke "python2" "setup.py" "mathjax""--system-mathjax" "--path-to-mathjax" (string-append (assoc-ref inputs "js-mathjax") "/share/javascript/mathjax")) (invoke "python2" "setup.py" "rapydscript"))) - (add-after 'install 'install-font-liberation + ;; 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 (lambda* (#:key inputs outputs #:allow-other-keys) - (for-each (lambda (file) - (install-file file (string-append - (assoc-ref outputs "out") - "/share/calibre/fonts/liberation"))) - (find-files (string-append - (assoc-ref inputs "font-liberation") - "/share/fonts/truetype"))) + (let ((font-dest (string-append (assoc-ref outputs "out") + "/share/calibre/fonts/liberation")) + (font-src (string-append (assoc-ref inputs "font-liberation") + "/share/fonts/truetype"))) + (delete-file-recursively font-dest) + (symlink font-src font-dest)) #t)) - (add-after 'install-font-liberation 'install-mimetypes + (add-after 'unbundle-font-liberation 'install-mimetypes (lambda* (#:key outputs #:allow-other-keys) (install-file "resources/calibre-mimetypes.xml" (string-append (assoc-ref outputs "out")