[arch-commits] Commit in zinnia/repos/community-x86_64 (3 files)

[Antonio Rojas]

    Date: Friday, June 8, 2018 @ 22:24:47
  Author: arojas
Revision: 342074

archrelease: copy trunk to community-x86_64

Added:
  zinnia/repos/community-x86_64/PKGBUILD
    (from rev 342073, zinnia/trunk/PKGBUILD)
  zinnia/repos/community-x86_64/zinnia-gcc6.patch
    (from rev 342073, zinnia/trunk/zinnia-gcc6.patch)
Deleted:
  zinnia/repos/community-x86_64/PKGBUILD

-------------------+
 PKGBUILD          |   64 ++++++++++++++++++++++++++++------------------------
 zinnia-gcc6.patch |   21 +++++++++++++++++
 2 files changed, 56 insertions(+), 29 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2018-06-08 22:24:25 UTC (rev 342073)
+++ PKGBUILD	2018-06-08 22:24:47 UTC (rev 342074)
@@ -1,29 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at gmail.com>
-# Contributor: Humbert Julien <julroy67 [AT] gmail.com>
-
-pkgname=zinnia
-pkgver=0.06
-pkgrel=4
-pkgdesc="Simple, customizable and portable online hand recognition system based on Support Vector Machines"
-arch=('i686' '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')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-  install -Dm644 "$srcdir/$pkgname-$pkgver/COPYING" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}

Copied: zinnia/repos/community-x86_64/PKGBUILD (from rev 342073, zinnia/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-06-08 22:24:47 UTC (rev 342074)
@@ -0,0 +1,35 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at gmail.com>
+# Contributor: Humbert Julien <julroy67 [AT] gmail.com>
+
+pkgname=zinnia
+pkgver=0.06
+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')
+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 $pkgname-$pkgver
+
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+
+  make DESTDIR="$pkgdir" install
+  install -Dm644 "$srcdir/$pkgname-$pkgver/COPYING" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}

Copied: zinnia/repos/community-x86_64/zinnia-gcc6.patch (from rev 342073, zinnia/trunk/zinnia-gcc6.patch)
===================================================================
--- zinnia-gcc6.patch	                        (rev 0)
+++ zinnia-gcc6.patch	2018-06-08 22:24:47 UTC (rev 342074)
@@ -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;
+   }
+ 
+