CVS commit: pkgsrc/graphics/zbar

["Leonardo Taccari" <leot%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   leot
Date:           Mon Nov 25 11:59:23 UTC 2024

Modified Files:
        pkgsrc/graphics/zbar: Makefile distinfo
        pkgsrc/graphics/zbar/patches: patch-configure patch-zbar_window_x.c

Log Message:
zbar: Update to 0.23.93

Changes:
0.23.93:
  * Set a better dpi resolution when parsing PDF files
  * Fix memory recycle bug of empty symbols
  * Fix compilation with python 3.11 and 3.12
  * CVE-2023-40889: Fix array out-of-bounds access
  * Stop ignoring non-binary entries that follow binary ones
  * Increase allocated buffer memory for symbols
  * barcodetest.py: fix error code print logic
  * convert: Crash fixing while using camera
  * Add some pod information for additional functions
  * perl skip more tests if DISPLAY not set and set prereqs in Makefile.PL
  * Fixes rt.cpan.org 122061 - test fails when DISPLAY not set
  * Update Barcode::ZBar
  * isaac: ensure proper order of parsing expression
  * Enforce x11 backend even on wayland
  * zbarimg: add the --polygon option
  * xml output: Add polygon containing code bar.
  * configure.ac: drop support for Qt4 and prepare for Qt6 support
  * win: fix compiling error in Visual studio
  * Enforce a coding style
  * configure.ac: fix some issues with gtk parameter
  * zbargtk: fix version check macros
  * zbar: Address some header issues
  * zbar, test: fix compilation issues with FreeBSD
  * zbar: Function stdcall declaration issue.
  * symbol: make it compatible with MSC
  * zbar: change the code to make it c90 standard compatible
  * test: fix decode test

0.23.92:
  * Added a --enable-static option to make easier to distribute
    Windows binaries


To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 pkgsrc/graphics/zbar/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/graphics/zbar/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/graphics/zbar/patches/patch-configure
cvs rdiff -u -r1.1 -r1.2 pkgsrc/graphics/zbar/patches/patch-zbar_window_x.c

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

Modified files:

Index: pkgsrc/graphics/zbar/Makefile
diff -u pkgsrc/graphics/zbar/Makefile:1.47 pkgsrc/graphics/zbar/Makefile:1.48
--- pkgsrc/graphics/zbar/Makefile:1.47  Sun Nov 24 06:59:08 2024
+++ pkgsrc/graphics/zbar/Makefile       Mon Nov 25 11:59:23 2024
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.47 2024/11/24 06:59:08 adam Exp $
+# $NetBSD: Makefile,v 1.48 2024/11/25 11:59:23 leot Exp $
 
-DISTNAME=      zbar-0.23.90
-PKGREVISION=   34
+DISTNAME=      zbar-0.23.93
 CATEGORIES=    graphics
 MASTER_SITES=  https://linuxtv.org/downloads/zbar/
 EXTRACT_SUFX=  .tar.bz2

Index: pkgsrc/graphics/zbar/distinfo
diff -u pkgsrc/graphics/zbar/distinfo:1.6 pkgsrc/graphics/zbar/distinfo:1.7
--- pkgsrc/graphics/zbar/distinfo:1.6   Tue Oct 26 10:47:26 2021
+++ pkgsrc/graphics/zbar/distinfo       Mon Nov 25 11:59:23 2024
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.6 2021/10/26 10:47:26 nia Exp $
+$NetBSD: distinfo,v 1.7 2024/11/25 11:59:23 leot Exp $
 
-BLAKE2s (zbar-0.23.90.tar.bz2) = c4b545beea2c299fdec9a8ed7137f0c70a0bf43beecd56c97206aa04e93c07ea
-SHA512 (zbar-0.23.90.tar.bz2) = c4ccac8526acab4e28c6145c5cdb95b6a6c5c81b6d2f883053435794f7c351edee20abdc9599cb0de96db546f584c9479896baa87b01ad409d5e75ea8b48118c
-Size (zbar-0.23.90.tar.bz2) = 1199323 bytes
-SHA1 (patch-configure) = 44674b493227f9689f18a6e1076cc1aa5b959d52
+BLAKE2s (zbar-0.23.93.tar.bz2) = 555b0b0a759a6b2377638005242a1066a8920473934a9d5c3bc41496712a9285
+SHA512 (zbar-0.23.93.tar.bz2) = 8b1d57557cb1c425109b709f0cbe94830939cb4cd9a0cb505d44ba3c7cfb3522560c3bbf2a8b37985da4577b677ad675491f6ef0e9796749382079c0e844e21e
+Size (zbar-0.23.93.tar.bz2) = 1190598 bytes
+SHA1 (patch-configure) = 614604b7a49285c7642220e59dc9cbb775e1d160
 SHA1 (patch-gtk_Makefile.in) = bf32ac312d0d00ed7ac152ddd849dae0fc681e74
 SHA1 (patch-test_test__examples.sh.in) = d5739c5e4670d602b36ac62e7544f25709fc0d61
-SHA1 (patch-zbar_window_x.c) = cd221fc7a1c6ea8fc6f65a23241dff7fddd6e708
+SHA1 (patch-zbar_window_x.c) = 1eef005eaf00172adff7a4701806c76440ee149f

Index: pkgsrc/graphics/zbar/patches/patch-configure
diff -u pkgsrc/graphics/zbar/patches/patch-configure:1.3 pkgsrc/graphics/zbar/patches/patch-configure:1.4
--- pkgsrc/graphics/zbar/patches/patch-configure:1.3    Thu Mar  4 10:34:24 2021
+++ pkgsrc/graphics/zbar/patches/patch-configure        Mon Nov 25 11:59:23 2024
@@ -1,34 +1,25 @@
-$NetBSD: patch-configure,v 1.3 2021/03/04 10:34:24 leot Exp $
+$NetBSD: patch-configure,v 1.4 2024/11/25 11:59:23 leot Exp $
 
 - Avoid `${parameter/pattern/string}' bash-ism
 - Only honor `--with-python' configure argument and completely ignore
   possible PYTHON environment variable that could be passed via
   CONFIGURE_ENV by pkgsrc
 
---- configure.orig     2021-02-14 06:54:03.000000000 +0000
+--- configure.orig     2024-01-09 09:15:23.000000000 +0000
 +++ configure
-@@ -24020,6 +24020,7 @@ fi
+@@ -25430,6 +25430,7 @@ fi
  
  
  
 +if false; then
- if test -z "$PYTHON"; then :
-   if test "x$with_python" = "xauto"; then :
-   for ac_prog in python3 python2 python
-@@ -24176,6 +24177,7 @@ else
+ if test -z "$PYTHON"
+ then :
+   if test "x$with_python" = "xauto"
+@@ -25605,6 +25606,7 @@ else $as_nop
    with_python="auto"
  
  fi
 +fi
  
- if test "x$with_python" != "xno"; then :
- 
-@@ -25265,7 +25267,7 @@ else
- fi
- 
- 
--JAVAC=${JAVAC/ecj/ecj -1.5}
-+JAVAC=`echo "$JAVAC" | sed -e 's/ecj/ecj -1.5/'`
- 
- if test -z "$JAVAH"; then :
-   for ac_prog in javah
+ if test "x$with_python" != "xno"
+ then :

Index: pkgsrc/graphics/zbar/patches/patch-zbar_window_x.c
diff -u pkgsrc/graphics/zbar/patches/patch-zbar_window_x.c:1.1 pkgsrc/graphics/zbar/patches/patch-zbar_window_x.c:1.2
--- pkgsrc/graphics/zbar/patches/patch-zbar_window_x.c:1.1      Thu Mar  4 10:34:24 2021
+++ pkgsrc/graphics/zbar/patches/patch-zbar_window_x.c  Mon Nov 25 11:59:23 2024
@@ -1,15 +1,15 @@
-$NetBSD: patch-zbar_window_x.c,v 1.1 2021/03/04 10:34:24 leot Exp $
+$NetBSD: patch-zbar_window_x.c,v 1.2 2024/11/25 11:59:23 leot Exp $
 
 Avoid possible ctype(3) undefined behaviours.
 
---- zbar/window/x.c.orig       2021-02-13 09:39:55.000000000 +0000
+--- zbar/window/x.c.orig       2021-03-14 16:28:01.000000000 +0000
 +++ zbar/window/x.c
-@@ -288,7 +288,7 @@ int _zbar_window_draw_text (zbar_window_
+@@ -274,7 +274,7 @@ int _zbar_window_draw_text(zbar_window_t
      XSetForeground(w->display, xs->gc, xs->colors[rgb]);
  
      int n = 0;
--    while(n < 32 && text[n] && isprint(text[n]))
-+    while(n < 32 && text[n] && isprint((unsigned char)text[n]))
-         n++;
+-    while (n < 32 && text[n] && isprint(text[n]))
++    while (n < 32 && text[n] && isprint((unsigned char)text[n]))
+       n++;
  
      int width = XTextWidth(xs->font, text, n);