zathura-pdf-mupdf: Workaround missing symbols by checking for libraries

[Leonardo Taccari <leot%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Thu Sep 27 14:09:07 2018 +0200
Changeset:	452ce15bd038a6a423921aae024699e63381867d

Modified Files:
	zathura-pdf-mupdf/TODO
	zathura-pdf-mupdf/distinfo
	zathura-pdf-mupdf/patches/patch-meson.build

Log Message:
zathura-pdf-mupdf: Workaround missing symbols by checking for libraries

XXX: This is probably a kludge!
XXX: Now it fails in rendering the PDF!

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=452ce15bd038a6a423921aae024699e63381867d

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 zathura-pdf-mupdf/TODO                      |  8 ++++----
 zathura-pdf-mupdf/distinfo                  |  2 +-
 zathura-pdf-mupdf/patches/patch-meson.build | 15 ++++++++++++---
 3 files changed, 17 insertions(+), 8 deletions(-)

diffs:
diff --git a/zathura-pdf-mupdf/TODO b/zathura-pdf-mupdf/TODO
index ade1c78979..74e0e04d62 100644
--- a/zathura-pdf-mupdf/TODO
+++ b/zathura-pdf-mupdf/TODO
@@ -1,6 +1,6 @@
-Fail at run time with:
+- PDF are not correctly rendered... and a lot of:
 
- % zathura
- error: Could not load plugin '/usr/pkg/lib/zathura/libpdf-mupdf.so' (/usr/pkg/lib/libmupdf.so.0: Undefined PLT symbol "opj_stream_set_user_data" (symnum = 83)).
+   error: Rendering failed (page ...)
 
-Investigate that!
+  errors are printed... investigate that! (this is probably a
+  mistake in 1.14.0 port)
diff --git a/zathura-pdf-mupdf/distinfo b/zathura-pdf-mupdf/distinfo
index b2c7f4c5b0..910e908f49 100644
--- a/zathura-pdf-mupdf/distinfo
+++ b/zathura-pdf-mupdf/distinfo
@@ -5,7 +5,7 @@ RMD160 (zathura-pdf-mupdf-0.3.3.tar.xz) = e66539794f0fb5cc341c485164142eceb3815f
 SHA512 (zathura-pdf-mupdf-0.3.3.tar.xz) = cac3ccf4f85c689d44095966fbee84efac76d7c72915a06a85da272663eb3f11b053baf06a24e79e2fc89a57d05fa2f3c1df199e9e1415a3bfa65f3309227faf
 Size (zathura-pdf-mupdf-0.3.3.tar.xz) = 7880 bytes
 SHA1 (patch-document.c) = b7d3c8c23148f7eb5f034586c2da4995a5cf2b5d
-SHA1 (patch-meson.build) = 44b4760c088089b963982fad598f9f27b985c695
+SHA1 (patch-meson.build) = a23f098b32e58019787a2b269c5cb73d5c219d07
 SHA1 (patch-zathura-pdf-mupdf_page.c) = 396873c5bfd9597587ca2f8c4881ce4ad2d47777
 SHA1 (patch-zathura-pdf-mupdf_render.c) = 121f5b7c1264f67466aa9676e499b7a8636483d5
 SHA1 (patch-zathura-pdf-mupdf_search.c) = 9d21523e2768436fe2e00bc4765d21643d996c0c
diff --git a/zathura-pdf-mupdf/patches/patch-meson.build b/zathura-pdf-mupdf/patches/patch-meson.build
index 1a1e4bcd6b..33453fb1a6 100644
--- a/zathura-pdf-mupdf/patches/patch-meson.build
+++ b/zathura-pdf-mupdf/patches/patch-meson.build
@@ -1,15 +1,24 @@
 $NetBSD$
 
-Adjust library name of mupdf-third for mupdf>=1.14.0.
+- Also depends on openjpeg, jpeg and jbig2dec to avoid missing PLT symbols at
+  run time
+- Adjust library name of mupdf-third for mupdf>=1.14.0.
 
 --- meson.build.orig	2018-03-17 19:47:01.000000000 +0000
 +++ meson.build
-@@ -20,7 +20,7 @@ girara = dependency('girara-gtk3')
+@@ -19,10 +19,13 @@ zathura = dependency('zathura', version:
+ girara = dependency('girara-gtk3')
  glib = dependency('glib-2.0')
  cairo = dependency('cairo')
++libopenjp2 = dependency('libopenjp2')
++libjpeg = dependency('libjpeg')
++jbig2dec = cc.find_library('jbig2dec')
  mupdf = cc.find_library('mupdf')
 -mupdfthird = cc.find_library('mupdfthird')
 +mupdfthird = cc.find_library('mupdf-third')
  
- build_dependencies = [zathura, girara, glib, cairo, mupdf, mupdfthird]
+-build_dependencies = [zathura, girara, glib, cairo, mupdf, mupdfthird]
++build_dependencies = [zathura, girara, glib, cairo, libopenjp2, libjpeg, jbig2dec, mupdf, mupdfthird]
  
+ # defines
+ defines = [