subject:"commit zbar for openSUSE\:Factory"

commit zbar for openSUSE:Factory

2019-10-22 Thread root

Hello community,

here is the log from the commit of package zbar for openSUSE:Factory checked in 
at 2019-10-22 16:42:27

Comparing /work/SRC/openSUSE:Factory/zbar (Old)
 and  /work/SRC/openSUSE:Factory/.zbar.new.2352 (New)


Package is "zbar"

Tue Oct 22 16:42:27 2019 rev:12 rq:741319 version:0.23

Changes:

--- /work/SRC/openSUSE:Factory/zbar/zbar.changes2019-07-22 
12:14:50.771753304 +0200
+++ /work/SRC/openSUSE:Factory/.zbar.new.2352/zbar.changes  2019-10-22 
16:42:30.785669110 +0200
@@ -1,0 +2,6 @@
+Sun Oct 20 11:40:04 UTC 2019 - Stefan Brüns 
+
+- Remove references to Qt4 from zbar-qt pkgconfig file (#62),
+  add 0001-Create-correct-pkconfig-file-for-zbar-qt5.patch
+
+---

New:

  0001-Create-correct-pkconfig-file-for-zbar-qt5.patch



Other differences:
--
++ zbar.spec ++
--- /var/tmp/diff_new_pack.bBBeUu/_old  2019-10-22 16:42:31.273669630 +0200
+++ /var/tmp/diff_new_pack.bBBeUu/_new  2019-10-22 16:42:31.277669634 +0200
@@ -28,6 +28,13 @@
 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
+# autoconf/automake required due to patched configure.ac (Patch0)
+%if 0%{?suse_version} >= 1550
+BuildRequires:  autoconf
+BuildRequires:  automake >= 1.16
+%endif
 BuildRequires:  libjpeg-devel
 BuildRequires:  pkgconfig >= 0.9.0
 BuildRequires:  xmlto
@@ -98,6 +105,9 @@
 
 %prep
 %setup -q
+%if 0%{?suse_version} >= 1550
+%patch0 -p1
+%endif
 
 %build
 test -x "$(type -p gcc)" && export CC=$_

++ 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?= 
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 000..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

commit zbar for openSUSE:Factory

2019-07-22 Thread root

Hello community,

here is the log from the commit of package zbar for openSUSE:Factory checked in 
at 2019-07-22 12:14:49

Comparing /work/SRC/openSUSE:Factory/zbar (Old)
 and  /work/SRC/openSUSE:Factory/.zbar.new.4126 (New)


Package is "zbar"

Mon Jul 22 12:14:49 2019 rev:11 rq:713708 version:0.23

Changes:

--- /work/SRC/openSUSE:Factory/zbar/zbar.changes2019-04-03 
09:23:31.707688952 +0200
+++ /work/SRC/openSUSE:Factory/.zbar.new.4126/zbar.changes  2019-07-22 
12:14:50.771753304 +0200
@@ -1,0 +2,14 @@
+Sat Jul  6 10:07:41 UTC 2019 - Stefan Brüns 
+
+- 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
+
+---

Old:

  zbar-0.22.tar.bz2

New:

  zbar-0.23.tar.bz2



Other differences:
--
++ zbar.spec ++
--- /var/tmp/diff_new_pack.CQXOWx/_old  2019-07-22 12:14:51.275753166 +0200
+++ /var/tmp/diff_new_pack.CQXOWx/_new  2019-07-22 12:14:51.275753166 +0200
@@ -20,18 +20,18 @@
 %define sover   0
 %define libname lib%{name}%{sover}
 Name:   zbar
-Version:0.22
+Version:0.23
 Release:0
 Summary:Bar code reader
 License:LGPL-2.0-or-later
 Group:  Productivity/Other
-URL:http://zbar.sourceforge.net/
+URL:https://github.com/mchehab/zbar
 Source0:
https://linuxtv.org/downloads/%{name}/%{name}-%{version}.tar.bz2
 Source98:   baselibs.conf
 BuildRequires:  libjpeg-devel
 BuildRequires:  pkgconfig >= 0.9.0
 BuildRequires:  xmlto
-BuildRequires:  pkgconfig(ImageMagick)
+BuildRequires:  pkgconfig(GraphicsMagick)
 BuildRequires:  pkgconfig(Qt5Core)
 BuildRequires:  pkgconfig(Qt5Gui)
 BuildRequires:  pkgconfig(Qt5Widgets)
@@ -107,7 +107,7 @@
   --docdir=%{_docdir}/%{name} \
   --disable-static \
   --without-java \
-  --without-python2 \
+  --with-python=no \
   --without-gtk
 make %{?_smp_mflags} V=1
 
@@ -115,19 +115,18 @@
 %make_install
 find %{buildroot} -name "*.la"  -or -name "*.a" | xargs rm -f
 rm -rf %{buildroot}%{_datadir}/doc/zbar-%{version}/
-rm -f %{buildroot}%{_docdir}/zbar/{COPYING,LICENSE,INSTALL}
+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
 %post -n libzbarqt0 -p /sbin/ldconfig
 %postun -n libzbarqt0 -p /sbin/ldconfig
 
 %files
-%license COPYING LICENSE
+%license COPYING LICENSE.md
 %{_defaultdocdir}/%{name}/
 %{_bindir}/zbarimg
 %{_bindir}/zbarcam
@@ -138,7 +137,7 @@
 %{_libdir}/libzbar.so.%{sover}*
 
 %files -n lib%{name}-devel
-%doc HACKING TODO
+%doc HACKING.md TODO.md
 %dir %{_includedir}/%{name}
 %{_includedir}/zbar.h
 %{_includedir}/zbar/Exception.h

++ zbar-0.22.tar.bz2 -> zbar-0.23.tar.bz2 ++
 23013 lines of diff (skipped)

commit zbar for openSUSE:Factory

2019-04-03 Thread root

Hello community,

here is the log from the commit of package zbar for openSUSE:Factory checked in 
at 2019-04-03 09:23:31

Comparing /work/SRC/openSUSE:Factory/zbar (Old)
 and  /work/SRC/openSUSE:Factory/.zbar.new.25356 (New)


Package is "zbar"

Wed Apr  3 09:23:31 2019 rev:10 rq:689412 version:0.22

Changes:

--- /work/SRC/openSUSE:Factory/zbar/zbar.changes2019-03-11 
11:14:17.117361989 +0100
+++ /work/SRC/openSUSE:Factory/.zbar.new.25356/zbar.changes 2019-04-03 
09:23:31.707688952 +0200
@@ -1,0 +2,20 @@
+Thu Mar 28 16:23:42 UTC 2019 - Martin Pluskal 
+
+- 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
+
+---

Old:

  zbar-0.21.tar.bz2

New:

  zbar-0.22.tar.bz2



Other differences:
--
++ zbar.spec ++
--- /var/tmp/diff_new_pack.hhevks/_old  2019-04-03 09:23:32.987689533 +0200
+++ /var/tmp/diff_new_pack.hhevks/_new  2019-04-03 09:23:33.011689544 +0200
@@ -20,7 +20,7 @@
 %define sover   0
 %define libname lib%{name}%{sover}
 Name:   zbar
-Version:0.21
+Version:0.22
 Release:0
 Summary:Bar code reader
 License:LGPL-2.0-or-later
@@ -28,9 +28,6 @@
 URL:http://zbar.sourceforge.net/
 Source0:
https://linuxtv.org/downloads/%{name}/%{name}-%{version}.tar.bz2
 Source98:   baselibs.conf
-%if 0%{?suse_version} < 1500
-BuildRequires:  gcc7
-%endif
 BuildRequires:  libjpeg-devel
 BuildRequires:  pkgconfig >= 0.9.0
 BuildRequires:  xmlto
@@ -46,6 +43,9 @@
 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,
@@ -109,11 +109,6 @@
   --without-java \
   --without-python2 \
   --without-gtk
-
-# rpath
-#sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' 
libtool
-#sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-
 make %{?_smp_mflags} V=1
 
 %install

++ zbar-0.21.tar.bz2 -> zbar-0.22.tar.bz2 ++
 2532 lines of diff (skipped)

commit zbar for openSUSE:Factory

2019-03-11 Thread root

Hello community,

here is the log from the commit of package zbar for openSUSE:Factory checked in 
at 2019-03-11 11:14:15

Comparing /work/SRC/openSUSE:Factory/zbar (Old)
 and  /work/SRC/openSUSE:Factory/.zbar.new.28833 (New)


Package is "zbar"

Mon Mar 11 11:14:15 2019 rev:9 rq:682921 version:0.21

Changes:

--- /work/SRC/openSUSE:Factory/zbar/zbar.changes2019-02-20 
14:07:07.527023155 +0100
+++ /work/SRC/openSUSE:Factory/.zbar.new.28833/zbar.changes 2019-03-11 
11:14:17.117361989 +0100
@@ -1,0 +2,5 @@
+Fri Mar  8 17:31:33 UTC 2019 - o...@aepfle.de
+
+- Use gcc7 in SLE_12
+
+---



Other differences:
--
++ zbar.spec ++
--- /var/tmp/diff_new_pack.CxbZju/_old  2019-03-11 11:14:17.797361785 +0100
+++ /var/tmp/diff_new_pack.CxbZju/_new  2019-03-11 11:14:17.797361785 +0100
@@ -28,6 +28,9 @@
 URL:http://zbar.sourceforge.net/
 Source0:
https://linuxtv.org/downloads/%{name}/%{name}-%{version}.tar.bz2
 Source98:   baselibs.conf
+%if 0%{?suse_version} < 1500
+BuildRequires:  gcc7
+%endif
 BuildRequires:  libjpeg-devel
 BuildRequires:  pkgconfig >= 0.9.0
 BuildRequires:  xmlto
@@ -97,6 +100,9 @@
 %setup -q
 
 %build
+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 \

commit zbar for openSUSE:Factory

2019-02-20 Thread root

Hello community,

here is the log from the commit of package zbar for openSUSE:Factory checked in 
at 2019-02-20 14:06:59

Comparing /work/SRC/openSUSE:Factory/zbar (Old)
 and  /work/SRC/openSUSE:Factory/.zbar.new.28833 (New)


Package is "zbar"

Wed Feb 20 14:06:59 2019 rev:8 rq:676347 version:0.21

Changes:

--- /work/SRC/openSUSE:Factory/zbar/zbar.changes2019-01-26 
22:19:42.482987237 +0100
+++ /work/SRC/openSUSE:Factory/.zbar.new.28833/zbar.changes 2019-02-20 
14:07:07.527023155 +0100
@@ -1,0 +2,37 @@
+Fri Feb 15 08:14:02 UTC 2019 - Martin Pluskal 
+
+- 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
+
+---

Old:

  zbar-0.20.1.tar.bz2

New:

  zbar-0.21.tar.bz2



Other differences:
--
++ zbar.spec ++
--- /var/tmp/diff_new_pack.UqwpnA/_old  2019-02-20 14:07:08.087022970 +0100
+++ /var/tmp/diff_new_pack.UqwpnA/_new  2019-02-20 14:07:08.087022970 +0100
@@ -13,36 +13,36 @@
 # 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.20.1
+Version:0.21
 Release:0
 Summary:Bar code reader
 License:LGPL-2.0-or-later
 Group:  Productivity/Other
-
 URL:http://zbar.sourceforge.net/
 Source0:
https://linuxtv.org/downloads/%{name}/%{name}-%{version}.tar.bz2
 Source98:   baselibs.conf
-
-BuildRequires:  ImageMagick-devel
-BuildRequires:  autoconf
-BuildRequires:  automake
-BuildRequires:  libtool
-BuildRequires:  pkgconfig
 BuildRequires:  libjpeg-devel
-BuildRequires:  libv4l-devel
-BuildRequires:  libXv-devel
+BuildRequires:  pkgconfig >= 0.9.0
 BuildRequires:  xmlto
-BuildRequires: python2-devel
+BuildRequires:  pkgconfig(ImageMagick)
 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)
 
 %description
 ZBar reads bar codes from various sources, such as video streams,
