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

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Wed Aug 14 06:05:16 UTC 2024

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

Log Message:
zathura-pdf-mupdf: updated to 0.4.4

VERSION 0.4.4

Various fixes and improvements

VERSION 0.4.3

Fix crash due to multi-threading issues
Various fixes and improvements

VERSION 0.4.2

Compatible with mupdf 1.24
Various fixes and improvements


To generate a diff of this commit:
cvs rdiff -u -r1.73 -r1.74 pkgsrc/print/zathura-pdf-mupdf/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/print/zathura-pdf-mupdf/distinfo
cvs rdiff -u -r1.4 -r1.5 \
    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.73 pkgsrc/print/zathura-pdf-mupdf/Makefile:1.74
--- pkgsrc/print/zathura-pdf-mupdf/Makefile:1.73        Wed May 29 16:34:12 2024
+++ pkgsrc/print/zathura-pdf-mupdf/Makefile     Wed Aug 14 06:05:16 2024
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.73 2024/05/29 16:34:12 adam Exp $
+# $NetBSD: Makefile,v 1.74 2024/08/14 06:05:16 adam Exp $
 
-DISTNAME=      zathura-pdf-mupdf-0.4.1
-PKGREVISION=   2
+DISTNAME=      zathura-pdf-mupdf-0.4.4
 CATEGORIES=    print
 MASTER_SITES=  https://pwmt.org/projects/zathura-pdf-mupdf/download/
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/print/zathura-pdf-mupdf/distinfo
diff -u pkgsrc/print/zathura-pdf-mupdf/distinfo:1.20 pkgsrc/print/zathura-pdf-mupdf/distinfo:1.21
--- pkgsrc/print/zathura-pdf-mupdf/distinfo:1.20        Sat May  4 21:46:48 2024
+++ pkgsrc/print/zathura-pdf-mupdf/distinfo     Wed Aug 14 06:05:16 2024
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.20 2024/05/04 21:46:48 nikita Exp $
+$NetBSD: distinfo,v 1.21 2024/08/14 06:05:16 adam Exp $
 
-BLAKE2s (zathura-pdf-mupdf-0.4.1.tar.xz) = e061e4c88566dc4b8d7bbc384e5d4760db2c662c85d6a6d6c3c751bf4ce5add2
-SHA512 (zathura-pdf-mupdf-0.4.1.tar.xz) = 26bb28fa15fbbd8dc39b72a01812f424ec02e02af1dcb79b1ae10865c209cc00b8d2f813aa0685e1bef76f6c8ce5f8a461cf51c3a37691face9f84416e0ab31a
-Size (zathura-pdf-mupdf-0.4.1.tar.xz) = 8796 bytes
+BLAKE2s (zathura-pdf-mupdf-0.4.4.tar.xz) = b4392f59089eb70d960b459f191845d475a6ba2b5dd91773e382c3f6d0eef3f3
+SHA512 (zathura-pdf-mupdf-0.4.4.tar.xz) = 32be4b4458547860e28bb90bf8b8f0f2e5c26f369d55f6f25e0e73b9e7c4a82b6110fd42bd55120f1be358b9d7a6c72cc1c883e192d007a05a85f501c504e1a1
+Size (zathura-pdf-mupdf-0.4.4.tar.xz) = 9512 bytes
 SHA1 (patch-document.c) = ad929680aa1de6f21b71cabc06da9ba54491687a
-SHA1 (patch-meson.build) = 4a633e37b539efb7fead1d7675d41954c58d85f9
+SHA1 (patch-meson.build) = 967ef1e92ae95a70474f59bda38035639cedd046

Index: pkgsrc/print/zathura-pdf-mupdf/patches/patch-meson.build
diff -u pkgsrc/print/zathura-pdf-mupdf/patches/patch-meson.build:1.4 pkgsrc/print/zathura-pdf-mupdf/patches/patch-meson.build:1.5
--- pkgsrc/print/zathura-pdf-mupdf/patches/patch-meson.build:1.4        Sat May  4 21:46:48 2024
+++ pkgsrc/print/zathura-pdf-mupdf/patches/patch-meson.build    Wed Aug 14 06:05:16 2024
@@ -1,51 +1,24 @@
-$NetBSD: patch-meson.build,v 1.4 2024/05/04 21:46:48 nikita Exp $
-                                                                                                           
+$NetBSD: patch-meson.build,v 1.5 2024/08/14 06:05:16 adam Exp $
+
 Link against mupdf normally, not assuming static linking.
 
---- meson.build.orig   2024-05-04 23:41:36.376199051 +0200
-+++ meson.build        2024-05-04 23:43:38.125240401 +0200
-@@ -19,7 +19,7 @@
+--- meson.build.orig   2024-08-04 08:34:58.000000000 +0000
++++ meson.build
+@@ -22,7 +22,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')
+-mupdf = dependency('mupdf', required: false, version: '>=@0@.@1@'.format(mupdf_required_version_major, mupdf_required_version_minor))
++mupdf = dependency('mupdf', version: '>=@0@.@1@'.format(mupdf_required_version_major, mupdf_required_version_minor))
  mupdfthird = cc.find_library('mupdf-third')
  
  build_dependencies = [
-@@ -29,32 +29,9 @@
+@@ -32,7 +32,7 @@ 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_variable(pkgconfig: 'plugindir')
++if mupdf.found()
+   # normal build of mupdf
+   mupdf = cc.find_library('mupdf', has_headers: ['mupdf/fitz/version.h', 'mupdf/fitz.h', 'mupdf/pdf.h'], required: true)
+   version_check = '''