| 1 |
commit: a26ff10dea6f27acfedcd3e288f7c278dfd118cd |
| 2 |
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Apr 4 11:39:43 2017 +0000 |
| 4 |
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Apr 4 12:05:05 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a26ff10d |
| 7 |
|
| 8 |
app-i18n/zinnia: Fix gcc6 support, bug #594048 by milan hodoscek and Peter Levine. |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.5, Repoman-2.3.2 |
| 11 |
|
| 12 |
app-i18n/zinnia/files/zinnia-0.06-gcc6.patch | 13 +++++++++++++ |
| 13 |
app-i18n/zinnia/zinnia-0.06-r3.ebuild | 3 ++- |
| 14 |
2 files changed, 15 insertions(+), 1 deletion(-) |
| 15 |
|
| 16 |
diff --git a/app-i18n/zinnia/files/zinnia-0.06-gcc6.patch b/app-i18n/zinnia/files/zinnia-0.06-gcc6.patch |
| 17 |
new file mode 100644 |
| 18 |
index 00000000000..f6ea7e19e19 |
| 19 |
--- /dev/null |
| 20 |
+++ b/app-i18n/zinnia/files/zinnia-0.06-gcc6.patch |
| 21 |
@@ -0,0 +1,13 @@ |
| 22 |
+diff --git a/old/trainer.cpp b/zinnia-0.06/trainer.cpp |
| 23 |
+index fdb044c..8b21e6c 100644 |
| 24 |
+--- a/old/trainer.cpp |
| 25 |
++++ b/zinnia-0.06/trainer.cpp |
| 26 |
+@@ -103,7 +103,7 @@ class TrainerImpl: public Trainer { |
| 27 |
+ if (!fn) { |
| 28 |
+ return false; |
| 29 |
+ } |
| 30 |
+- x_.push_back(std::make_pair<std::string, FeatureNode *>(y, fn)); |
| 31 |
++ x_.push_back(std::make_pair(y, fn)); |
| 32 |
+ return true; |
| 33 |
+ } |
| 34 |
+ |
| 35 |
|
| 36 |
diff --git a/app-i18n/zinnia/zinnia-0.06-r3.ebuild b/app-i18n/zinnia/zinnia-0.06-r3.ebuild |
| 37 |
index bd046fc8a32..660166d0108 100644 |
| 38 |
--- a/app-i18n/zinnia/zinnia-0.06-r3.ebuild |
| 39 |
+++ b/app-i18n/zinnia/zinnia-0.06-r3.ebuild |
| 40 |
@@ -1,4 +1,4 @@ |
| 41 |
-# Copyright 1999-2014 Gentoo Foundation |
| 42 |
+# Copyright 1999-2017 Gentoo Foundation |
| 43 |
# Distributed under the terms of the GNU General Public License v2 |
| 44 |
|
| 45 |
EAPI=5 |
| 46 |
@@ -18,6 +18,7 @@ DOCS=( AUTHORS ChangeLog NEWS README ) |
| 47 |
PATCHES=( |
| 48 |
"${FILESDIR}/${P}-ricedown.patch" |
| 49 |
"${FILESDIR}/${P}-perl.patch" |
| 50 |
+ "${FILESDIR}/${P}-gcc6.patch" |
| 51 |
) |
| 52 |
AUTOTOOLS_AUTORECONF=yes |
Archives