@@ -85,7 +85,8 @@
 %package -n lib%{name}qt-devel
 Summary:Development environment for the ZBar Qt bindings library
 Group:  Development/Libraries/C and C++
-Requires:   lib%{name}qt0 = %{version}, lib%{name}-devel = %{version}
+Requires:   lib%{name}-devel = %{version}
+Requires:   lib%{name}qt0 = %{version}
 
 %description -n lib%{name}qt-devel
 This package contains all necessary include files, libraries,
@@ -96,28 +97,28 @@
 %setup -q
 
 %build
-# for the Mercurial-based archive we need to get proper autoconf

commit zbar for openSUSE:Factory

2019-01-26 Thread root

Hello community,

here is the log from the commit of package zbar for openSUSE:Factory checked in 
at 2019-01-26 22:19:41

Comparing /work/SRC/openSUSE:Factory/zbar (Old)
 and  /work/SRC/openSUSE:Factory/.zbar.new.28833 (New)


Package is "zbar"

Sat Jan 26 22:19:41 2019 rev:7 rq:668153 version:0.20.1

Changes:

--- /work/SRC/openSUSE:Factory/zbar/zbar.changes2018-04-17 
11:11:23.087667111 +0200
+++ /work/SRC/openSUSE:Factory/.zbar.new.28833/zbar.changes 2019-01-26 
22:19:42.482987237 +0100
@@ -1,0 +2,14 @@
+Wed Jan 23 16:13:22 UTC 2019 - i...@paolostivanin.com
+
+- 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:

  zbar-0.20.1.tar.bz2



