CVS commit: pkgsrc/print/mupdf

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu Dec 18 17:45:58 UTC 2025

Modified Files:
        pkgsrc/print/mupdf: distinfo
        pkgsrc/print/mupdf/patches: patch-Makelists

Log Message:
mupdf: Fix compiling with pre-c++20 compilers.


To generate a diff of this commit:
cvs rdiff -u -r1.80 -r1.81 pkgsrc/print/mupdf/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/print/mupdf/patches/patch-Makelists

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

Modified files:

Index: pkgsrc/print/mupdf/distinfo
diff -u pkgsrc/print/mupdf/distinfo:1.80 pkgsrc/print/mupdf/distinfo:1.81
--- pkgsrc/print/mupdf/distinfo:1.80    Sun Sep 14 10:57:54 2025
+++ pkgsrc/print/mupdf/distinfo Thu Dec 18 17:45:58 2025
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.80 2025/09/14 10:57:54 leot Exp $
+$NetBSD: distinfo,v 1.81 2025/12/18 17:45:58 nia Exp $
 
 BLAKE2s (mupdf-1.26.8-source.tar.gz) = 29c0571122d93a77b615f969de6f18fb0dc6edc26b0999ec18ad29dac048484b
 SHA512 (mupdf-1.26.8-source.tar.gz) = 6a1eb21da1ba507bcab179e9616a6ceaa1385c92e860770696324c959209259e8a10812f2c87e59c8e3dd3470398eba6ab512a3651a1bc3cd7d35465bfdb8017
 Size (mupdf-1.26.8-source.tar.gz) = 64528449 bytes
 SHA1 (patch-Makefile) = 9f15d6b0c9a122993e71728adb8b77945c79152b
-SHA1 (patch-Makelists) = 714157e21b2b609ac4f0adacc73c3e3a2156640a
+SHA1 (patch-Makelists) = a59cbe0c2e39a22b95d6462c9ec9f825b12b0d61
 SHA1 (patch-Makerules) = 5caa3319b121201952b0562201cee7bf0f0ea55f
 SHA1 (patch-docs_man_mupdf.1) = c2a2c1ad283428168a714adb634aa50cdd6a4aba
 SHA1 (patch-platform_gl_gl-app.h) = 1e915249010acd3ff1343f0607e785d06577fe78

Index: pkgsrc/print/mupdf/patches/patch-Makelists
diff -u pkgsrc/print/mupdf/patches/patch-Makelists:1.3 pkgsrc/print/mupdf/patches/patch-Makelists:1.4
--- pkgsrc/print/mupdf/patches/patch-Makelists:1.3      Thu Aug  3 03:57:28 2023
+++ pkgsrc/print/mupdf/patches/patch-Makelists  Thu Dec 18 17:45:58 2025
@@ -1,10 +1,11 @@
-$NetBSD: patch-Makelists,v 1.3 2023/08/03 03:57:28 ryoon Exp $
+$NetBSD: patch-Makelists,v 1.4 2025/12/18 17:45:58 nia Exp $
 
 * Disable JPEX XR support.
+* Fix compiling with a pre-c++20 compiler.
 
---- Makelists.orig     2021-10-05 10:44:43.000000000 +0000
+--- Makelists.orig     2025-09-10 12:15:25.000000000 +0000
 +++ Makelists
-@@ -130,7 +130,7 @@ HARFBUZZ_SRC += thirdparty/harfbuzz/src/
+@@ -140,7 +140,7 @@ JPEGXR_CFLAGS += -Ithirdparty/jpegxr/Software
  
  JPEGXR_CFLAGS += -Ithirdparty/jpegxr
  JPEGXR_CFLAGS += -Ithirdparty/jpegxr/Software
@@ -13,3 +14,13 @@ $NetBSD: patch-Makelists,v 1.3 2023/08/0
  
  JPEGXR_BUILD_CFLAGS += -Wno-tautological-compare
  
+@@ -804,7 +804,9 @@ TESSERACT_BUILD_CFLAGS += $(TESSERACT_DEFINES)
+ 
+ # --- ZXINGCPP (optional) ---
+ 
++ifeq ($(barcode),yes)
+ ZXINGCPP_LANGFLAGS = -std=c++20
++endif
+ 
+ ZXINGCPP_CFLAGS += -Ithirdparty/zxing-cpp/core/src
+ ZXINGCPP_CFLAGS += -DZXING_EXPERIMENTAL_API