Tue Aug 30 14:16:09 2022 UTC ()
zathura-pdf-mupdf: Clean up confusing dependency handling, eliminating
some deps that are pulled as a result of some workarounds for how
Linux distributions are distributing mupdf. Concern raised by leot@.


(nia)
diff -r1.54 -r1.55 pkgsrc/print/zathura-pdf-mupdf/Makefile
diff -r1.18 -r1.19 pkgsrc/print/zathura-pdf-mupdf/distinfo
diff -r0 -r1.3 pkgsrc/print/zathura-pdf-mupdf/patches/patch-meson.build
cvs diff -r1.54 -r1.55 pkgsrc/print/zathura-pdf-mupdf/Makefile (expand / switch to unified diff)

--- pkgsrc/print/zathura-pdf-mupdf/Makefile 2022/08/30 12:47:51 1.54
+++ pkgsrc/print/zathura-pdf-mupdf/Makefile 2022/08/30 14:16:09 1.55
@@ -1,29 +1,28 @@ @@ -1,29 +1,28 @@
1# $NetBSD: Makefile,v 1.54 2022/08/30 12:47:51 nia Exp $ 1# $NetBSD: Makefile,v 1.55 2022/08/30 14:16:09 nia Exp $
2# 2#
3 3
4DISTNAME= zathura-pdf-mupdf-0.3.9 4DISTNAME= zathura-pdf-mupdf-0.3.9
 5PKGREVISION= 1
5CATEGORIES= print 6CATEGORIES= print
6MASTER_SITES= https://pwmt.org/projects/zathura-pdf-mupdf/download/ 7MASTER_SITES= https://pwmt.org/projects/zathura-pdf-mupdf/download/
7EXTRACT_SUFX= .tar.xz 8EXTRACT_SUFX= .tar.xz
8 9
9MAINTAINER= leot@NetBSD.org 10MAINTAINER= leot@NetBSD.org
10HOMEPAGE= https://pwmt.org/projects/zathura-pdf-mupdf/ 11HOMEPAGE= https://pwmt.org/projects/zathura-pdf-mupdf/
11COMMENT= Add PDF support to zathura using mupdf rendering engine 12COMMENT= Add PDF support to zathura using mupdf rendering engine
12LICENSE= zlib 13LICENSE= zlib
13 14
14USE_TOOLS+= pkg-config 15USE_TOOLS+= pkg-config
15 16
16CPPFLAGS+= -D_XOPEN_SOURCE=600 17CPPFLAGS+= -D_XOPEN_SOURCE=600
17 18
18PYTHON_FOR_BUILD_ONLY= tool 19PYTHON_FOR_BUILD_ONLY= tool
19 20
20.include "../../devel/meson/build.mk" 21.include "../../devel/meson/build.mk"
21.include "../../graphics/cairo/buildlink3.mk" 22.include "../../graphics/cairo/buildlink3.mk"
22.include "../../graphics/tesseract/buildlink3.mk" 
23.include "../../lang/mujs/buildlink3.mk" 
24BUILDLINK_API_DEPENDS.mupdf+= mupdf>=1.16.0 23BUILDLINK_API_DEPENDS.mupdf+= mupdf>=1.16.0
25.include "../../print/mupdf/buildlink3.mk" 24.include "../../print/mupdf/buildlink3.mk"
26.include "../../print/zathura/buildlink3.mk" 25.include "../../print/zathura/buildlink3.mk"
27.include "../../sysutils/desktop-file-utils/desktopdb.mk" 26.include "../../sysutils/desktop-file-utils/desktopdb.mk"
28.include "../../x11/gtk3/buildlink3.mk" 27.include "../../x11/gtk3/buildlink3.mk"
29.include "../../mk/bsd.pkg.mk" 28.include "../../mk/bsd.pkg.mk"
cvs diff -r1.18 -r1.19 pkgsrc/print/zathura-pdf-mupdf/distinfo (expand / switch to unified diff)

--- pkgsrc/print/zathura-pdf-mupdf/distinfo 2022/08/30 12:47:51 1.18
+++ pkgsrc/print/zathura-pdf-mupdf/distinfo 2022/08/30 14:16:09 1.19
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.18 2022/08/30 12:47:51 nia Exp $ 1$NetBSD: distinfo,v 1.19 2022/08/30 14:16:09 nia Exp $
2 2
3BLAKE2s (zathura-pdf-mupdf-0.3.9.tar.xz) = 147d127c61be82e0fbfd063cf80d28a683c1474cf0c4b7c87266495db090d2e0 3BLAKE2s (zathura-pdf-mupdf-0.3.9.tar.xz) = 147d127c61be82e0fbfd063cf80d28a683c1474cf0c4b7c87266495db090d2e0
4SHA512 (zathura-pdf-mupdf-0.3.9.tar.xz) = 6a81e562965a0d6a2a25e301b0cc20ee70ada43ed7261f5d4ef6c132de1136f0222ebee0088d80cc2e0d1d60595e335cb1a1a914cb761aad36b487d7c16ac034 4SHA512 (zathura-pdf-mupdf-0.3.9.tar.xz) = 6a81e562965a0d6a2a25e301b0cc20ee70ada43ed7261f5d4ef6c132de1136f0222ebee0088d80cc2e0d1d60595e335cb1a1a914cb761aad36b487d7c16ac034
5Size (zathura-pdf-mupdf-0.3.9.tar.xz) = 8640 bytes 5Size (zathura-pdf-mupdf-0.3.9.tar.xz) = 8640 bytes
6SHA1 (patch-document.c) = ad929680aa1de6f21b71cabc06da9ba54491687a 6SHA1 (patch-document.c) = ad929680aa1de6f21b71cabc06da9ba54491687a
 7SHA1 (patch-meson.build) = 66c4da399ea6772e9b716626647d898ba488db89
File Added: pkgsrc/print/zathura-pdf-mupdf/patches/patch-meson.build
$NetBSD: patch-meson.build,v 1.3 2022/08/30 14:16:09 nia Exp $

Link against mupdf normally, not assuming static linking.

--- meson.build.orig	2022-08-22 21:00:38.000000000 +0000
+++ meson.build
@@ -19,7 +19,7 @@ zathura = dependency('zathura', version:
 girara = dependency('girara-gtk3')
 glib = dependency('glib-2.0')
 cairo = dependency('cairo')
-mupdf = dependency('mupdf', required: false)
+mupdf = dependency('mupdf')
 mupdfthird = cc.find_library('mupdf-third')
 
 build_dependencies = [
@@ -29,32 +29,9 @@ build_dependencies = [
   cairo,
 ]
 
-if not mupdf.found()
-  # normal build of mupdf
-  mupdf = cc.find_library('mupdf')
-  build_dependencies += [mupdf, mupdfthird]
-else
-  # build from Debian's libmupdf-dev
-  build_dependencies += [mupdf, mupdfthird]
-
-  libjpeg = dependency('libjpeg')
-  libjbig2dec = cc.find_library('jbig2dec')
-  libopenjp2 = dependency('libopenjp2')
-  gumbo = dependency('gumbo')
-  tesseract = dependency('tesseract')
-  leptonica = dependency('lept')
-  mujs = dependency('mujs')
-
-  build_dependencies += [
-    libjpeg,
-    libjbig2dec,
-    libopenjp2,
-    gumbo,
-    tesseract,
-    leptonica,
-    mujs
-  ]
-endif
+# normal build of mupdf
+mupdf = cc.find_library('mupdf')
+build_dependencies += [mupdf, mupdfthird]
 
 if get_option('plugindir') == ''
   plugindir = zathura.get_pkgconfig_variable('plugindir')