Other differences:
--
++ zbar.spec ++
--- /var/tmp/diff_new_pack.KQbWSo/_old  2019-01-26 22:19:42.986986828 +0100
+++ /var/tmp/diff_new_pack.KQbWSo/_new  2019-01-26 22:19:42.986986828 +0100
@@ -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 .
 #
 # All modifications and additions to the file contributed by third parties
@@ -19,29 +19,26 @@
 
 %define libname libzbar0
 Name:   zbar
-Version:0.10_2013_02_28
+Version:0.20.1
 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:http://zbar.sourceforge.net/
+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 

-Patch3: zbar-Qt5.patch
-Patch4: fix-gcc8.patch
+
 BuildRequires:  ImageMagick-devel
-# required by mercurial archive only
 BuildRequires:  autoconf
 BuildRequires:  automake
-BuildRequires:  libjpeg-devel
 BuildRequires:  libtool
 BuildRequires:  pkgconfig
+BuildRequires:  libjpeg-devel
+BuildRequires:  libv4l-devel
+BuildRequires:  libXv-devel
 BuildRequires:  xmlto
+BuildRequires: python2-devel
 BuildRequires:  pkgconfig(Qt5Core)
 BuildRequires:  pkgconfig(Qt5Gui)
 BuildRequires:  pkgconfig(Qt5Widgets)
