commit: 3e10135aa9dcc539f7b7bae6b0bbddb0cd34c1b9 Author: Peter-Levine <plevine457 <AT> gmail <DOT> com> AuthorDate: Fri Apr 7 22:13:13 2017 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Sun Apr 16 18:57:44 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e10135a
games-puzzle/cuyo: Fix building with GCC-6 (bug #614366) Package-Manager: Portage-2.3.5, Repoman-2.3.2 Closes: https://github.com/gentoo/gentoo/pull/4385 games-puzzle/cuyo/cuyo-2.1.1.ebuild | 5 +-- games-puzzle/cuyo/files/cuyo-2.1.1-gcc6.patch | 45 +++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 2 deletions(-) diff --git a/games-puzzle/cuyo/cuyo-2.1.1.ebuild b/games-puzzle/cuyo/cuyo-2.1.1.ebuild index c4fa72e8962..76714e98faa 100644 --- a/games-puzzle/cuyo/cuyo-2.1.1.ebuild +++ b/games-puzzle/cuyo/cuyo-2.1.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -26,7 +26,8 @@ S=${WORKDIR}/${MY_P} src_prepare() { epatch \ "${FILESDIR}"/${P}-gcc44.patch \ - "${FILESDIR}"/${P}-gentoo.patch + "${FILESDIR}"/${P}-gentoo.patch \ + "${FILESDIR}"/${P}-gcc6.patch eautoreconf } diff --git a/games-puzzle/cuyo/files/cuyo-2.1.1-gcc6.patch b/games-puzzle/cuyo/files/cuyo-2.1.1-gcc6.patch new file mode 100644 index 00000000000..b1ba5b535de --- /dev/null +++ b/games-puzzle/cuyo/files/cuyo-2.1.1-gcc6.patch @@ -0,0 +1,45 @@ +--- a/src/pfaditerator.h ++++ b/src/pfaditerator.h +@@ -21,6 +21,11 @@ + #include "stringzeug.h" + + ++#if __cplusplus >= 201103L ++#define NOEXCEPT noexcept(false) ++#else ++#define NOEXCEPT ++#endif + + + /** Iteriert durch alle Pfade, an denen sich eine +@@ -43,7 +48,7 @@ + class PfadIterator { + public: + PfadIterator(Str dat, bool auch_gz = false, bool setzDefault = false); +- ~PfadIterator(); ++ ~PfadIterator() NOEXCEPT; + + /** N�chster Pfad */ + PfadIterator & operator++(); +--- a/src/pfaditerator.cpp ++++ b/src/pfaditerator.cpp +@@ -48,7 +48,7 @@ + -1 und f�hren dann gleich ein ++ aus. */ + ++(*this); + } +-PfadIterator::~PfadIterator() { ++PfadIterator::~PfadIterator() NOEXCEPT { + /** Soll der default-Pfad gesetzt werden? */ + if (mSetzDefault) { + +--- a/src/xpmladen.cpp ++++ b/src/xpmladen.cpp +@@ -314,7 +314,7 @@ + try { + + /* Datei laden. Dabei werden gDatAnfang und gDatEnde gesetzt. */ +- if (!ladeDatei(na)) return false; ++ if (!ladeDatei(na)) return NULL; + + + gDatBei = gDatAnfang;
