Re: Updating devel/mujs and print/mupdf
Yorick Hardy <[email protected]>
| Newsgroups | gmane.os.netbsd.devel.packages |
|---|---|
| Message-ID | <[email protected]> |
Dear nia, Thank you, I did forget to mention this, the Makelists fragment now looks like this: # --- ZXINGCPP (optional) --- ifeq ($(USE_ZXINGCPP),yes) ZXINGCPP_LANGFLAGS = -std=c++20 endif which was added here: Makefile tweak: Only require c++20 if building with barcode support. https://github.com/ArtifexSoftware/mupdf/commit/f7a5ae260d41d649e81ac9ee45b5479a155c0c36 Can we adjust the comment, or did I miss something? Kind regards, On 2026-03-02, nia wrote: > Please try to keep this part of the patch. With the > hunk gone, the comment "Fix compiling with a pre-c++20 > compiler" is incorrect. > > On Mon, Mar 02, 2026 at 07:52:09PM +0200, Yorick Hardy wrote: > > Index: print/mupdf/patches/patch-Makelists > > =================================================================== > > RCS file: /cvsroot/pkgsrc/print/mupdf/patches/patch-Makelists,v > > retrieving revision 1.4 > > diff -u -r1.4 patch-Makelists > > --- print/mupdf/patches/patch-Makelists 18 Dec 2025 17:45:58 -0000 1.4 > > +++ print/mupdf/patches/patch-Makelists 2 Mar 2026 17:44:52 -0000 > > @@ -3,7 +3,7 @@ > > * Disable JPEX XR support. > > * Fix compiling with a pre-c++20 compiler. > > > > ---- Makelists.orig 2025-09-10 12:15:25.000000000 +0000 > > +--- Makelists.orig 2026-02-18 16:24:19.000000000 +0000 > > +++ Makelists > > @@ -140,7 +140,7 @@ JPEGXR_CFLAGS += -Ithirdparty/jpegxr/Software > > > > @@ -14,13 +14,3 @@ > > > > 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 -- Kind regards, Yorick Hardy