Hello community, here is the log from the commit of package zinnia for openSUSE:Factory checked in at 2016-06-20 11:07:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/zinnia (Old) and /work/SRC/openSUSE:Factory/.zinnia.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "zinnia" Changes: -------- --- /work/SRC/openSUSE:Factory/zinnia/zinnia.changes 2013-03-15 10:50:20.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.zinnia.new/zinnia.changes 2016-06-20 11:07:04.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Jun 17 13:27:42 UTC 2016 - [email protected] + +- fix boo#985148: GCC6: zinnia fails to build +- add patch: zinnia-gcc6.patch + * fix no matching function for call to 'make_pair' error + +------------------------------------------------------------------- New: ---- zinnia-gcc6.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zinnia.spec ++++++ --- /var/tmp/diff_new_pack.icp2tA/_old 2016-06-20 11:07:05.000000000 +0200 +++ /var/tmp/diff_new_pack.icp2tA/_new 2016-06-20 11:07:05.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package zinnia # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,18 +16,19 @@ # -%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} - +%{!?python_sitearch: %global python_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} Name: zinnia Version: 0.06 Release: 0 Summary: Online hand recognition system with machine learning License: BSD-3-Clause Group: System/Libraries -Url: http://zinnia.sourceforge.net/ +Url: http://taku910.github.io/zinnia Source0: %{name}-%{version}.tar.gz Patch0: optflags-fixes.diff Patch1: zinnia-automake-1.13.patch +# PATCH-FIX-UPSTREAM fix compile with gcc 6.0 +Patch2: zinnia-gcc6.patch BuildRequires: gcc-c++ BuildRequires: libtool BuildRequires: pkg-config @@ -37,7 +38,6 @@ %description Zinnia is a simple, customizable and portable online hand recognition system based on Support Vector Machines. Zinnia simply receives user pen strokes as a sequence of coordinate data and outputs n-best characters sorted by SVM confidence. To keep portability, Zinnia doesn\'t have any rendering functionality. In addition to recognition, Zinnia provides training module that allows us to create any hand-written recognition systems with low-cost. - %package -n libzinnia0 Summary: Shared library for zinnia Group: System/Libraries @@ -45,7 +45,6 @@ %description -n libzinnia0 This package contains shared libraries used by zinnia. - %package devel Summary: Development files for zinnia Group: Development/Libraries/C and C++ @@ -55,7 +54,6 @@ The zinnia-devel package contains libraries and header files for developing applications that use zinnia. - %package -n python-zinnia Summary: Python bindings for zinnia Group: Development/Languages/Python @@ -64,11 +62,11 @@ %description -n python-zinnia This package contains python bindings for zinnia. - %prep %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build autoreconf -fi @@ -76,8 +74,8 @@ make %{?_smp_mflags} %install -make install DESTDIR="%buildroot" -rm -f %{buildroot}%{_libdir}/lib*.la +make %{?_smp_mflags} DESTDIR=%{buildroot} install +find %{buildroot} -type f -name "*.la" -delete -print cd python CFLAGS="%{optflags} -I../" LDFLAGS="-L../.libs" \ @@ -90,18 +88,21 @@ %defattr(-, root, root) %doc README COPYING AUTHORS %doc doc -%{_bindir}/* +%{_bindir}/zinnia +%{_bindir}/zinnia_learn +%{_bindir}/zinnia_convert %files -n libzinnia0 %defattr(-,root,root) -%{_libdir}/libzinnia*.so.* +%{_libdir}/libzinnia.so.0 +%{_libdir}/libzinnia.so.0.0.0 %files devel %defattr(-,root,root) %{_includedir}/zinnia.h %{_includedir}/zinnia -%{_libdir}/libzinnia*.so -%{_libdir}/pkgconfig/*.pc +%{_libdir}/libzinnia.so +%{_libdir}/pkgconfig/zinnia.pc %files -n python-zinnia %defattr (-,root,root) ++++++ zinnia-gcc6.patch ++++++ Index: zinnia-0.06/trainer.cpp =================================================================== --- zinnia-0.06.orig/trainer.cpp +++ zinnia-0.06/trainer.cpp @@ -93,7 +93,7 @@ class TrainerImpl: public Trainer { public: bool add(const Character &character) { - const std::string y = character.value(); + std::string y = character.value(); CHECK_FALSE(!y.empty()) << "input character is empty"; Features features; CHECK_FALSE(features.read(character)) << "cannot read character: " << y; @@ -103,7 +103,7 @@ class TrainerImpl: public Trainer { if (!fn) { return false; } - x_.push_back(std::make_pair<std::string, FeatureNode *>(y, fn)); + x_.push_back(std::make_pair(y, fn)); return true; }
