[packages/zinnia] - rel 11

[arekm]

commit f0eb3cb5f20610e07b5f89136dfdbfe1fc89615b
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Wed Jun 28 13:56:44 2017 +0200

    - rel 11

 zinnia-fixes-gcc6-compile.patch | 22 ++++++++++++++++++++++
 zinnia.spec                     |  4 +++-
 2 files changed, 25 insertions(+), 1 deletion(-)
---
diff --git a/zinnia.spec b/zinnia.spec
index 74c0f6a..7d71554 100644
--- a/zinnia.spec
+++ b/zinnia.spec
@@ -9,7 +9,7 @@ Summary:	Online handwriting recognition system with machine learning
 Summary(pl.UTF-8):	System rozpoznawania pisma ręcznego z uczeniem maszynowym
 Name:		zinnia
 Version:	0.06
-Release:	10
+Release:	11
 License:	BSD
 Group:		Libraries
 Source0:	http://downloads.sourceforge.net/zinnia/%{name}-%{version}.tar.gz
@@ -18,6 +18,7 @@ Source0:	http://downloads.sourceforge.net/zinnia/%{name}-%{version}.tar.gz
 Source1:	tomoe2s.pl
 Source2:	Makefile.tomoe
 Patch0:		%{name}-gcc.patch
+Patch1:		zinnia-fixes-gcc6-compile.patch
 URL:		http://zinnia.sourceforge.net/
 BuildRequires:	db-devel
 BuildRequires:	libstdc++-devel
@@ -153,6 +154,7 @@ Ten pakiet zawiera pliki modelu Tomoe dla biblioteki Zinnia.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %{__rm} python/zinnia.pyc
 
diff --git a/zinnia-fixes-gcc6-compile.patch b/zinnia-fixes-gcc6-compile.patch
new file mode 100644
index 0000000..848f306
--- /dev/null
+++ b/zinnia-fixes-gcc6-compile.patch
@@ -0,0 +1,22 @@
+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;
+   }
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/zinnia.git/commitdiff/f0eb3cb5f20610e07b5f89136dfdbfe1fc89615b