diff options
| author |   Peter Levine <plevine457@gmail.com> | 2017-07-20 19:26:03 -0400 |
|---|---|---|
| committer |   David Seifert <soap@gentoo.org> | 2017-07-30 11:09:04 +0200 |
| commit | 10c51f9115f067ab2368160dd95fb9308504329d (patch) | |
| tree | 77b3f810fe44c79d28774017c69ccf4485da91b6 /games-strategy | |
| parent | media-gfx/opentoonz: Fix building with GCC-6 (diff) | |
| download | gentoo-10c51f9115f067ab2368160dd95fb9308504329d.tar.gz gentoo-10c51f9115f067ab2368160dd95fb9308504329d.tar.bz2 gentoo-10c51f9115f067ab2368160dd95fb9308504329d.zip | |
games-strategy/asc: Fix building with -Werror=terminate
Bug: https://bugs.gentoo.org/show_bug.cgi?id=612934
Package-Manager: Portage-2.3.6, Repoman-2.3.2
Closes: https://github.com/gentoo/gentoo/pull/5153
Diffstat (limited to 'games-strategy')
| -rw-r--r-- | games-strategy/asc/asc-2.6.0.0-r1.ebuild | 4 | ||||
| -rw-r--r-- | games-strategy/asc/files/asc-2.6.0.0-gcc6-nothrow-in-dtors.patch | 32 |
2 files changed, 35 insertions, 1 deletions
diff --git a/games-strategy/asc/asc-2.6.0.0-r1.ebuild b/games-strategy/asc/asc-2.6.0.0-r1.ebuild index 5a2924c74690..b70bbe1c2dcc 100644 --- a/games-strategy/asc/asc-2.6.0.0-r1.ebuild +++ b/games-strategy/asc/asc-2.6.0.0-r1.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 @@ -37,6 +37,8 @@ DEPEND="${RDEPEND} virtual/pkgconfig app-arch/zip" +PATCHES=( "${FILESDIR}/"/${P}-gcc6-nothrow-in-dtors.patch ) + src_unpack() { local f diff --git a/games-strategy/asc/files/asc-2.6.0.0-gcc6-nothrow-in-dtors.patch b/games-strategy/asc/files/asc-2.6.0.0-gcc6-nothrow-in-dtors.patch new file mode 100644 index 000000000000..e710b22f8c8b --- /dev/null +++ b/games-strategy/asc/files/asc-2.6.0.0-gcc6-nothrow-in-dtors.patch @@ -0,0 +1,32 @@ +Bug: https://bugs.gentoo.org/612934 +Upstream Bug: https://sourceforge.net/p/asc-hq/patches/2/ + +--- a/source/basestrm.cpp ++++ b/source/basestrm.cpp +@@ -1728,7 +1728,6 @@ + } + } catch ( ... ) { + displayLogMessage( 9, ASCString("~tn_c_lzw_filestream : caught exception") ); +- throw; + } + } + +--- a/source/simplestream.cpp ++++ b/source/simplestream.cpp +@@ -43,6 +43,7 @@ + #endif + #endif + ++#include "util/messaginghub.h" + + tnbufstream::tnbufstream ( ) + { +@@ -270,7 +271,7 @@ + + int res = fclose( fp ); + if ( res != 0 ) +- throw tfileerror ( getDeviceName() + " : " + strerror(errno)); ++ displayLogMessage( 9, ASCString( getDeviceName() + " : " + strerror(errno) ) ); + + _mode = uninitialized; + |