pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/graphics/zint
Module Name: pkgsrc
Committed By: wiz
Date: Mon Feb 16 13:10:34 UTC 2026
Modified Files:
pkgsrc/graphics/zint: Makefile PLIST distinfo options.mk
Log Message:
zint: update to 2.16.0.
Switch to qt6 by default.
Version 2.16.0 (2025-12-19)
===========================
**Incompatible changes**
------------------------
- In `UNICODE_MODE`, ECI 899 Binary input now interpreted as UTF-8 (previously
treated as-is, i.e. as binary bytes - this now requires `DATA_MODE`)
- Buffer length of member `errtxt` in `zint_symbol` extended 100 -> 160
(client buffers may need checking/extending)
- New `content_segs` & `content_seg_count` fields in `zint_symbol` for use with
new output option `BARCODE_CONTENT_SEGS`
- Symbol structure members `option_1`, `option_2` and `option_3` now updated
after `ZBarcode_Encode()` and variants are called, and there are three new
methods in the Qt Backend to access to them
- New Qt Backend method `isBindable()` for new flag `ZINT_CAP_BINDABLE`
- New Qt Backend methods `gs1SyntaxEngine()`, `setGS1SyntaxEngine()` and
`haveGS1SyntaxEngine()` to access newly added GS1 Syntax Engine support
- GS1 Composites now return warning if CC type upped from requested due to size
of composite data
- EAN-8 with add-on now returns warning that it's non-standard
- UPC-E now returns warning if first digit of 7 digits ignored (not '0' or '1')
- For GS1 Composite, no primary (linear component) now returns
`ZINT_ERROR_INVALID_DATA` (previously returned `ZINT_ERROR_INVALID_OPTION`)
- The distributed Windows binary "zint.exe" is now built with Microsoft Visual
Studio 2015 and requires the Visual C runtime DLL "VCRUNTIME140.dll"
(previously it was built with Visual Studio 6.0)
Changes
-------
- Add new `BARCODE_CONTENT_SEGS` option for `output_options` which sets new
fields `content_segs` and `content_seg_count` with encoded data
(pre-converted, i.e. UTF-8 unless input mode is `DATA_MODE`)
- Add API funcs `ZBarcode_UTF8_To_ECI()` and `ZBarcode_Dest_Len_ECI()`
- Set `option_1`, `option_2`, `option_3` to values used in encodation, and add
new access methods `encodedOption1()` etc. to Qt Backend, and use in GUI to
provide better feedback
- AZTEC: give more precise warnings in low ECC situations, and indicate via
`option_1` by setting to -1 (min 3 words), 0 (<5% + 3 words)
- Better warning messages on non-compliant heights
- composite: warn if CC type upped from requested
- gs1: csumalpha: improve warning, report both chars (ticket #332, props Harald
Oehlmann)
- New `ZBarcode_Cap()` flag `ZINT_CAP_BINDABLE`, differentiated from
`ZINT_CAP_STACKABLE`, and new Qt Backend method `isBindable()`
- DOTCODE: now pads rows if given number of columns instead of failing if rows
below min (5)
- EAN-8 + add-on: warn as non-compliant
- UPC-E: warn if first digit of 7 (or 8 if check digit given) not '0' or '1'
- Extend `errtxt` buffer 100 -> 160
- Add new symbologies `BARCODE_EAN8`, `BARCODE_EAN_2ADDON`,
`BARCODE_EAN_5ADDON`, `BARCODE_EAN13`, `BARCODE_EAN8_CC` and
`BARCODE_EAN13_CC` as replacements for `BARCODE_EANX`, `BARCODE_EANX_CHK` and
`BARCODE_EANX_CC` and use in CLI/GUI (`BARCODE_EANX` etc. marked as legacy)
- For EAN/UPC accept space as alternative add-on separator to '+', and accept
GTIN-13 format with & without 2-digit or 5-digit add-on (no separator)
- GS1PARENS_MODE: allow parentheses in AI data if backslashed (necessary for
opening parentheses, optional for closing ones)
- Prefix all `INTERNAL` funcs/tables with `zint_`, except for those in
"backend/common.h", which are prefixed by `z_` - makes symbol clashes more
unlikely when zint is statically linked (ticket #337, props Ulrich Becker)
- Add support for GS1 Syntax Engine with new `input_mode` flag
`GS1SYNTAXENGINE_MODE` (CLI --gs1strict, GUI "GS1 Strict" checkbox)
- GS1_MODE: allow GS1 Digital Link URIs (no validation unless
`GS1SYNTAXENGINE_MODE` set)
- CLI: --gs1parens, --gs1nocheck and --gs1strict now imply --gs1
- GS1: new AIs 717 (GSCN 25-199) and 8040-3 (GSCN 25-047)
Bugs
----
- CODABLOCKF: fix misencodation of extended ASCII 0xB0-0xB9 when followed by
digit (ignore 2nd byte of FNC4 when categorizing Code C characters)
- AZTEC: fix GS1 mode with Structured Append (wasn't outputting initial FNC1)
- ECI: ECI 899 in UNICODE_MODE wasn't being converted from UTF-8, which was
inconsistent
- set_height: fix non-compliance false positives by using epsilon in checks
- UPU_S10: fix Service Indicator warning re "H" (ticket #331, props Milton Neal)
- CLI: fix `separator` check to use new `ZINT_CAP_BINDABLE` instead of
`ZINT_CAP_STACKABLE`
- ZBarcode_Cap: add missing symbologies to `ZINT_CAP_BINDABLE` (was
`ZINT_CAP_STACKABLE`)
- MAILMARK_2D: fix postcode validation: no limited alphanumerics, spaced-out
DPS "outward"-only allowed, all-blank DPS allowed (ticket #334, props Milton
Neal)
- DOTCODE: fix padding allowance to cover cases with large no. of columns
requested and little data, to prevent buffer overflow
- manual/man page: fix DATAMATRIX Sizes tables "28 12x26" -> "27 12x26"
Version 2.15.0 (2025-02-25)
===========================
***2.14.0 regression fix***
---------------------------
- CODE128: start code no longer omitted for data starting with numerics followed
by extended ASCII (Latin-1)
**Incompatible changes**
------------------------
- New `text_length` field in `zint_symbol`
Changes
-------
- iso4217: remove 191 (HRK), 694 (SLL), 931 (CUC); add 926 (VED)
- Add `text_length` (length of `text`) to `zint_symbol`
- PLESSEY: add show default check characters option
Bugs
----
- CODE128: fix 2.14.0 regression (see above), never start in mode C1
- CODE32: ignore `option_2` (check digit options)
- PZN: ignore `option_2` (check digit options) except for indicates PZN7 only
- DPD: exclude DEL from ident tag also
- out_maybe_mkdir: fix `utf8_to_wide()` return (Windows only)
- man page: fix Code 93 `--vers=1` hide -> show default check digits
Version 2.14.0 (2025-02-05)
===========================
**Incompatible changes**
------------------------
- New `memfile` & `memfile_size` fields in `zint_symbol` for use with new output
option `BARCODE_MEMORY_FILE`
- Buffer length of member `text` (HRT) in `zint_symbol` extended 200 -> 256
(client buffers may need checking/extending)
- Invalid `input_mode` now returns warning
- Aztec Code symbols that due to input length & user-requested version have less
than recommended 5% error correction codewords now return warning
- New CODE128-only special extra escapes beginning `\^`
- Add-ons for UPC-A and UPC-E now descend to be level with the main symbol guard
bars, and the righthand outside digit is now placed 1X less from main symbol
to avoid touching any add-on
- GS1-128 symbols now warn if READER_INIT option used
Changes
-------
- BMP: lessen heap memory usage by only `malloc()`ing a row
- GIF: lessen heap memory usage by paging; use standard colour char map
- Add `BARCODE_MEMORY_FILE` to `symbol->output_options` to allow outputting to
in-memory buffer `symbol->memfile` instead of to file `symbol->outfile`,
ticket #301
- CODE16K (was for CODE128): improve encodation on A/B shifting, props Daniel
Gredler (Okapi)
- CODE128: add new extra escape `\^1` for manual insertion of FNC1s, ticket
#324, props Jim Shank;
new extra escapes `\^A`, `\^B`, `\^C` and `\^@` for manual switching of
Code Sets;
add minimal encodation algorithm, props Alex Geller (ZXing) and Bue Jensen
(BWIPP);
- library: return warning on invalid `input_mode` reset
- library/CLI: expanded error messages
- GS1: new AIs 7250-7259 (GSCN 22-246);
iso4217: new ISO 4217 currency code 924;
new AIs 7041 (GSCN 23-272) (packagetype) and 716 (GSCN-24-157)
- AZTEC: workaround MSVC 2022 optimizer bug in `az_populate_map()` loops,
ticket #317, props Andre Maute;
return warning if ECC < 5% (due to bit-stuffing when version given)
- MAXICODE: zero-pad US postcodes that lack "+4" (Annex B.1.4a), from
OkapiBarcode, props Daniel Gredler;
add minimal encodation algorithm, props Bue Jensen (BWIPP)
- GUI: use X11 (xcb) as platform instead of Wayland on Linux to avoid various
weird behaviours;
in "grpDATF.ui" use "PlainText" rather than "RichText" for tracker ratio
examples as height of text messing up sometimes
- UPCA/UPCE: descend add-ons to same level as guards and adjust righthand
outside digit to be 4X/2X instead of 5X/3X away from main symbol so as not to
touch add-on TODO: revisit when standard clarified
- manual: make explicit that AI "(00)" and "(01)" prefixes added by Zint are
HRT-only; clarify Codablock-F length maximum & add examples
- add DXFILMEDGE (MR #159, props Antoine Mérino)
Bugs
----
- raster/BMP/GIF/PCX/TIF: fix dealing with very large data (use `size_t`)
- raster: add `raster_malloc()` to fail > 1GB (avoids very large output files;
also lessens to some degree chances of being victim of OOM killer on Linux)
- GUI: printing scale dialog: set maxima on X-dim and resolution to keep scale
<= 200
- BMP/EMF/PCX/TIF: fix endianness on big-endian machines (note TIF now always
written as little-endian - simplifies testing)
- ITF14/DPLEIT/DPIDENT: ignore `option_2` (check digit options)
- GUI: scalewindow: fix cropping of initial resolution and bound X-dim <= 10
- GUI: factory reset: reset preview background colour also
- GUI: cliwindow: `#if _WIN32` -> `#ifdef _WIN32`
- QZint: fix legacy width and security level getters/setters, MR #158, props
Philip Ye
- CODE128: fix extended char latching when exactly 3 extended chars at end
- library: need to check for valid UTF-8 after de-escaping
- MAXICODE: maintain current set between segments
- MSYS2: fix stdout output on Windows under MSYS2 (mailing list, props Frank)
- DATAMATRIX: fix mis-encodation by only doing special end-of-data processing
on last segment
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 pkgsrc/graphics/zint/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/graphics/zint/PLIST \
pkgsrc/graphics/zint/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/graphics/zint/options.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/graphics/zint/Makefile
diff -u pkgsrc/graphics/zint/Makefile:1.12 pkgsrc/graphics/zint/Makefile:1.13
--- pkgsrc/graphics/zint/Makefile:1.12 Wed Jan 7 08:47:29 2026
+++ pkgsrc/graphics/zint/Makefile Mon Feb 16 13:10:34 2026
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2026/01/07 08:47:29 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2026/02/16 13:10:34 wiz Exp $
-DISTNAME= zint-2.13.0-src
+DISTNAME= zint-2.16.0-src
PKGNAME= ${DISTNAME:S/-src//}
-PKGREVISION= 10
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=zint/}
Index: pkgsrc/graphics/zint/PLIST
diff -u pkgsrc/graphics/zint/PLIST:1.1 pkgsrc/graphics/zint/PLIST:1.2
--- pkgsrc/graphics/zint/PLIST:1.1 Thu Mar 14 12:24:54 2024
+++ pkgsrc/graphics/zint/PLIST Mon Feb 16 13:10:34 2026
@@ -1,14 +1,13 @@
-@comment $NetBSD: PLIST,v 1.1 2024/03/14 12:24:54 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2026/02/16 13:10:34 wiz Exp $
bin/zint
-${PLIST.qt5}bin/zint-qt
-${PLIST.qt5}include/qzint.h
+${PLIST.qt}bin/zint-qt
+${PLIST.qt}include/qzint.h
include/zint.h
-${PLIST.qt5}lib/libQZint.a
+lib/cmake/zint/zint-config.cmake
+lib/cmake/zint/zint-targets-relwithdebinfo.cmake
+lib/cmake/zint/zint-targets.cmake
+${PLIST.qt}lib/libQZint.a
lib/libzint.so
-lib/libzint.so.2.13
+lib/libzint.so.2.16
lib/libzint.so.${PKGVERSION}.0
man/man1/zint.1
-share/apps/cmake/modules/FindZint.cmake
-share/zint/zint-config.cmake
-share/zint/zint-targets-relwithdebinfo.cmake
-share/zint/zint-targets.cmake
Index: pkgsrc/graphics/zint/distinfo
diff -u pkgsrc/graphics/zint/distinfo:1.1 pkgsrc/graphics/zint/distinfo:1.2
--- pkgsrc/graphics/zint/distinfo:1.1 Thu Mar 14 12:24:54 2024
+++ pkgsrc/graphics/zint/distinfo Mon Feb 16 13:10:34 2026
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1 2024/03/14 12:24:54 wiz Exp $
+$NetBSD: distinfo,v 1.2 2026/02/16 13:10:34 wiz Exp $
-BLAKE2s (zint-2.13.0-src.tar.gz) = da36bfc5423c9fc6a97a4d8b8b3ab3d34006b5b91ad542267a295f6cf70f2354
-SHA512 (zint-2.13.0-src.tar.gz) = 8dacd8088ab9c99ea64bf1aa49b618251d1e2d49382817d536a824ef25d9e8f0e2d8dbd0baa5dc1b4945dbede83d1af08e9f317107b1356a3ceb382acb6dd8c2
-Size (zint-2.13.0-src.tar.gz) = 6186118 bytes
+BLAKE2s (zint-2.16.0-src.tar.gz) = 703fdc7d13017a2bedfbb4994085db0a6b65aa8a334df25a3578889cb2fa2c6f
+SHA512 (zint-2.16.0-src.tar.gz) = f9148492e97550f1fb0d23fd611ead315a3b5c7f135feba88a00ea198216e9b0fef53f325e123d2705ca355ce2165863e1ea76aab560361e970b0da72c63136b
+Size (zint-2.16.0-src.tar.gz) = 6423511 bytes
SHA1 (patch-frontend_main.c) = 406fe2c97e45f3f34f5f6b2aee8d27f0764592be
Index: pkgsrc/graphics/zint/options.mk
diff -u pkgsrc/graphics/zint/options.mk:1.2 pkgsrc/graphics/zint/options.mk:1.3
--- pkgsrc/graphics/zint/options.mk:1.2 Sun Aug 25 06:18:54 2024
+++ pkgsrc/graphics/zint/options.mk Mon Feb 16 13:10:34 2026
@@ -1,18 +1,28 @@
-# $NetBSD: options.mk,v 1.2 2024/08/25 06:18:54 wiz Exp $
+# $NetBSD: options.mk,v 1.3 2026/02/16 13:10:34 wiz Exp $
-PKG_OPTIONS_VAR= PKG_OPTIONS.zint
-PKG_SUPPORTED_OPTIONS+= qt5
-PKG_SUGGESTED_OPTIONS+= qt5
+PKG_OPTIONS_VAR= PKG_OPTIONS.zint
+PKG_OPTIONS_OPTIONAL_GROUPS= qt
+PKG_OPTIONS_GROUP.qt= qt5 qt6
+PKG_SUGGESTED_OPTIONS+= qt6
-# TODO: add qt6 support
-#CMAKE_CONFIGURE_ARGS+= -DZINT_QT6=ON
-
-PLIST_VARS+= qt5
+PLIST_VARS+= qt
.include "../../mk/bsd.options.mk"
+.if !empty(PKG_OPTIONS:Mqt5) || !empty(PKG_OPTIONS:Mqt6)
+PLIST.qt= yes
+PRINT_PLIST_AWK+= /bin\/zint-qt/ { $$0 = "$${PLIST.qt}"$$0 }
+PRINT_PLIST_AWK+= /include\/qzint.h/ { $$0 = "$${PLIST.qt}"$$0 }
+PRINT_PLIST_AWK+= /lib\/libQZint.a/ { $$0 = "$${PLIST.qt}"$$0 }
+.endif
+
.if !empty(PKG_OPTIONS:Mqt5)
-PLIST.qt5= yes
.include "../../x11/qt5-qtsvg/buildlink3.mk"
.include "../../x11/qt5-qttools/buildlink3.mk"
.endif
+
+.if !empty(PKG_OPTIONS:Mqt6)
+CMAKE_CONFIGURE_ARGS+= -DZINT_QT6=ON
+.include "../../graphics/qt6-qtsvg/buildlink3.mk"
+.include "../../devel/qt6-qttools/buildlink3.mk"
+.endif
Home |
Main Index |
Thread Index |
Old Index