@@ -78,46 +75,49 @@
 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}qt0 = %{version}, lib%{name}-devel = %{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
 
 %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"
+
 %configure \
   --docdir=%{_docdir}/%{name} \
   --disable-static \
+  --without-java \
   --without-python \
   --without-gtk
+
+# rpath
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+
 make %{?_smp_mflags}
 
 %install
+rm -rf %{buildroot}
 %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}/usr/share/doc/zbar-%{version}/
+rm -f

commit zbar for openSUSE:Factory

2018-04-17 Thread root

Hello community,

here is the log from the commit of package zbar for openSUSE:Factory checked in 
at 2018-04-17 11:11:18

Comparing /work/SRC/openSUSE:Factory/zbar (Old)
 and  /work/SRC/openSUSE:Factory/.zbar.new (New)


Package is "zbar"

Tue Apr 17 11:11:18 2018 rev:6 rq:595311 version:0.10_2013_02_28

Changes:

--- /work/SRC/openSUSE:Factory/zbar/zbar.changes2017-11-04 
10:24:50.812584618 +0100
+++ /work/SRC/openSUSE:Factory/.zbar.new/zbar.changes   2018-04-17 
11:11:23.087667111 +0200
@@ -1,0 +2,5 @@
+Tue Apr 10 14:25:15 UTC 2018 - mli...@suse.cz
+
+- Add fix-gcc8.patch (boo#105).
+
+---

New:

  fix-gcc8.patch



Other differences:
--
++ zbar.spec ++
--- /var/tmp/diff_new_pack.FpPIGz/_old  2018-04-17 11:11:24.267611759 +0200
+++ /var/tmp/diff_new_pack.FpPIGz/_new  2018-04-17 11:11:24.267611759 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package zbar
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 # Copyright (c) 2010 Carlos Goncalves .
 #
 # All modifications and additions to the file contributed by third parties
@@ -22,7 +22,7 @@
 Version:0.10_2013_02_28
 Release:0
 Summary:Bar code reader
-License:LGPL-2.1+
+License:LGPL-2.1-or-later
 Group:  Productivity/Other
 Url:http://zbar.sourceforge.net
 Source: %{name}-%{version}.tar.bz2
@@ -33,6 +33,7 @@
 Patch2: fix-gcc5.patch
 # PATCH-FEATURE-OPENSUSE zbar-Qt5.patch -- build against Qt5 libraries 

 Patch3: zbar-Qt5.patch
+Patch4: fix-gcc8.patch
 BuildRequires:  ImageMagick-devel
 # required by mercurial archive only
 BuildRequires:  autoconf
@@ -99,6 +100,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 # for the Mercurial-based archive we need to get proper autoconf files

++ fix-gcc8.patch ++
--- a/qt/QZBar.cpp  2018-04-10 16:20:27.946677757 +0200
+++ b/qt/QZBar.cpp  2018-04-10 16:17:21.839009342 +0200
@@ -183,7 +183,7 @@
 if(thread)
 thread->window.redraw();
 }
