From cd9eddb4188237d7a8c2e563b3ad729da12a0d6c Mon Sep 17 00:00:00 2001
From: Gwyn Ciesla <gwync@protonmail.com>
Date: Tue, 31 May 2022 14:28:55 -0500
Subject: [PATCH] 0.23.90, enable pdf417

---
 .gitignore          |  1 +
 sources             |  2 +-
 zbar-tp_print.patch | 28 ----------------------------
 zbar.spec           | 19 +++++++++++--------
 4 files changed, 13 insertions(+), 37 deletions(-)
 delete mode 100644 zbar-tp_print.patch

diff --git a/.gitignore b/.gitignore
index d28ed8e..153a457 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ zbar-0.10.tar.bz2
 /zbar-0.22.91.tar.bz2
 /zbar-0.22.92.tar.bz2
 /zbar-0.23.tar.bz2
+/zbar-0.23.90.tar.bz2
diff --git a/sources b/sources
index 6707fd8..6fa09be 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (zbar-0.23.tar.bz2) = 7eef2ee99760edd693ecc12a36e04b71a156b93b4c1977ca4f6da103a955284cf640b55adb185477e1d4cc65345bb01608ed9528f6518abb514ccbc58e5d350b
+SHA512 (zbar-0.23.90.tar.bz2) = c4ccac8526acab4e28c6145c5cdb95b6a6c5c81b6d2f883053435794f7c351edee20abdc9599cb0de96db546f584c9479896baa87b01ad409d5e75ea8b48118c
diff --git a/zbar-tp_print.patch b/zbar-tp_print.patch
deleted file mode 100644
index ac1391b..0000000
--- a/zbar-tp_print.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- python/enum.c~	2019-05-22 06:00:30.000000000 -0500
-+++ python/enum.c	2020-07-20 12:29:37.468767649 -0500
-@@ -76,6 +76,7 @@
-     return(self->name);
- }
- 
-+#if PY_MAJOR_VERSION < 3
- static int
- enumitem_print (zbarEnumItem *self,
-                 FILE *fp,
-@@ -83,6 +84,7 @@
- {
-     return(self->name->ob_type->tp_print(self->name, fp, flags));
- }
-+#endif
- 
- static PyObject*
- enumitem_repr (zbarEnumItem *self)
-@@ -115,7 +117,9 @@
-     .tp_new         = (newfunc)enumitem_new,
-     .tp_dealloc     = (destructor)enumitem_dealloc,
-     .tp_str         = (reprfunc)enumitem_str,
-+#if PY_MAJOR_VERSION < 3
-     .tp_print       = (printfunc)enumitem_print,
-+#endif
-     .tp_repr        = (reprfunc)enumitem_repr,
- };
- 
diff --git a/zbar.spec b/zbar.spec
index 2e654f2..5f0da77 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -1,20 +1,19 @@
 Name:		zbar
-Version:	0.23
-Release:	14%{?dist}
+Version:	0.23.90
+Release:	1%{?dist}
 Summary:	Bar code reader
 
 License:	LGPLv2+
 URL:		http://zbar.sourceforge.net/
 Source0:	https://linuxtv.org/downloads/%{name}/%{name}-%{version}.tar.bz2
 Patch0:		use_python3_on_python_script.patch
-Patch1:         zbar-tp_print.patch
-Patch2:         py311.patch
+Patch1:         py311.patch
 
 BuildRequires: make
 BuildRequires:	autoconf automake libtool gettext-devel
 BuildRequires:	qt5-qtbase-devel qt5-qtx11extras-devel
 BuildRequires:	gtk3-devel GraphicsMagick-devel pygobject3-devel
-BuildRequires:	libv4l-devel libXv-devel xmlto dbus-devel
+BuildRequires:	libv4l-devel libXv-devel xmlto dbus-devel libSM-devel
 BuildRequires:	java-11-openjdk-devel
 BuildRequires:	python3-devel
 
@@ -96,10 +95,9 @@ on Java Native Interface (JNI) applications using ZBar.
 %setup -q
 %patch0 -p1
 %patch1 -p0
-%patch2 -p0
 
 %build
-%configure --with-python=python3 --with-gtk=auto --docdir=%{_docdir}/%{name}-%{version} --with-graphicsmagick
+%configure --with-python=python3 --with-gtk=auto --docdir=%{_docdir}/%{name}-%{version} --with-graphicsmagick --without-xshm --without-xv --enable-codes=ean,databar,code128,code93,code39,codabar,i25,qrcode,sqcode,pdf417
 
 # rpath
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
@@ -129,7 +127,9 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-%{version}/
 
 %ldconfig_scriptlets qt
 
-%files
+%find_lang zbar
+
+%files -f zbar.lang
 %doc NEWS.md README.md INSTALL.md
 %license COPYING LICENSE.md
 
@@ -189,6 +189,9 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-%{version}/
 %{_docdir}/test_python.py
 
 %changelog
+* Tue May 31 2022 Gwyn Ciesla <gwync@protonmail.com> - 0.23.90-1
+- 0.23.90
+
 * Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 0.23-14
 - Rebuilt for java-17-openjdk as system jdk