From 23ba05b98dbb29a005ecf5f717b02969c26e30e2 Mon Sep 17 00:00:00 2001
From: Gwyn Ciesla <gwync@protonmail.com>
Date: Jan 09 2024 16:07:01 +0000
Subject: 0.23.93


---

diff --git a/.gitignore b/.gitignore
index 153a457..5a6ac22 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ zbar-0.10.tar.bz2
 /zbar-0.22.92.tar.bz2
 /zbar-0.23.tar.bz2
 /zbar-0.23.90.tar.bz2
+/zbar-0.23.93.tar.bz2
diff --git a/py311.patch b/py311.patch
deleted file mode 100644
index 1c047a5..0000000
--- a/py311.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- python/enum.c~	2022-01-12 10:07:02.151116991 -0600
-+++ python/enum.c	2022-01-12 10:14:04.093001534 -0600
-@@ -23,6 +23,12 @@
- 
- #include "zbarmodule.h"
- 
-+#if PY_VERSION_HEX < 0x030900A4 && !defined(Py_SET_SIZE)
-+static inline void _Py_SET_SIZE(PyVarObject *ob, Py_ssize_t size)
-+{ ob->ob_size = size; }
-+#define Py_SET_SIZE(ob, size) _Py_SET_SIZE((PyVarObject*)(ob), size)
-+#endif
-+
- static char enumitem_doc[] = PyDoc_STR(
-     "simple enumeration item.\n"
-     "\n"
---- python/enum.c~	2022-01-12 10:16:29.670271662 -0600
-+++ python/enum.c	2022-01-12 10:52:11.671258442 -0600
-@@ -58,7 +58,7 @@
- 
-     /* we assume the "fast path" for a single-digit ints (see longobject.c) */
-     /* this also holds if we get a small_int preallocated long */
--    Py_SIZE(&self->val) = Py_SIZE(longval);
-+    Py_SET_SIZE(&self->val, Py_SIZE(longval));
-     self->val.ob_digit[0] = longval->ob_digit[0];
-     Py_DECREF(longval);
- #else
-@@ -148,7 +148,7 @@
- 
-     /* we assume the "fast path" for a single-digit ints (see longobject.c) */
-     /* this also holds if we get a small_int preallocated long */
--    Py_SIZE(&self->val) = Py_SIZE(longval);
-+    Py_SET_SIZE(&self->val, Py_SIZE(longval));
-     self->val.ob_digit[0] = longval->ob_digit[0];
-     Py_DECREF(longval);
- 
diff --git a/py312.patch b/py312.patch
deleted file mode 100644
index 9999cb6..0000000
--- a/py312.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- python/enum.c~	2023-07-07 11:08:43.137150103 +0200
-+++ python/enum.c	2023-07-07 11:24:06.010655717 +0200
-@@ -59,7 +59,11 @@
-     /* we assume the "fast path" for a single-digit ints (see longobject.c) */
-     /* this also holds if we get a small_int preallocated long */
-     Py_SET_SIZE(&self->val, Py_SIZE(longval));
-+#if PY_MINOR_VERSION >= 12
-+    self->val.long_value.ob_digit[0] = longval->long_value.ob_digit[0];
-+#else
-     self->val.ob_digit[0] = longval->ob_digit[0];
-+#endif
-     Py_DECREF(longval);
- #else
-     self->val.ob_ival = val;
-@@ -150,7 +154,11 @@
-     /* we assume the "fast path" for a single-digit ints (see longobject.c) */
-     /* this also holds if we get a small_int preallocated long */
-     Py_SET_SIZE(&self->val, Py_SIZE(longval));
-+#if PY_MINOR_VERSION >= 12
-+    self->val.long_value.ob_digit[0] = longval->long_value.ob_digit[0];
-+#else
-     self->val.ob_digit[0] = longval->ob_digit[0];
-+#endif
-     Py_DECREF(longval);
- 
-     self->name = PyUnicode_FromString(name);
diff --git a/sources b/sources
index 6fa09be..4eacb18 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (zbar-0.23.90.tar.bz2) = c4ccac8526acab4e28c6145c5cdb95b6a6c5c81b6d2f883053435794f7c351edee20abdc9599cb0de96db546f584c9479896baa87b01ad409d5e75ea8b48118c
+SHA512 (zbar-0.23.93.tar.bz2) = 8b1d57557cb1c425109b709f0cbe94830939cb4cd9a0cb505d44ba3c7cfb3522560c3bbf2a8b37985da4577b677ad675491f6ef0e9796749382079c0e844e21e
diff --git a/zbar.spec b/zbar.spec
index a6fddc8..e3d703c 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -5,16 +5,14 @@
 %endif
 
 Name:		zbar
-Version:	0.23.90
-Release:	12%{?dist}
+Version:	0.23.93
+Release:	1%{?dist}
 Summary:	Bar code reader
 
 License:	LGPL-2.1-or-later
 URL:		http://zbar.sourceforge.net/
 Source0:	https://linuxtv.org/downloads/%{name}/%{name}-%{version}.tar.bz2
 Patch0:		use_python3_on_python_script.patch
-Patch1:         py311.patch
-Patch2:         py312.patch
 
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -120,8 +118,6 @@ on Java Native Interface (JNI) applications using ZBar.
 %prep
 %setup -q
 %patch 0 -p1
-%patch 1 -p0
-%patch 2 -p0
 
 %build
 %configure --with-python=python3 --with-gtk=auto --with-dbusconfdir=%{_sysconfdir} --docdir=%{_docdir}/%{name}-%{version} --with-graphicsmagick --without-xshm --without-xv --enable-codes=ean,databar,code128,code93,code39,codabar,i25,qrcode,sqcode,pdf417
@@ -217,6 +213,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/
 %{_docdir}/test_python.py
 
 %changelog
+* Tue Jan 09 2024 Gwyn Ciesla <gwync@protonmail.com> - 0.23.93-1
+- 0.23.93
+
 * Fri Jan 05 2024 Florian Weimer <fweimer@redhat.com> - 0.23.90-12
 - Add missing Py_SIZE to py311.patch