From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51289) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dAUae-0003zG-Ik for guix-patches@gnu.org; Tue, 16 May 2017 01:00:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dAUaZ-0007aW-37 for guix-patches@gnu.org; Tue, 16 May 2017 01:00:08 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:44636) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dAUaY-0007aB-VL for guix-patches@gnu.org; Tue, 16 May 2017 01:00:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dAUaY-000664-Nx for guix-patches@gnu.org; Tue, 16 May 2017 01:00:02 -0400 Subject: bug#26924: [PATCH 10/10] gnu: calibre: Don't create uninstaller. Resent-Message-ID: References: From: Brendan Tildesley Message-ID: Date: Tue, 16 May 2017 14:59:26 +1000 MIME-Version: 1.0 In-Reply-To: Content-Type: multipart/mixed; boundary="------------F35CE3F53C1F5EA8A43FDE80" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 26924@debbugs.gnu.org This is a multi-part message in MIME format. --------------F35CE3F53C1F5EA8A43FDE80 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit --------------F35CE3F53C1F5EA8A43FDE80 Content-Type: text/x-patch; name="0010-gnu-calibre-Don-t-create-uninstaller.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0010-gnu-calibre-Don-t-create-uninstaller.patch" >From 9317684cdc23bcf6edb8f38abf5f057b319a0a68 Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Tue, 16 May 2017 10:53:44 +1000 Subject: [PATCH 10/10] gnu: calibre: Don't create uninstaller. gnu/packages/ebook.scm (calibre). Don't create uninstaller. --- gnu/packages/ebook.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index 289c2d07d..cca5e7895 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -84,6 +84,8 @@ (delete-file-recursively "resources/fonts/liberation") (delete-file-recursively "src/chardet") (substitute* (find-files "." "\\.py") + ;; We can't use the uninstaller in Guix. Don't build it. + (("self\\.create_uninstaller()") "") (("calibre\\.ebooks\\.markdown") "markdown")) #t)) (patches (search-patches "calibre-drop-unrar.patch" -- 2.13.0 --------------F35CE3F53C1F5EA8A43FDE80--