| 1 |
commit: 10c51f9115f067ab2368160dd95fb9308504329d |
| 2 |
Author: Peter Levine <plevine457 <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Thu Jul 20 23:26:03 2017 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jul 30 09:09:04 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10c51f91 |
| 7 |
|
| 8 |
games-strategy/asc: Fix building with -Werror=terminate |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/show_bug.cgi?id=612934 |
| 11 |
Package-Manager: Portage-2.3.6, Repoman-2.3.2 |
| 12 |
Closes: https://github.com/gentoo/gentoo/pull/5153 |
| 13 |
|
| 14 |
games-strategy/asc/asc-2.6.0.0-r1.ebuild | 4 ++- |
| 15 |
.../files/asc-2.6.0.0-gcc6-nothrow-in-dtors.patch | 32 ++++++++++++++++++++++ |
| 16 |
2 files changed, 35 insertions(+), 1 deletion(-) |
| 17 |
|
| 18 |
diff --git a/games-strategy/asc/asc-2.6.0.0-r1.ebuild b/games-strategy/asc/asc-2.6.0.0-r1.ebuild |
| 19 |
index 5a2924c7469..b70bbe1c2dc 100644 |
| 20 |
--- a/games-strategy/asc/asc-2.6.0.0-r1.ebuild |
| 21 |
+++ b/games-strategy/asc/asc-2.6.0.0-r1.ebuild |
| 22 |
@@ -1,4 +1,4 @@ |
| 23 |
-# Copyright 1999-2015 Gentoo Foundation |
| 24 |
+# Copyright 1999-2017 Gentoo Foundation |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
|
| 27 |
EAPI=5 |
| 28 |
@@ -37,6 +37,8 @@ DEPEND="${RDEPEND} |
| 29 |
virtual/pkgconfig |
| 30 |
app-arch/zip" |
| 31 |
|
| 32 |
+PATCHES=( "${FILESDIR}/"/${P}-gcc6-nothrow-in-dtors.patch ) |
| 33 |
+ |
| 34 |
src_unpack() { |
| 35 |
local f |
| 36 |
|
| 37 |
|
| 38 |
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 |
| 39 |
new file mode 100644 |
| 40 |
index 00000000000..e710b22f8c8 |
| 41 |
--- /dev/null |
| 42 |
+++ b/games-strategy/asc/files/asc-2.6.0.0-gcc6-nothrow-in-dtors.patch |
| 43 |
@@ -0,0 +1,32 @@ |
| 44 |
+Bug: https://bugs.gentoo.org/612934 |
| 45 |
+Upstream Bug: https://sourceforge.net/p/asc-hq/patches/2/ |
| 46 |
+ |
| 47 |
+--- a/source/basestrm.cpp |
| 48 |
++++ b/source/basestrm.cpp |
| 49 |
+@@ -1728,7 +1728,6 @@ |
| 50 |
+ } |
| 51 |
+ } catch ( ... ) { |
| 52 |
+ displayLogMessage( 9, ASCString("~tn_c_lzw_filestream : caught exception") ); |
| 53 |
+- throw; |
| 54 |
+ } |
| 55 |
+ } |
| 56 |
+ |
| 57 |
+--- a/source/simplestream.cpp |
| 58 |
++++ b/source/simplestream.cpp |
| 59 |
+@@ -43,6 +43,7 @@ |
| 60 |
+ #endif |
| 61 |
+ #endif |
| 62 |
+ |
| 63 |
++#include "util/messaginghub.h" |
| 64 |
+ |
| 65 |
+ tnbufstream::tnbufstream ( ) |
| 66 |
+ { |
| 67 |
+@@ -270,7 +271,7 @@ |
| 68 |
+ |
| 69 |
+ int res = fclose( fp ); |
| 70 |
+ if ( res != 0 ) |
| 71 |
+- throw tfileerror ( getDeviceName() + " : " + strerror(errno)); |
| 72 |
++ displayLogMessage( 9, ASCString( getDeviceName() + " : " + strerror(errno) ) ); |
| 73 |
+ |
| 74 |
+ _mode = uninitialized; |
| 75 |
+ |
Archives