-catch(Exception) {
+catch(Exception *) {
 // sometimes Qt attempts to paint the widget before it's parented(?)
 // just ignore this (can't throw from event anyway)
 }
@@ -196,7 +196,7 @@
 if(thread)
 thread->window.resize(size.rwidth(), size.rheight());
 }
-catch(Exception) { /* ignore */ }
+catch(Exception *) { /* ignore */ }
 }
 
 void QZBar::changeEvent(QEvent *event)
@@ -206,7 +206,7 @@
 if(event->type() == QEvent::ParentChange)
 thread->window.attach(QX11Info::display(), winId());
 }
-catch(Exception) { /* ignore (FIXME do something w/error) */ }
+catch(Exception *) { /* ignore (FIXME do something w/error) */ }
 }
 
 void QZBar::attach ()
@@ -222,7 +222,7 @@
 if(_videoEnabled)
 thread->pushEvent(new QZBarThread::VideoDeviceEvent(_videoDevice));
 }
-catch(Exception) { /* ignore (FIXME do something w/error) */ }
+catch(Exception *) { /* ignore (FIXME do something w/error) */ }
 }
 
 void QZBar::showEvent (QShowEvent *event)

commit zbar for openSUSE:Factory

2017-11-04 Thread root

Hello community,

here is the log from the commit of package zbar for openSUSE:Factory checked in 
at 2017-11-04 10:24:20

Comparing /work/SRC/openSUSE:Factory/zbar (Old)
 and  /work/SRC/openSUSE:Factory/.zbar.new (New)


Package is "zbar"

Sat Nov  4 10:24:20 2017 rev:5 rq:538119 version:0.10_2013_02_28

Changes:

--- /work/SRC/openSUSE:Factory/zbar/zbar.changes2017-08-23 
11:52:44.727187162 +0200
+++ /work/SRC/openSUSE:Factory/.zbar.new/zbar.changes   2017-11-04 
10:24:50.812584618 +0100
@@ -1,0 +2,6 @@
+Wed Nov  1 14:50:59 UTC 2017 - mplus...@suse.com
+
+- Drop python bindings and gtk support
+- Cleanup with spec-cleaner
+
+---



Other differences:
--
++ zbar.spec ++
--- /var/tmp/diff_new_pack.4wo4Ix/_old  2017-11-04 10:24:51.288567296 +0100
+++ /var/tmp/diff_new_pack.4wo4Ix/_new  2017-11-04 10:24:51.292567151 +0100
@@ -37,15 +37,14 @@
 # required by mercurial archive only
 BuildRequires:  autoconf
 BuildRequires:  automake
-BuildRequires:  gtk2-devel
+BuildRequires:  libjpeg-devel
 BuildRequires:  libtool
-BuildRequires:  python-gtk-devel
+BuildRequires:  pkgconfig
 BuildRequires:  xmlto
 BuildRequires:  pkgconfig(Qt5Core)
 BuildRequires:  pkgconfig(Qt5Gui)
 BuildRequires:  pkgconfig(Qt5Widgets)
 BuildRequires:  pkgconfig(Qt5X11Extras)
-BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 
 %description
 ZBar reads bar codes from various sources, such as video streams,
@@ -78,14 +77,6 @@
 configuration files and development tools needed to compile and link
 applications using the zbar library.
 
-%package -n python-zbar
-Summary:ZBar Python bindings
-Group:  Productivity/Other
-%py_requires
-
-%description -n python-zbar
-This package provides ZBar Python bindings.
-
 %package -n libzbarqt0
 Summary:ZBar Qt bindings
 Group:  System/Libraries
@@ -103,32 +94,6 @@
 configuration files and development tools needed to compile and link
 applications using the zbar-qt library.
 
-%package -n libzbargtk0
-Summary:ZBar Gtk bindings
-Group:  System/Libraries
-
-%description -n libzbargtk0
-This package provides ZBar Gtk bindings.
-
-%package -n libzbargtk-devel
-Summary:Development environment for the ZBar Gtk bindings library
-Group:  Development/Libraries/C and C++
-Requires:   libzbargtk0 = %{version}
-
-%description -n libzbargtk-devel
-This package contains all necessary include files, libraries,
-configuration files and development tools needed to compile and link
-applications using the zbar-gtk library.
-
-%package -n python-zbar-gtk
-Summary:ZBar Python-Gtk bindings
-Group:  Productivity/Other
-Requires:   python-zbar = %{version}
-%py_requires
-
-%description -n python-zbar-gtk
-This package provides ZBar Python-Gtk bindings.
-
 %prep
 %setup -q
 %patch1 -p1
