[gentoo-commits] repo/gentoo:master commit in: app-i18n/zinnia/, app-i18n/zinnia/files/

[gentoo-commits] repo/gentoo:master commit in: app-i18n/zinnia/, app-i18n/zinnia/files/

[Pacho Ramos]

commit:     a26ff10dea6f27acfedcd3e288f7c278dfd118cd
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Tue Apr  4 11:39:43 2017 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Tue Apr  4 12:05:05 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a26ff10d

app-i18n/zinnia: Fix gcc6 support, bug #594048 by milan hodoscek and Peter Levine.

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 app-i18n/zinnia/files/zinnia-0.06-gcc6.patch | 13 +++++++++++++
 app-i18n/zinnia/zinnia-0.06-r3.ebuild        |  3 ++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/app-i18n/zinnia/files/zinnia-0.06-gcc6.patch b/app-i18n/zinnia/files/zinnia-0.06-gcc6.patch
new file mode 100644
index 00000000000..f6ea7e19e19
--- /dev/null
+++ b/app-i18n/zinnia/files/zinnia-0.06-gcc6.patch
@@ -0,0 +1,13 @@
+diff --git a/old/trainer.cpp b/zinnia-0.06/trainer.cpp
+index fdb044c..8b21e6c 100644
+--- a/old/trainer.cpp
++++ b/zinnia-0.06/trainer.cpp
+@@ -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;
+   }
+ 

diff --git a/app-i18n/zinnia/zinnia-0.06-r3.ebuild b/app-i18n/zinnia/zinnia-0.06-r3.ebuild
index bd046fc8a32..660166d0108 100644
--- a/app-i18n/zinnia/zinnia-0.06-r3.ebuild
+++ b/app-i18n/zinnia/zinnia-0.06-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -18,6 +18,7 @@ DOCS=( AUTHORS ChangeLog NEWS README )
 PATCHES=(
 	"${FILESDIR}/${P}-ricedown.patch"
 	"${FILESDIR}/${P}-perl.patch"
+	"${FILESDIR}/${P}-gcc6.patch"
 )
 AUTOTOOLS_AUTORECONF=yes
 

[gentoo-commits] repo/gentoo:master commit in: app-i18n/zinnia/, app-i18n/zinnia/files/

[Akinori Hattori]

commit:     dac1e7a53f3c93cfed7cb0cec030be8ceb47233f
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Wed Nov  3 12:45:38 2021 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Wed Nov  3 12:47:51 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dac1e7a5

app-i18n/zinnia: update patches

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>

 .../files/{zinnia-0.06-c++-2011.patch => zinnia-0.06-c++11.patch} | 4 ++--
 app-i18n/zinnia/files/zinnia-0.06-flags.patch                     | 4 ++--
 .../{zinnia-0.06-perl_build.patch => zinnia-0.06-perl.patch}      | 4 ++--
 app-i18n/zinnia/zinnia-0.06-r3.ebuild                             | 8 ++++----
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app-i18n/zinnia/files/zinnia-0.06-c++-2011.patch b/app-i18n/zinnia/files/zinnia-0.06-c++11.patch
similarity index 84%
rename from app-i18n/zinnia/files/zinnia-0.06-c++-2011.patch
rename to app-i18n/zinnia/files/zinnia-0.06-c++11.patch
index 0ef6ae40e43..66a78a5a699 100644
--- a/app-i18n/zinnia/files/zinnia-0.06-c++-2011.patch
+++ b/app-i18n/zinnia/files/zinnia-0.06-c++11.patch
@@ -1,5 +1,5 @@
---- /trainer.cpp
-+++ /trainer.cpp
+--- a/trainer.cpp
++++ b/trainer.cpp
 @@ -103,7 +103,7 @@
      if (!fn) {
        return false;

diff --git a/app-i18n/zinnia/files/zinnia-0.06-flags.patch b/app-i18n/zinnia/files/zinnia-0.06-flags.patch
index 80442ee4880..5c26415f601 100644
--- a/app-i18n/zinnia/files/zinnia-0.06-flags.patch
+++ b/app-i18n/zinnia/files/zinnia-0.06-flags.patch
@@ -1,5 +1,5 @@
---- /configure.in
-+++ /configure.in
+--- a/configure.in
++++ b/configure.in
 @@ -59,15 +59,6 @@
  AC_SUBST([pkgconfigdir])
  AC_MSG_NOTICE([pkgconfig directory is ${pkgconfigdir}])

diff --git a/app-i18n/zinnia/files/zinnia-0.06-perl_build.patch b/app-i18n/zinnia/files/zinnia-0.06-perl.patch
similarity index 86%
rename from app-i18n/zinnia/files/zinnia-0.06-perl_build.patch
rename to app-i18n/zinnia/files/zinnia-0.06-perl.patch
index 4da9e1eeb90..02d52faf93a 100644
--- a/app-i18n/zinnia/files/zinnia-0.06-perl_build.patch
+++ b/app-i18n/zinnia/files/zinnia-0.06-perl.patch
@@ -1,5 +1,5 @@
---- /perl/Makefile.PL
-+++ /perl/Makefile.PL
+--- a/perl/Makefile.PL
++++ b/perl/Makefile.PL
 @@ -4,7 +4,7 @@
      'CC'                => 'c++',
      'LD'                => 'c++',

diff --git a/app-i18n/zinnia/zinnia-0.06-r3.ebuild b/app-i18n/zinnia/zinnia-0.06-r3.ebuild
index 70d37abf609..3dd317b48c5 100644
--- a/app-i18n/zinnia/zinnia-0.06-r3.ebuild
+++ b/app-i18n/zinnia/zinnia-0.06-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2010-2020 Gentoo Authors
+# Copyright 2010-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -15,9 +15,9 @@ KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="perl static-libs"
 
 PATCHES=(
-	"${FILESDIR}/${P}-flags.patch"
-	"${FILESDIR}/${P}-perl_build.patch"
-	"${FILESDIR}/${P}-c++-2011.patch"
+	"${FILESDIR}"/${P}-c++11.patch
+	"${FILESDIR}"/${P}-flags.patch
+	"${FILESDIR}"/${P}-perl.patch
 )
 
 DOCS=(AUTHORS)