package/zbar: bump to version 0.23.93

Drop patch which is now upstream.

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
[Peter: drop patch from .checkpackageignore]
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
James Hilliard 2024-01-09 12:07:20 -07:00 committed by Peter Korsgaard
parent 0d615aa138
commit f79658fbb5
4 changed files with 2 additions and 65 deletions

View File

@ -1465,7 +1465,6 @@ package/ympd/0001-only-c-language.patch Upstream
package/ympd/0002-added-forward-declarations.patch Upstream
package/zabbix/0001-m4-netsnmp.m4-fix-shared-netsnmp-build.patch Upstream
package/zabbix/0002-fix-build-with-libressl-3.5.0.patch Upstream
package/zbar/0001-python-enum-fix-build-for-Python-3.11.patch Upstream
package/zic/0001-remove-dependency-check-on-version-file.patch Upstream
package/zip/0001-configure-Remove-Check-C-compiler-type-optimization-.patch Upstream
package/zip/0002-configure-Don-t-use-host-CPP.patch Upstream

View File

@ -1,62 +0,0 @@
From fbaec4b4e6fe735efe6916fe5b92805a0d96bf8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Wed, 21 Sep 2022 10:32:11 +0700
Subject: [PATCH] python: enum: fix build for Python 3.11
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Python 3.9 introduced Py_SET_SIZE function to set size instead of
relying on Py_SIZE() as a macro [3.9].
Python 3.10 started to encourage to use Py_SET_SIZE instead of
assigning into return value of Py_SIZE [3.10].
Python 3.11 flips the switch, turn Py_SIZE into a function [3.11],
thus Py_SIZE(obj) will be a rvalue. We need to use Py_SET_SIZE
to set size now.
[3.9]: https://docs.python.org/3.9/c-api/structures.html#c.Py_SET_SIZE
[3.10]: https://docs.python.org/3.10/c-api/structures.html#c.Py_SIZE
[3.11]: https://docs.python.org/3.11/c-api/structures.html#c.Py_SIZE
Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
[Upstream status:
https://github.com/mchehab/zbar/pull/231]
---
python/enum.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/python/enum.c b/python/enum.c
index dfe1b1e..946344f 100644
--- a/python/enum.c
+++ b/python/enum.c
@@ -52,7 +52,11 @@ enumitem_new (PyTypeObject *type,
/* we assume the "fast path" for a single-digit ints (see longobject.c) */
/* this also holds if we get a small_int preallocated long */
+#if PY_VERSION_HEX >= 0x03090000
+ Py_SET_SIZE(&self->val, Py_SIZE(longval));
+#else
Py_SIZE(&self->val) = Py_SIZE(longval);
+#endif
self->val.ob_digit[0] = longval->ob_digit[0];
Py_DECREF(longval);
#else
@@ -143,7 +147,11 @@ zbarEnumItem_New (PyObject *byname,
/* we assume the "fast path" for a single-digit ints (see longobject.c) */
/* this also holds if we get a small_int preallocated long */
+#if PY_VERSION_HEX >= 0x03090000
+ Py_SET_SIZE(&self->val, Py_SIZE(longval));
+#else
Py_SIZE(&self->val) = Py_SIZE(longval);
+#endif
self->val.ob_digit[0] = longval->ob_digit[0];
Py_DECREF(longval);
--
2.34.1

View File

@ -1,3 +1,3 @@
# Locally computed:
sha256 9152c8fb302b3891e1cb9cc719883d2f4ccd2483e3430783a2cf2d93bd5901ad zbar-0.23.90.tar.bz2
sha256 83be8f85fc7c288fd91f98d52fc55db7eedbddcf10a83d9221d7034636683fa0 zbar-0.23.93.tar.bz2
sha256 44260f9252c7fe38ba8dfb645330504f4a375e3a5e9dd7d5d6b9f04adb4952f1 LICENSE.md

View File

@ -4,7 +4,7 @@
#
################################################################################
ZBAR_VERSION = 0.23.90
ZBAR_VERSION = 0.23.93
ZBAR_SOURCE = zbar-$(ZBAR_VERSION).tar.bz2
ZBAR_SITE = https://www.linuxtv.org/downloads/zbar
ZBAR_LICENSE = LGPL-2.1+