@@ -137,39 +102,36 @@
 
 %build
 # for the Mercurial-based archive we need to get proper autoconf files
-autoreconf -fi
+autoreconf -fiv
 # Mercurial only? - This should not be required in a final release version!
 export CFLAGS="%{optflags} -Wno-error=parentheses 
-Wno-error=deprecated-declarations"
-%configure --docdir=%{_docdir}/%{name} --disable-static
+%configure \
+  --docdir=%{_docdir}/%{name} \
+  --disable-static \
+  --without-python \
+  --without-gtk
 make %{?_smp_mflags}
 
 %install
-make %{?_smp_mflags} DESTDIR=%{buildroot} install
+%make_install
 rm %{buildroot}%{_docdir}/zbar/INSTALL
-find %{buildroot} -name '*.la' -delete
+find %{buildroot} -type f -name "*.la" -delete -print
 
 %post -n %{libname} -p /sbin/ldconfig
 %postun -n %{libname} -p /sbin/ldconfig
-
 %post -n libzbarqt0 -p /sbin/ldconfig
 %postun -n libzbarqt0 -p /sbin/ldconfig
 
-%post -n libzbargtk0 -p /sbin/ldconfig
-%postun -n libzbargtk0 -p /sbin/ldconfig
-
 %files
-%defattr(-,root,root)
 %doc ChangeLog README COPYING LICENSE NEWS
