[arch-commits] Commit in zinnia/trunk (PKGBUILD zinnia-gcc6.patch)

[Antonio Rojas]

    Date: Friday, June 8, 2018 @ 22:24:25
  Author: arojas
Revision: 342073

BUILDINFO rebuild

Added:
  zinnia/trunk/zinnia-gcc6.patch
Modified:
  zinnia/trunk/PKGBUILD

-------------------+
 PKGBUILD          |   18 ++++++++++++------
 zinnia-gcc6.patch |   21 +++++++++++++++++++++
 2 files changed, 33 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-06-08 20:06:04 UTC (rev 342072)
+++ PKGBUILD	2018-06-08 22:24:25 UTC (rev 342073)
@@ -4,18 +4,24 @@
 
 pkgname=zinnia
 pkgver=0.06
-pkgrel=4
+pkgrel=5
 pkgdesc="Simple, customizable and portable online hand recognition system based on Support Vector Machines"
 arch=('x86_64')
 url="http://zinnia.sourceforge.net/"
 license=('BSD')
 depends=('gcc-libs')
-makedepends=('libtool')
-source=("http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz")
-sha256sums=('ece3af93f937282971634fd81d3e997f848e8cfa958220e26a4564ca064ac20b')
+source=("http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz"
+        zinnia-gcc6.patch)
+sha256sums=('ece3af93f937282971634fd81d3e997f848e8cfa958220e26a4564ca064ac20b'
+            'f27cc4bd687d4c66525f744315c53caa537f1998dd546ffba9ef337e033854e6')
 
+prepare() {
+  cd $pkgname-$pkgver
+  patch -p1 -i ../zinnia-gcc6.patch # Fix build with GCC 6 (Debian)
+}
+
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
 
   ./configure --prefix=/usr
   make
@@ -22,7 +28,7 @@
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
 
   make DESTDIR="$pkgdir" install
   install -Dm644 "$srcdir/$pkgname-$pkgver/COPYING" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"

Added: zinnia-gcc6.patch
===================================================================
--- zinnia-gcc6.patch	                        (rev 0)
+++ zinnia-gcc6.patch	2018-06-08 22:24:25 UTC (rev 342073)
@@ -0,0 +1,21 @@
+--- a/trainer.cpp
++++ b/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;
+   }
+ 
+