diff --git a/0001-Create-correct-pkconfig-file-for-zbar-qt5.patch b/0001-Create-correct-pkconfig-file-for-zbar-qt5.patch deleted file mode 100644 index 96fe6bf..0000000 --- a/0001-Create-correct-pkconfig-file-for-zbar-qt5.patch +++ /dev/null @@ -1,36 +0,0 @@ -From cac1fffce80f0835e4d8d234023a775b4243b916 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Stefan=20Br=C3=BCns?= -Date: Sun, 20 Oct 2019 01:44:02 +0200 -Subject: [PATCH] Create correct pkconfig file for zbar-qt5 - -Although zbar supports Qt5, the created pkgconfig file always requested -the Qt(4) components. - -Fixes issue #62. ---- - configure.ac | 13 ++++++++++--- - zbar-qt5.pc.in | 12 ++++++++++++ - 2 files changed, 22 insertions(+), 3 deletions(-) - create mode 100644 zbar-qt5.pc.in - -diff --git a/zbar-qt5.pc.in b/zbar-qt5.pc.in -new file mode 100644 -index 0000000..3378993 ---- /dev/null -+++ b/zbar-qt5.pc.in -@@ -0,0 +1,12 @@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+ -+Name: zbar-qt -+Description: bar code scanning and decoding Qt5 widget -+URL: http://zbar.sourceforge.net -+Version: @VERSION@ -+Requires: zbar, Qt5Core >= 5, Qt5Gui >= 5 -+Libs: -L${libdir} -lzbarqt -+Cflags: -I${includedir} --- -2.23.0 - diff --git a/0002-get-rid-of-gettext_h.patch b/0002-get-rid-of-gettext_h.patch deleted file mode 100644 index 6c41dea..0000000 --- a/0002-get-rid-of-gettext_h.patch +++ /dev/null @@ -1,36 +0,0 @@ -commit a133aea7880bbb56d75535e534716d0e16a3b61a -Author: Mauro Carvalho Chehab -Date: Tue Jul 28 09:47:03 2020 +0200 - - zbarcam, zbarimg: get rid of gettext.h - - This doesn't seem to be needed at all for translations to - work. Also, gettext.h uses a different license. So, let's get - rid of it. - - Signed-off-by: Mauro Carvalho Chehab - -diff --git a/zbarcam/zbarcam.c b/zbarcam/zbarcam.c -index f7ea281..ad30101 100644 ---- a/zbarcam/zbarcam.c -+++ b/zbarcam/zbarcam.c -@@ -35,7 +35,6 @@ - #include - - #ifdef ENABLE_NLS --#include "../zbar/gettext.h" - # include - # define _(string) gettext(string) - #else -diff --git a/zbarimg/zbarimg.c b/zbarimg/zbarimg.c -index 0796fd8..d05d832 100644 ---- a/zbarimg/zbarimg.c -+++ b/zbarimg/zbarimg.c -@@ -40,7 +40,6 @@ - #include - - #ifdef ENABLE_NLS --#include "../zbar/gettext.h" - # include - # define _(string) gettext(string) - #else diff --git a/zbar-0.23.1.tar.bz2 b/zbar-0.23.1.tar.bz2 deleted file mode 100644 index f20ddfe..0000000 --- a/zbar-0.23.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dad260b47ef887a639e840a89e5e6e132217b6bba2a8473565d1f459bcb97c1f -size 1195599 diff --git a/zbar-0.23.90.tar.bz2 b/zbar-0.23.90.tar.bz2 new file mode 100644 index 0000000..a7fdb11 --- /dev/null +++ b/zbar-0.23.90.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9152c8fb302b3891e1cb9cc719883d2f4ccd2483e3430783a2cf2d93bd5901ad +size 1199323 diff --git a/zbar.changes b/zbar.changes index d080473..666be1c 100644 --- a/zbar.changes +++ b/zbar.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Wed Feb 17 07:55:51 UTC 2021 - Luigi Baldoni + +- Update to version 0.23.90 + * Fixed several issues with configure.ac, making it auto-detect + most things, when possible + * 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 +- Drop 0001-Create-correct-pkconfig-file-for-zbar-qt5.patch and + 0002-get-rid-of-gettext_h.patch (merged upstream) +- Enable python3 module + ------------------------------------------------------------------- Thu Jan 21 21:02:59 UTC 2021 - Luigi Baldoni diff --git a/zbar.spec b/zbar.spec index 20addaf..8eb7410 100644 --- a/zbar.spec +++ b/zbar.spec @@ -20,7 +20,7 @@ %define sover 0 %define libname lib%{name}%{sover} Name: zbar -Version: 0.23.1 +Version: 0.23.90 Release: 0 Summary: Bar code reader License: LGPL-2.0-or-later @@ -28,10 +28,6 @@ Group: Productivity/Other URL: https://github.com/mchehab/zbar Source0: https://linuxtv.org/downloads/%{name}/%{name}-%{version}.tar.bz2 Source98: baselibs.conf -# PATCH-FIX-UPSTREAM -- https://github.com/mchehab/zbar/pull/63 -Patch0: 0001-Create-correct-pkconfig-file-for-zbar-qt5.patch -# PATCH-FIX-UPSTREAM -- https://github.com/mchehab/zbar/commit/a133aea7880bbb56d75535e534716d0e16a3b61a -Patch1: 0002-get-rid-of-gettext_h.patch BuildRequires: libjpeg-devel BuildRequires: pkgconfig >= 0.9.0 BuildRequires: xmlto @@ -43,6 +39,7 @@ BuildRequires: pkgconfig(Qt5X11Extras) BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(ice) BuildRequires: pkgconfig(libv4l2) +BuildRequires: pkgconfig(python3) BuildRequires: pkgconfig(sm) BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xext) @@ -100,6 +97,13 @@ This package contains all necessary include files, libraries, configuration files and development tools needed to compile and link applications using the zbar-qt library. +%package -n python3-zbar +Summary: Python3 module for ZBar +Group: Development/Languages/Python + +%description -n python3-zbar +This package contains the module to use ZBar from python3. + %prep %autosetup -p1 @@ -111,7 +115,7 @@ test -x "$(type -p gcc-8)" && export CC=$_ --docdir=%{_docdir}/%{name} \ --disable-static \ --without-java \ - --with-python=no \ + --with-python=python3 \ --without-gtk %make_build @@ -165,4 +169,7 @@ rm -rf %{buildroot}%{_sysconfdir}/dbus-1/system.d/org.linuxtv.Zbar.conf %{_libdir}/libzbarqt.so %{_libdir}/pkgconfig/zbar-qt.pc +%files -n python3-zbar +%{python3_sitearch}/zbar.so + %changelog