-%_defaultdocdir/%{name}/
+%{_defaultdocdir}/%{name}/
 %{_bindir}/zbar*
 %{_mandir}/man1/*
 
 %files -n %{libname}
-%defattr(-,root,root)
 %{_libdir}/libzbar.so.*
 
 %files -n lib%{name}-devel
-%defattr(-,root,root)
 %dir %{_includedir}/%{name}
 %{_includedir}/zbar.h
 %{_includedir}/%{name}/*.h
@@ -178,32 +140,12 @@
 %{_libdir}/libzbar.so
 %{_libdir}/pkgconfig/zbar.pc
 
-%files -n python-zbar
-%defattr(-,root,root)
-%{py_sitedir}/zbar.so
-
 %files -n libzbarqt0
-%defattr(-,root,root)
 %{_libdir}/libzbarqt.so.*
 
 %files -n libzbarqt-devel
-%defattr(-,root,root)
 %{_includedir}/%{name}/QZBar*.h
 %{_libdir}/libzbarqt.so
 %{_libdir}/pkgconfig/zbar-qt.pc
 
-%files -n libzbargtk0
-%defattr(-,root,root)
-%{_libdir}/libzbargtk.so.*
-
-%files -n libzbargtk-devel
-%defattr(-,root,root)
-%{_includedir}/%{name}/zbargtk.h

commit zbar for openSUSE:Factory

2017-08-23 Thread root

Hello community,

here is the log from the commit of package zbar for openSUSE:Factory checked in 
at 2017-08-23 11:52:43

Comparing /work/SRC/openSUSE:Factory/zbar (Old)
 and  /work/SRC/openSUSE:Factory/.zbar.new (New)


Package is "zbar"

Wed Aug 23 11:52:43 2017 rev:4 rq:516205 version:0.10_2013_02_28

Changes:

--- /work/SRC/openSUSE:Factory/zbar/zbar.changes2017-02-08 
10:45:25.857613406 +0100
+++ /work/SRC/openSUSE:Factory/.zbar.new/zbar.changes   2017-08-23 
11:52:44.727187162 +0200
@@ -1,0 +2,5 @@
+Sat Aug  5 19:22:42 UTC 2017 - aloi...@gmx.com
+
+- Added zbar-Qt5.patch to build against Qt5
+
+---

New:

  zbar-Qt5.patch



Other differences:
--
++ zbar.spec ++
--- /var/tmp/diff_new_pack.5mBVtW/_old  2017-08-23 11:52:45.783038530 +0200
+++ /var/tmp/diff_new_pack.5mBVtW/_new  2017-08-23 11:52:45.787037967 +0200
@@ -31,15 +31,20 @@
 Source99:   update.sh
 Patch1: fix_build.patch
 Patch2: fix-gcc5.patch
+# PATCH-FEATURE-OPENSUSE zbar-Qt5.patch -- build against Qt5 libraries 

+Patch3: zbar-Qt5.patch
 BuildRequires:  ImageMagick-devel
 # required by mercurial archive only
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  gtk2-devel
-BuildRequires:  libqt4-devel
 BuildRequires:  libtool
 BuildRequires:  python-gtk-devel
 BuildRequires:  xmlto
+BuildRequires:  pkgconfig(Qt5Core)
+BuildRequires:  pkgconfig(Qt5Gui)
+BuildRequires:  pkgconfig(Qt5Widgets)
+BuildRequires:  pkgconfig(Qt5X11Extras)
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -128,6 +133,7 @@
 %setup -q
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 # for the Mercurial-based archive we need to get proper autoconf files

++ zbar-Qt5.patch ++
Index: zbar-0.10_2013_02_28/configure.ac
===
--- zbar-0.10_2013_02_28.orig/configure.ac
+++ zbar-0.10_2013_02_28/configure.ac
@@ -468,17 +468,17 @@ AM_CONDITIONAL([HAVE_PYTHON], [test "x$w
 dnl Qt
 AC_ARG_WITH([qt],
   [AS_HELP_STRING([--without-qt],
-[disable support for Qt4 widget])],
+[disable support for Qt5 widget])],
   [],
   [with_qt="yes"])
 
 AC_ARG_VAR([MOC], [full path to Qt moc program])
 
 AS_IF([test "x$with_qt" != "xno"],
-  [PKG_CHECK_MODULES([QT], [QtCore >= 4 QtGui >= 4])
-   MOC=`$PKG_CONFIG QtGui --variable=moc_location`
+  [PKG_CHECK_MODULES([QT], [Qt5Core Qt5Gui Qt5Widgets Qt5X11Extras])
+   MOC=`$PKG_CONFIG Qt5Core --variable=host_bins`/moc
AC_MSG_NOTICE([using moc from $MOC])
-   QT_VERSION=`$PKG_CONFIG QtGui --modversion`
+   QT_VERSION=`$PKG_CONFIG Qt5Core --modversion`
AC_MSG_NOTICE([using Qt version $QT_VERSION])])
 
 AM_CONDITIONAL([HAVE_QT], [test "x$with_qt" = "xyes"])
@@ -586,9 +586,9 @@ AS_IF([test "x$with_gtk" != "xyes"],
   [echo "=> the GTK+ widget will *NOT* be built"],
   [AS_IF([test "x$with_python" != "xyes"],
  [echo "=> the PyGTK widget wrapper will *NOT* be built"])])
-echo "Qt4   --with-qt=$with_qt"
+echo "Qt5   --with-qt=$with_qt"
 AS_IF([test "x$with_qt" != "xyes"],
-  [echo "=> the Qt4 widget will *NOT* be built"])
+  [echo "=> the Qt5 widget will *NOT* be built"])
 echo "Java  --with-java=$with_java"
 AS_IF([test "x$with_java" != "xyes"],
   [echo "=> the Java interface will *NOT* be built"])
Index: zbar-0.10_2013_02_28/include/zbar/QZBarImage.h
===
--- zbar-0.10_2013_02_28.orig/include/zbar/QZBarImage.h
+++ zbar-0.10_2013_02_28/include/zbar/QZBarImage.h
@@ -54,7 +54,7 @@ public:
 unsigned height = qimg.height();
 set_size(width, height);
 set_format(zbar_fourcc('B','G','R','4'));
-unsigned long datalen = qimg.numBytes();
+unsigned long datalen = qimg.byteCount();
 set_data(qimg.bits(), datalen);
 
 if((width * 4 != bpl) ||
Index: zbar-0.10_2013_02_28/qt/QZBar.cpp
===
--- zbar-0.10_2013_02_28.orig/qt/QZBar.cpp
+++ zbar-0.10_2013_02_28/qt/QZBar.cpp
@@ -21,8 +21,8 @@
 //  http://sourceforge.net/projects/zbar
 //
 
-#include 
-#include 
+#include 
+#include 
 #include 
 #include 
 #include "QZBarThread.h"
@@ -49,7 +49,7 @@ QZBar::QZBar (QWidget *parent)
 
 thread = new QZBarThread;
 if(testAttribute(Qt::WA_WState_Created)) {
-thread->window.attach(x11Info().display(), winId());
+thread->window.attach(QX11Info::display(), winId());
 _attached = 1;
 }
 connect(thread, SIGNAL(videoOpened(bool)),

commit zbar for openSUSE:Factory

2017-02-08 Thread root

Hello community,

here is the log from the commit of package zbar for openSUSE:Factory checked in 
at 2017-02-08 10:45:24

Comparing /work/SRC/openSUSE:Factory/zbar (Old)
 and  /work/SRC/openSUSE:Factory/.zbar.new (New)


Package is "zbar"

Changes:

--- /work/SRC/openSUSE:Factory/zbar/zbar.changes2016-07-12 
23:49:31.0 +0200
+++ /work/SRC/openSUSE:Factory/.zbar.new/zbar.changes   2017-02-08 
10:45:25.857613406 +0100
@@ -1,0 +2,11 @@
+Fri Feb  3 17:10:25 UTC 2017 - jeng...@inai.de
+
+- Compact and update descriptions
+
+---
+Fri Feb  3 10:29:46 UTC 2017 - dims...@opensuse.org
+
+- Properly packaeg %_defaultdocdir: new rpm versions no longer
+  implicitly add this to the packages.
+
+---



Other differences:
--
++ zbar.spec ++
--- /var/tmp/diff_new_pack.Kx51s7/_old  2017-02-08 10:45:26.489525354 +0100
+++ /var/tmp/diff_new_pack.Kx51s7/_new  2017-02-08 10:45:26.493524797 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package zbar
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 # Copyright (c) 2010 Carlos Goncalves .
 #
 # All modifications and additions to the file contributed by third parties
@@ -43,23 +43,24 @@
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 
 %description
-ZBar 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 many popular symbologies  (types of bar codes) including EAN-13/UPC-A,
-UPC-E, EAN-8, Code 128, Code 39, Interleaved 2 of 5 and QR Code.
-
-The flexible, layered implementation facilitates bar code scanning and decoding
-for any application: use it stand-alone with the included GUI and command line
-programs, easily integrate a bar code scanning widget into your Qt, GTK+ or
-PyGTK GUI application, leverage one of the script or programming interfaces
-(Python, Perl, C++) ...all the way down to a streamlined C library suitable for
-embedded use.
+ZBar reads bar codes from various sources, such as video streams,
+image files and raw intensity sensors. It supports many symbologies
+(types of bar codes) including EAN-13/UPC-A, UPC-E, EAN-8, Code 128,
+Code 39, Interleaved 2 of 5 and QR Code.
+
+It can be used through the standalone GUI and command-line programs,
+or integrated by other programs through a library.
 
 %package -n %{libname}
-Summary:ZBar library
+Summary:Bar code reading library
 Group:  System/Libraries
 
 %description -n %{libname}
+ZBar reads bar codes from various sources, such as video streams,
+image files and raw intensity sensors. It supports many symbologies
+(types of bar codes) including EAN-13/UPC-A, UPC-E, EAN-8, Code 128,
+Code 39, Interleaved 2 of 5 and QR Code.
+
 This package provides the ZBar library.
 
 %package -n lib%{name}-devel
@@ -153,6 +154,7 @@
 %files
 %defattr(-,root,root)
 %doc ChangeLog README COPYING LICENSE NEWS
+%_defaultdocdir/%{name}/
 %{_bindir}/zbar*
 %{_mandir}/man1/*

commit zbar for openSUSE:Factory

2016-07-12 Thread h_root

Hello community,

here is the log from the commit of package zbar for openSUSE:Factory checked in 
at 2016-07-12 23:49:30

Comparing /work/SRC/openSUSE:Factory/zbar (Old)
 and  /work/SRC/openSUSE:Factory/.zbar.new (New)


Package is "zbar"

Changes:

--- /work/SRC/openSUSE:Factory/zbar/zbar.changes2016-06-14 
23:08:57.0 +0200
+++ /work/SRC/openSUSE:Factory/.zbar.new/zbar.changes   2016-07-12 
23:49:31.0 +0200
@@ -1,0 +2,5 @@
+Fri Jul  1 09:05:12 UTC 2016 - dims...@opensuse.org
+
+- Add baselibs.conf (boo#987287).
+
+---

New:

  baselibs.conf



Other differences:
--
++ zbar.spec ++
--- /var/tmp/diff_new_pack.f6IOl3/_old  2016-07-12 23:49:33.0 +0200
+++ /var/tmp/diff_new_pack.f6IOl3/_new  2016-07-12 23:49:33.0 +0200
@@ -26,6 +26,7 @@
 Group:  Productivity/Other
 Url:http://zbar.sourceforge.net
 Source: %{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

++ baselibs.conf ++
libzbar0
libzbargtk0
libzbarqt0

commit zbar for openSUSE:Factory

commit zbar for openSUSE:Factory

commit zbar for openSUSE:Factory

commit zbar for openSUSE:Factory

commit zbar for openSUSE:Factory

commit zbar for openSUSE:Factory

commit zbar for openSUSE:Factory

commit zbar for openSUSE:Factory

commit zbar for openSUSE:Factory

commit zbar for openSUSE:Factory

commit zbar for openSUSE:Factory

11 matches

Site Navigation

Mail list logo

Footer information