05/06: gnu: zathura-pdf-mupdf: Update to 0.3.4.

[Efraim Flashner]

efraim pushed a commit to branch master
in repository guix.

commit 24fc8f055df2138eaea74589c7f04793812f7bd8
Author: Efraim Flashner <address@hidden>
Date:   Tue Oct 30 11:08:10 2018 +0200

    gnu: zathura-pdf-mupdf: Update to 0.3.4.
    
    * gnu/packages/pdf.scm (zathura-pdf-mupdf): Update to 0.3.4.
    [source]: Remove patch.
    * gnu/packages/patches/zathura-pdf-mupdf-link-to-jpeg-libraries.patch:
    Remove file.
    * gnu/local.mk (dist_patch_DATA): Remove it.
---
 gnu/local.mk                                       |  1 -
 .../zathura-pdf-mupdf-link-to-jpeg-libraries.patch | 55 ----------------------
 gnu/packages/pdf.scm                               |  6 +--
 3 files changed, 2 insertions(+), 60 deletions(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index 56c434d..5f72879 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1246,7 +1246,6 @@ dist_patch_DATA =                                         
\
   %D%/packages/patches/xinetd-fix-fd-leak.patch                        \
   %D%/packages/patches/xinetd-CVE-2013-4342.patch              \
   %D%/packages/patches/xmodmap-asprintf.patch                  \
-  %D%/packages/patches/zathura-pdf-mupdf-link-to-jpeg-libraries.patch \
   %D%/packages/patches/zathura-plugindir-environment-variable.patch
 
 MISC_DISTRO_FILES =                            \
diff --git 
a/gnu/packages/patches/zathura-pdf-mupdf-link-to-jpeg-libraries.patch 
b/gnu/packages/patches/zathura-pdf-mupdf-link-to-jpeg-libraries.patch
deleted file mode 100644
index 63e058b..0000000
--- a/gnu/packages/patches/zathura-pdf-mupdf-link-to-jpeg-libraries.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From: Tobias Geerinckx-Rice <address@hidden>
-Date: Mon, 18 Jun 2018 02:37:41 +0200
-Subject: zathura-pdf-mupdf: Link to JPEG libraries.
-
-As of version 0.3.3, zathura-pdf-mupdf no longer links to some required
-JPEG libraries, leading to such errors as:
-
-  $ zathura foo.pdf
-  error: Could not load plugin 
'/gnu/store/...-profile/lib/zathura/libpdf-mupdf.so' 
(/gnu/store/...-profile/lib/zathura/libpdf-mupdf.so: undefined symbol: 
jpeg_resync_to_restart).
-
-The patch below, copied verbatim from Arch[0], fixes that.
-Its description happens to match our reality, too.
-
-[0]: 
https://git.archlinux.org/svntogit/community.git/tree/trunk?h=packages/zathura-pdf-mupdf
----
-From 3fb0ff750373d45d4f5172ce1d41b74183cd07e8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Johannes=20L=C3=B6thberg?= <address@hidden>
-Date: Sat, 24 Mar 2018 14:31:18 +0100
-Subject: [PATCH] Explicitly link against jbig2dec, openjp2, and jpeg
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Normally these are statically linked into libmupdfthird, but we delete
-those to make mupdf use the system libraries.  Previously
-zathura-pdf-mupdf explicitly linked against them, but this is
-technically incorrect since they are supposed to be in libmupdfthird so
-that was removed.  This commit essentially reverts that in the new build
-system.
-
-Signed-off-by: Johannes Löthberg <address@hidden>
----
- meson.build | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 3b0d7b7..ae2fc9c 100644
---- a/meson.build
-+++ b/meson.build
-@@ -22,7 +22,11 @@ cairo = dependency('cairo')
- mupdf = cc.find_library('mupdf')
- mupdfthird = cc.find_library('mupdfthird')
- 
--build_dependencies = [zathura, girara, glib, cairo, mupdf, mupdfthird]
-+jbig2dec = cc.find_library('jbig2dec')
-+openjp2 = cc.find_library('openjp2')
-+jpeg = cc.find_library('jpeg')
-+
-+build_dependencies = [zathura, girara, glib, cairo, mupdf, mupdfthird, 
jbig2dec, openjp2, jpeg]
- 
- # defines
- defines = [
--- 
-2.16.3
-
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index 061a65a..4c3e983 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -415,17 +415,15 @@ using the DjVuLibre library.")
 (define-public zathura-pdf-mupdf
   (package
     (name "zathura-pdf-mupdf")
-    (version "0.3.3")
+    (version "0.3.4")
     (source (origin
               (method url-fetch)
               (uri
                (string-append "https://pwmt.org/projects/zathura-pdf-mupdf";
                               "/download/zathura-pdf-mupdf-" version 
".tar.xz"))
-              (patches
-               (search-patches 
"zathura-pdf-mupdf-link-to-jpeg-libraries.patch"))
               (sha256
                (base32
-                "1zbdqimav4wfgimpy3nfzl10qj7vyv23rdy2z5z7z93jwbp2rc2j"))))
+                "166d5nz47ixzwj4pixsd5fd9qvjf5v34cdqi3p72vr23pswk2hyn"))))
     (native-inputs `(("pkg-config" ,pkg-config)))
     (inputs
      `(("jbig2dec" ,jbig2dec)