pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/graphics/zbar zbar: Update to 0.23.90
details: https://anonhg.NetBSD.org/pkgsrc/rev/c7b90834ed00
branches: trunk
changeset: 448065:c7b90834ed00
user: leot <leot%pkgsrc.org@localhost>
date: Thu Mar 04 10:34:24 2021 +0000
description:
zbar: Update to 0.23.90
Changes:
0.23.90
-------
* Started using github actions for CI and binary releases
* Fixed several issues with configure.ac, making it auto-detect
most things, when possible
* README.md now shows the absolute minimum requirement for
building ZBar on Ubuntu
* Fixed some build issues
* Make it compatible with Python 3.9
* Fixed some Python 3.9 and Qt5 warnings
* Typo fixes
* Several fixes at zbarcam
* zbarimg: fix stderr output when symbols are found
diffstat:
graphics/zbar/Makefile | 5 ++---
graphics/zbar/distinfo | 13 +++++++------
graphics/zbar/patches/patch-configure | 24 +++++++-----------------
graphics/zbar/patches/patch-zbar_window_x.c | 15 +++++++++++++++
4 files changed, 31 insertions(+), 26 deletions(-)
diffs (107 lines):
diff -r d4a4ab8dbebc -r c7b90834ed00 graphics/zbar/Makefile
--- a/graphics/zbar/Makefile Thu Mar 04 10:20:58 2021 +0000
+++ b/graphics/zbar/Makefile Thu Mar 04 10:34:24 2021 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2020/12/04 04:56:00 riastradh Exp $
+# $NetBSD: Makefile,v 1.12 2021/03/04 10:34:24 leot Exp $
-DISTNAME= zbar-0.23.1
-PKGREVISION= 3
+DISTNAME= zbar-0.23.90
CATEGORIES= graphics
MASTER_SITES= https://linuxtv.org/downloads/zbar/
EXTRACT_SUFX= .tar.bz2
diff -r d4a4ab8dbebc -r c7b90834ed00 graphics/zbar/distinfo
--- a/graphics/zbar/distinfo Thu Mar 04 10:20:58 2021 +0000
+++ b/graphics/zbar/distinfo Thu Mar 04 10:34:24 2021 +0000
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.3 2020/06/20 10:42:42 leot Exp $
+$NetBSD: distinfo,v 1.4 2021/03/04 10:34:24 leot Exp $
-SHA1 (zbar-0.23.1.tar.bz2) = 6a047e29895dd9248cc3dbac6fe0ac454d86f45b
-RMD160 (zbar-0.23.1.tar.bz2) = d4a8f17d7bc5874677c5bc301028b2fd236f221c
-SHA512 (zbar-0.23.1.tar.bz2) = e27765d380daa907b50817f4efa9b16a906f01ddb4ad7d7fd4a5193582a3fabc5a34d01c5dd8bdeb16cad9ccb62e6d72279294fbdcf8163815394be9722bfba4
-Size (zbar-0.23.1.tar.bz2) = 1195599 bytes
-SHA1 (patch-configure) = 98a156737fd6058ba39f9f7e43cac8c63034beb2
+SHA1 (zbar-0.23.90.tar.bz2) = 236fef9ff59eb85d962807a3cde860a377871b0a
+RMD160 (zbar-0.23.90.tar.bz2) = 2c2f9e228d40cd330058bdbcecff78020238798f
+SHA512 (zbar-0.23.90.tar.bz2) = c4ccac8526acab4e28c6145c5cdb95b6a6c5c81b6d2f883053435794f7c351edee20abdc9599cb0de96db546f584c9479896baa87b01ad409d5e75ea8b48118c
+Size (zbar-0.23.90.tar.bz2) = 1199323 bytes
+SHA1 (patch-configure) = 44674b493227f9689f18a6e1076cc1aa5b959d52
SHA1 (patch-gtk_Makefile.in) = bf32ac312d0d00ed7ac152ddd849dae0fc681e74
SHA1 (patch-test_test__examples.sh.in) = d5739c5e4670d602b36ac62e7544f25709fc0d61
+SHA1 (patch-zbar_window_x.c) = cd221fc7a1c6ea8fc6f65a23241dff7fddd6e708
diff -r d4a4ab8dbebc -r c7b90834ed00 graphics/zbar/patches/patch-configure
--- a/graphics/zbar/patches/patch-configure Thu Mar 04 10:20:58 2021 +0000
+++ b/graphics/zbar/patches/patch-configure Thu Mar 04 10:34:24 2021 +0000
@@ -1,14 +1,13 @@
-$NetBSD: patch-configure,v 1.2 2020/06/20 10:42:42 leot Exp $
+$NetBSD: patch-configure,v 1.3 2021/03/04 10:34:24 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
-- Use standard `=' test(1) operator
---- configure.orig 2020-04-20 21:13:55.000000000 +0000
+--- configure.orig 2021-02-14 06:54:03.000000000 +0000
+++ configure
-@@ -23896,6 +23896,7 @@ fi
+@@ -24020,6 +24020,7 @@ fi
@@ -16,7 +15,7 @@
if test -z "$PYTHON"; then :
if test "x$with_python" = "xauto"; then :
for ac_prog in python3 python2 python
-@@ -24052,6 +24053,7 @@ else
+@@ -24176,6 +24177,7 @@ else
with_python="auto"
fi
@@ -24,21 +23,12 @@
if test "x$with_python" != "xno"; then :
-@@ -25064,7 +25066,7 @@ else
+@@ -25265,7 +25267,7 @@ else
fi
-JAVAC=${JAVAC/ecj/ecj -1.5}
+JAVAC=`echo "$JAVAC" | sed -e 's/ecj/ecj -1.5/'`
- # Javah was obsoleted on Java 8 and removed on Java 11. So, we need to
- # look strictly at the $JAVA_HOME in order to avoid mixing different versions
-@@ -29146,7 +29148,7 @@ fi
- echo ""
- echo "please verify that the detected configuration matches your expectations:"
- echo "------------------------------------------------------------------------"
--if test "x$USE_NLS" == "xyes"; then :
-+if test "x$USE_NLS" = "xyes"; then :
- echo "gettext $USE_NLS"
-
- fi
+ if test -z "$JAVAH"; then :
+ for ac_prog in javah
diff -r d4a4ab8dbebc -r c7b90834ed00 graphics/zbar/patches/patch-zbar_window_x.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/zbar/patches/patch-zbar_window_x.c Thu Mar 04 10:34:24 2021 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-zbar_window_x.c,v 1.1 2021/03/04 10:34:24 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
+@@ -288,7 +288,7 @@ int _zbar_window_draw_text (zbar_window_
+ 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++;
+
+ int width = XTextWidth(xs->font, text, n);
Home |
Main Index |
Thread Index |
Old Index