Hello community, here is the log from the commit of package zbar for openSUSE:Leap:15.2 checked in at 2020-04-17 13:36:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/zbar (Old) and /work/SRC/openSUSE:Leap:15.2/.zbar.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "zbar" Fri Apr 17 13:36:41 2020 rev:16 rq:792747 version:0.23 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/zbar/zbar.changes 2020-01-15 16:32:44.256891464 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.zbar.new.2738/zbar.changes 2020-04-17 13:36:42.336182066 +0200 @@ -1,0 +2,96 @@ +Sun Oct 20 11:40:04 UTC 2019 - Stefan Brüns <[email protected]> + +- Remove references to Qt4 from zbar-qt pkgconfig file (#62), + add 0001-Create-correct-pkconfig-file-for-zbar-qt5.patch + +------------------------------------------------------------------- +Sat Jul 6 10:07:41 UTC 2019 - Stefan Brüns <[email protected]> + +- Update to version 0.23: + * Support for Gtk3 (backward support with Gtk2 will be maintained. + * Support for Python 3 (backward support with Python2 will be maintained); + * Support for ZBar Gtk GObject Introspection (GIR). That allows using ZBar + Gtk3 widgets on any language that it is compatible with GIR, including + python 2 and python 3. +- Switch from ImageMagick to GraphicsMagick, the latter has significantly + less build dependencies. As it is only used by the zbarimg tool to + load images, this does not affect users of the zbar library. +- Update URL tag to point to the current upstream location + +------------------------------------------------------------------- +Thu Mar 28 16:23:42 UTC 2019 - Martin Pluskal <[email protected]> + +- Update to version 0.22: + * zbarcam-qt: allow changing resolutions in real time + * zbarcam-qt: better support ZBar options + * zbarcam-qt: do several visual improvements + * zbarcam-qt: make it remember the geometry + * zbarcam-qt: allow show/hide control and options bars + * zbarcam-qt: remember lastly used settings and camera controls + * zbarcam-qt: allow changing ZBar decode options via GUI + * Add API to allow get/set resolutions + * img_scanner: add handler for color-inverted codes + * img_scanner: fix get_config parameter validation + * scan_video: improve logic to remove duplicated/invalid devnodes + * symbol.c: fix symbol hash logic (prevents crash with QR options) + * configure.ac: fix an error at libv4l2 package check + * fix some typos + * exit gracefully when decoding split QR codes + +------------------------------------------------------------------- +Fri Mar 8 17:31:33 UTC 2019 - [email protected] + +- Use gcc7 in SLE_12 + +------------------------------------------------------------------- +Fri Feb 15 08:14:02 UTC 2019 - Martin Pluskal <[email protected]> + +- Update to version 0.21: + * zbarcam-qt: allow selecting codes via GUI interface + * When both enabled, ISBN-13 has precedence over ISBN-10 + * ZBar is now using Travis CI for continuous integration tests + * Convert INSTALL and README to markdown and update them + * Improve ZBar testing code and make easier to run the tests + * Fix build with Clang + * Add simple dbus IPC API to zbarcam. + * zbarimg: display only the compiled symbologies + * v4l2: make ZBar build and run on Kernels < 3.16 + * configure.ac: The pdf417 code is incomplete. Warn about that + * Add Debian packaging and Travis CI configuration + * Add barcode examples for different supported symbologies + * Several improvements at the building system + * Add support for SQ code symbology + * v4l2: add fallback for systems without v4l2_ext_controls which field + * v4l2: use device_caps instead of capabilities + * v4l2: make v4l2_request_buffers() more generic + * release video buffers after probing and request them again when needed + * Ignore ENOTTY errors when calling VIDIOC_S_CROP + * doc/Makefile.am.inc: clean html generated files + * Add --disable-doc configure option to disable building docs + * Fix function protoype to be compatible with recent libjpeg + * Wrap logical not operations into parentheses + * INSTALL: warn that autoconf should be called before configure + * code128: fix error logic + * convert: ensure that it will not use a freed value + * zbar: use g_thread_new() instead of g_tread_create() + * zbargtk: add a missing break + * gtk/zbargtk: add a missing check if zbar->window is not null +- Remove accidentaly introduced build dependency on python2 +- We no longer need to generate configure +- Make building more verbose + +------------------------------------------------------------------- +Wed Jan 23 16:13:22 UTC 2019 - [email protected] + +- Update Zbar to v0.20.1 + * switch from the old abandoned codebase to the new codebase + maintained by linuxtv.org + * improved v4l2 support + * compatible with Qt5 + * various fixes +- Removed fix_build.patch +- Removed fix-gcc5.patch +- Removed zbar-Qt5.patch +- Removed fix-gcc8.patch + +------------------------------------------------------------------- Old: ---- fix-gcc5.patch fix-gcc8.patch fix_build.patch update.sh zbar-0.10_2013_02_28.tar.bz2 zbar-Qt5.patch New: ---- 0001-Create-correct-pkconfig-file-for-zbar-qt5.patch zbar-0.23.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zbar.spec ++++++ --- /var/tmp/diff_new_pack.xw6C0f/_old 2020-04-17 13:36:43.220182730 +0200 +++ /var/tmp/diff_new_pack.xw6C0f/_new 2020-04-17 13:36:43.220182730 +0200 @@ -1,7 +1,7 @@ # # spec file for package zbar # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2010 Carlos Goncalves <[email protected]>. # # All modifications and additions to the file contributed by third parties @@ -13,39 +13,46 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # -%define libname libzbar0 +%define sover 0 +%define libname lib%{name}%{sover} Name: zbar -Version: 0.10_2013_02_28 +Version: 0.23 Release: 0 Summary: Bar code reader -License: LGPL-2.1-or-later +License: LGPL-2.0-or-later Group: Productivity/Other -Url: http://zbar.sourceforge.net -Source: %{name}-%{version}.tar.bz2 +URL: https://github.com/mchehab/zbar +Source0: https://linuxtv.org/downloads/%{name}/%{name}-%{version}.tar.bz2 Source98: baselibs.conf -# update.sh is used to create a new tarball based on the hg repository -Source99: update.sh -Patch1: fix_build.patch -Patch2: fix-gcc5.patch -# PATCH-FEATURE-OPENSUSE zbar-Qt5.patch -- build against Qt5 libraries <[email protected]> -Patch3: zbar-Qt5.patch -Patch4: fix-gcc8.patch -BuildRequires: ImageMagick-devel -# required by mercurial archive only +# PATCH-FIX-UPSTREAM -- https://github.com/mchehab/zbar/pull/63 +Patch0: 0001-Create-correct-pkconfig-file-for-zbar-qt5.patch +# autoconf/automake required due to patched configure.ac (Patch0) +%if 0%{?suse_version} >= 1550 BuildRequires: autoconf -BuildRequires: automake +BuildRequires: automake >= 1.16 +%endif BuildRequires: libjpeg-devel -BuildRequires: libtool -BuildRequires: pkgconfig +BuildRequires: pkgconfig >= 0.9.0 BuildRequires: xmlto +BuildRequires: pkgconfig(GraphicsMagick) BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5Gui) BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(Qt5X11Extras) +BuildRequires: pkgconfig(dbus-1) +BuildRequires: pkgconfig(ice) +BuildRequires: pkgconfig(libv4l2) +BuildRequires: pkgconfig(sm) +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(xext) +BuildRequires: pkgconfig(xv) +%if 0%{?suse_version} < 1500 +BuildRequires: gcc7 +%endif %description ZBar reads bar codes from various sources, such as video streams, @@ -78,46 +85,50 @@ configuration files and development tools needed to compile and link applications using the zbar library. -%package -n libzbarqt0 +%package -n lib%{name}qt0 Summary: ZBar Qt bindings Group: System/Libraries -%description -n libzbarqt0 +%description -n lib%{name}qt0 This package provides ZBar Qt bindings. -%package -n libzbarqt-devel +%package -n lib%{name}qt-devel Summary: Development environment for the ZBar Qt bindings library Group: Development/Libraries/C and C++ -Requires: libzbarqt0 = %{version} +Requires: lib%{name}-devel = %{version} +Requires: lib%{name}qt0 = %{version} -%description -n libzbarqt-devel +%description -n lib%{name}qt-devel This package contains all necessary include files, libraries, configuration files and development tools needed to compile and link applications using the zbar-qt library. %prep %setup -q -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 +%if 0%{?suse_version} >= 1550 +%patch0 -p1 +%endif %build -# for the Mercurial-based archive we need to get proper autoconf files -autoreconf -fiv -# Mercurial only? - This should not be required in a final release version! -export CFLAGS="%{optflags} -Wno-error=parentheses -Wno-error=deprecated-declarations" +test -x "$(type -p gcc)" && export CC=$_ +test -x "$(type -p gcc-7)" && export CC=$_ +test -x "$(type -p gcc-8)" && export CC=$_ %configure \ --docdir=%{_docdir}/%{name} \ --disable-static \ - --without-python \ + --without-java \ + --with-python=no \ --without-gtk -make %{?_smp_mflags} +make %{?_smp_mflags} V=1 %install %make_install -rm %{buildroot}%{_docdir}/zbar/INSTALL -find %{buildroot} -type f -name "*.la" -delete -print +find %{buildroot} -name "*.la" -or -name "*.a" | xargs rm -f +rm -rf %{buildroot}%{_datadir}/doc/zbar-%{version}/ +rm -f %{buildroot}%{_docdir}/zbar/{COPYING,LICENSE.md,INSTALL.md} + +# Lets wait for review first +rm -rf %{buildroot}%{_sysconfdir}/dbus-1/system.d/org.linuxtv.Zbar.conf %post -n %{libname} -p /sbin/ldconfig %postun -n %{libname} -p /sbin/ldconfig @@ -125,27 +136,36 @@ %postun -n libzbarqt0 -p /sbin/ldconfig %files -%doc ChangeLog README COPYING LICENSE NEWS +%license COPYING LICENSE.md %{_defaultdocdir}/%{name}/ -%{_bindir}/zbar* +%{_bindir}/zbarimg +%{_bindir}/zbarcam +%{_bindir}/zbarcam-qt %{_mandir}/man1/* %files -n %{libname} -%{_libdir}/libzbar.so.* +%{_libdir}/libzbar.so.%{sover}* %files -n lib%{name}-devel +%doc HACKING.md TODO.md %dir %{_includedir}/%{name} %{_includedir}/zbar.h -%{_includedir}/%{name}/*.h -%exclude %{_includedir}/%{name}/zbargtk.h -%exclude %{_includedir}/%{name}/QZBar*.h +%{_includedir}/zbar/Exception.h +%{_includedir}/zbar/Symbol.h +%{_includedir}/zbar/Image.h +%{_includedir}/zbar/Scanner.h +%{_includedir}/zbar/Decoder.h +%{_includedir}/zbar/ImageScanner.h +%{_includedir}/zbar/Video.h +%{_includedir}/zbar/Window.h +%{_includedir}/zbar/Processor.h %{_libdir}/libzbar.so %{_libdir}/pkgconfig/zbar.pc -%files -n libzbarqt0 -%{_libdir}/libzbarqt.so.* +%files -n lib%{name}qt0 +%{_libdir}/libzbarqt.so.%{sover}* -%files -n libzbarqt-devel +%files -n lib%{name}qt-devel %{_includedir}/%{name}/QZBar*.h %{_libdir}/libzbarqt.so %{_libdir}/pkgconfig/zbar-qt.pc ++++++ 0001-Create-correct-pkconfig-file-for-zbar-qt5.patch ++++++ >From cac1fffce80f0835e4d8d234023a775b4243b916 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <[email protected]> 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/configure.ac b/configure.ac index 935110a..49ef6a8 100644 --- a/configure.ac +++ b/configure.ac @@ -659,15 +659,23 @@ AS_IF([test "x$with_qt" != "xno"], CPPFLAGS="$CPPFLAGS $QT_CPPFLAGS" dnl -fPIC has no effect on Windows and breaks windres AS_IF([test "x$win32" = "xno"], [CPPFLAGS="$CPPFLAGS -fPIC"]) - AC_MSG_NOTICE([using Qt version $QT_VERSION])], + AC_MSG_NOTICE([using Qt version $QT_VERSION]) + qt_pkgconfig_file="zbar-qt5.pc" + ], [MOC=`$PKG_CONFIG QtGui --variable=moc_location` AC_MSG_NOTICE([using moc from $MOC]) QT_VERSION=`$PKG_CONFIG QtGui --modversion` - AC_MSG_NOTICE([using Qt version $QT_VERSION])])) + AC_MSG_NOTICE([using Qt version $QT_VERSION]) + qt_pkgconfig_file="zbar-qt.pc" + ])) AM_CONDITIONAL([HAVE_QT], [test "x$with_qt" = "xyes"]) +AM_COND_IF([HAVE_QT], + [AC_CONFIG_FILES([zbar-qt.pc:"${qt_pkgconfig_file}.in"])] +) + dnl Java have_java="maybe" @@ -820,7 +828,6 @@ java/Makefile zbar/Makefile zbar.pc zbar-gtk.pc -zbar-qt.pc doc/doxygen.conf]) AC_CONFIG_FILES([test/test_examples.sh],[chmod 755 test/test_examples.sh]) 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 ++++++ zbar-0.10_2013_02_28.tar.bz2 -> zbar-0.23.tar.bz2 ++++++ ++++ 101327 lines of diff (skipped)
