CVS commit: pkgsrc/print/zathura-pdf-mupdf

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Tue Aug 30 14:16:09 UTC 2022

Modified Files:
        pkgsrc/print/zathura-pdf-mupdf: Makefile distinfo
Added Files:
        pkgsrc/print/zathura-pdf-mupdf/patches: patch-meson.build

Log Message:
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@.


To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 pkgsrc/print/zathura-pdf-mupdf/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/print/zathura-pdf-mupdf/distinfo
cvs rdiff -u -r0 -r1.3 \
    pkgsrc/print/zathura-pdf-mupdf/patches/patch-meson.build

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

Modified files:

Index: pkgsrc/print/zathura-pdf-mupdf/Makefile
diff -u pkgsrc/print/zathura-pdf-mupdf/Makefile:1.54 pkgsrc/print/zathura-pdf-mupdf/Makefile:1.55
--- pkgsrc/print/zathura-pdf-mupdf/Makefile:1.54        Tue Aug 30 12:47:51 2022
+++ pkgsrc/print/zathura-pdf-mupdf/Makefile     Tue Aug 30 14:16:09 2022
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.54 2022/08/30 12:47:51 nia Exp $
+# $NetBSD: Makefile,v 1.55 2022/08/30 14:16:09 nia Exp $
 #
 
 DISTNAME=      zathura-pdf-mupdf-0.3.9
+PKGREVISION=   1
 CATEGORIES=    print
 MASTER_SITES=  https://pwmt.org/projects/zathura-pdf-mupdf/download/
 EXTRACT_SUFX=  .tar.xz
@@ -19,8 +20,6 @@ PYTHON_FOR_BUILD_ONLY=        tool
 
 .include "../../devel/meson/build.mk"
 .include "../../graphics/cairo/buildlink3.mk"
-.include "../../graphics/tesseract/buildlink3.mk"
-.include "../../lang/mujs/buildlink3.mk"
 BUILDLINK_API_DEPENDS.mupdf+=  mupdf>=1.16.0
 .include "../../print/mupdf/buildlink3.mk"
 .include "../../print/zathura/buildlink3.mk"

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

Added files:

Index: pkgsrc/print/zathura-pdf-mupdf/patches/patch-meson.build
diff -u /dev/null pkgsrc/print/zathura-pdf-mupdf/patches/patch-meson.build:1.3
--- /dev/null   Tue Aug 30 14:16:09 2022
+++ pkgsrc/print/zathura-pdf-mupdf/patches/patch-meson.build    Tue Aug 30 14:16:09 2022
@@ -0,0 +1,51 @@
+$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')