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.changes 2019-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 <stefan.bru...@rwth-aachen.de> + +- 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?= <stefan.bru...@rwth-aachen.de> 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
