commit: d2a9c04e4bcf134f3013caabc4cecdf6aa386c8f Author: Peter Levine <plevine457 <AT> gmail <DOT> com> AuthorDate: Mon Jul 31 02:32:23 2017 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Sun Aug 13 11:10:26 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2a9c04e
dev-util/nemiver: Fix building with -Werror=terminate using GCC-6 Bug: https://bugs.gentoo.org/show_bug.cgi?id=602436 Package-Manager: Portage-2.3.6, Repoman-2.3.2 Closes: https://github.com/gentoo/gentoo/pull/5250 .../files/nemiver-0.9.6-gcc6-throw-in-dtors.patch | 73 ++++++++++++++++++++++ dev-util/nemiver/nemiver-0.9.6.ebuild | 5 +- 2 files changed, 77 insertions(+), 1 deletion(-) diff --git a/dev-util/nemiver/files/nemiver-0.9.6-gcc6-throw-in-dtors.patch b/dev-util/nemiver/files/nemiver-0.9.6-gcc6-throw-in-dtors.patch new file mode 100644 index 00000000000..91d90961cb4 --- /dev/null +++ b/dev-util/nemiver/files/nemiver-0.9.6-gcc6-throw-in-dtors.patch @@ -0,0 +1,73 @@ +Bug: https://bugs.gentoo.org/602436 +Upstream PR: https://github.com/GNOME/nemiver/pull/3 + +--- a/src/common/nmv-api-macros.h ++++ b/src/common/nmv-api-macros.h +@@ -52,5 +52,12 @@ + # define NEMIVER_PURE_IFACE + # define NEMIVER_API + # endif //HAS_GCC_VISIBILITY_SUPPORT ++ ++# if __cplusplus >= 201103L ++# define DTOR_NOEXCEPT noexcept(false) ++# else ++# define DTOR_NOEXCEPT ++# endif //__cplusplus >= 201103L ++ + #endif + +--- a/src/common/nmv-log-stream.cc ++++ b/src/common/nmv-log-stream.cc +@@ -393,7 +393,7 @@ + } + } + +-LogStream::~LogStream () ++LogStream::~LogStream () DTOR_NOEXCEPT + { + LOG_D ("delete", "destructor-domain"); + if (!m_priv) throw runtime_error ("double free in LogStrea::~LogStream"); +--- a/src/common/nmv-log-stream.h ++++ b/src/common/nmv-log-stream.h +@@ -151,7 +151,7 @@ + const string &a_default_domain=NMV_GENERAL_DOMAIN); + + /// \brief destructor of the log stream class +- virtual ~LogStream (); ++ virtual ~LogStream () DTOR_NOEXCEPT; + + /// \brief enable or disable logging for a domain + /// \param a_domain the domain to enable logging for +--- a/src/common/nmv-object.cc ++++ b/src/common/nmv-object.cc +@@ -68,7 +68,7 @@ + return *this; + } + +-Object::~Object () ++Object::~Object () DTOR_NOEXCEPT + { + } + +--- a/src/common/nmv-object.h ++++ b/src/common/nmv-object.h +@@ -54,7 +54,7 @@ + + Object& operator= (Object const&); + +- virtual ~Object (); ++ virtual ~Object () DTOR_NOEXCEPT; + + void ref (); + +--- a/src/common/nmv-transaction.h ++++ b/src/common/nmv-transaction.h +@@ -116,7 +116,7 @@ + return m_trans; + } + +- ~TransactionAutoHelper () ++ ~TransactionAutoHelper () DTOR_NOEXCEPT + { + if (m_ignore) { + return; diff --git a/dev-util/nemiver/nemiver-0.9.6.ebuild b/dev-util/nemiver/nemiver-0.9.6.ebuild index fc9c1fb2667..b5d54807fe3 100644 --- a/dev-util/nemiver/nemiver-0.9.6.ebuild +++ b/dev-util/nemiver/nemiver-0.9.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -44,6 +44,9 @@ PATCHES=( # Fix compiliation warnings & errors, fixed in next version "${FILESDIR}/${P}-fix-build.patch" + + # Fix building with GCC-6 and CXXFLAGS="-Werror=terminate" + "${FILESDIR}/${P}-gcc6-throw-in-dtors.patch" ) src_configure() {
