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

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 5a2924c746900aaa3d3d5b7a5a95ae941fc79ced..b70bbe1c2dccfebdcdee86b6ffc06135f8c39ae9 100644 (file)
--- 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 (file)
index 0000000..e710b22
--- /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;
+