From 65b1326e59db4421b30ddc52b3886291d51b8076 Mon Sep 17 00:00:00 2001
From: Gwyn Ciesla <gwync@protonmail.com>
Date: Mon, 20 Jul 2020 13:05:26 -0500
Subject: [PATCH] Several fixes.

---
 zbar-tp_print.patch | 28 ++++++++++++++++++++++++++++
 zbar.spec           | 21 ++++++++++++++-------
 2 files changed, 42 insertions(+), 7 deletions(-)
 create mode 100644 zbar-tp_print.patch

diff --git a/zbar-tp_print.patch b/zbar-tp_print.patch
new file mode 100644
index 0000000..ac1391b
--- /dev/null
+++ b/zbar-tp_print.patch
@@ -0,0 +1,28 @@
+--- 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 12eb82b..cfc26d2 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -1,25 +1,26 @@
 Name:		zbar
 Version:	0.23
-Release:	5%{?dist}
+Release:	6%{?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
 
 BuildRequires:	autoconf automake libtool gettext-devel
 BuildRequires:	qt5-qtbase-devel qt5-qtx11extras-devel
-BuildRequires:	gtk3-devel ImageMagick-devel pygobject3-devel
+BuildRequires:	gtk3-devel GraphicsMagick-devel pygobject3-devel
 BuildRequires:	libv4l-devel libXv-devel xmlto dbus-devel
 BuildRequires:	java-11-openjdk-devel
 BuildRequires:	python3-devel
 
 %description
-A layered bar code scanning and decoding library. Supports EAN, UPC, Code 128,
-Code 39 and Interleaved 2 of 5.
-Includes applications for decoding captured bar code images and using a video
-device (e. g., webcam) as a bar code scanner.
+ZBar Bar Code Reader is an open source software suite for reading bar
+codes from various sources, such as video streams, image files and raw
+intensity sensors. It supports EAN-13/UPC-A, UPC-E, EAN-8, Code 128,
+Code 93, Code 39, Codabar, Interleaved 2 of 5, QR Code and SQ Code.
 
 %package devel
 Summary: Bar code library extra development files
@@ -92,10 +93,11 @@ on Java Native Interface (JNI) applications using ZBar.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p0
 
 %build
 autoreconf -vfi
-%configure --with-python=python3 --with-gtk=auto --docdir=%{_docdir}/%{name}-%{version}
+%configure --with-python=python3 --with-gtk=auto --docdir=%{_docdir}/%{name}-%{version} --with-graphicsmagick
 
 # rpath
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
@@ -185,6 +187,11 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-%{version}/
 %{_docdir}/test_python.py
 
 %changelog
+* Mon Jul 20 2020 Gwyn Ciesla <gwync@protonmail.com> - 0.23-6
+- Update description.
+- Patch for Python 3.9.
+- Move back to GraphicsMagick.
+
 * Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 0.23-5
 - Rebuilt for Python 3.9