diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2017-04-04 13:39:43 +0200 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2017-04-04 14:05:05 +0200 |
| commit | a26ff10dea6f27acfedcd3e288f7c278dfd118cd (patch) | |
| tree | 8cf76bff1e32633da92e4d82c552c5890d510c74 | |
| parent | dev-perl/App-cpanminus: Bump to version 1.704.300 (diff) | |
| download | gentoo-a26ff10d.tar.gz gentoo-a26ff10d.tar.bz2 gentoo-a26ff10d.zip | |
app-i18n/zinnia: Fix gcc6 support, bug #594048 by milan hodoscek and Peter Levine.
Package-Manager: Portage-2.3.5, Repoman-2.3.2
| -rw-r--r-- | app-i18n/zinnia/files/zinnia-0.06-gcc6.patch | 13 | ||||
| -rw-r--r-- | app-i18n/zinnia/zinnia-0.06-r3.ebuild | 3 |
2 files changed, 15 insertions, 1 deletions
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 000000000000..f6ea7e19e19c --- /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 bd046fc8a32c..660166d01089 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 |