From e9a14bea18c4d4ef7948b5386de701e422583d61 Mon Sep 17 00:00:00 2001 From: Peter-Levine Date: Mon, 27 Mar 2017 21:07:02 -0400 Subject: [PATCH] media-tv/me-tv: Fix building with GCC6 and -Werror=terminate (bug #613426) Package-Manager: Portage-2.3.5, Repoman-2.3.2 Closes: https://github.com/gentoo/gentoo/pull/4308 --- ...-1.4.0.10-C++11-throw-in-destructors.patch | 35 +++++++++++++++++++ media-tv/me-tv/me-tv-1.4.0.10.ebuild | 3 +- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 media-tv/me-tv/files/me-tv-1.4.0.10-C++11-throw-in-destructors.patch diff --git a/media-tv/me-tv/files/me-tv-1.4.0.10-C++11-throw-in-destructors.patch b/media-tv/me-tv/files/me-tv-1.4.0.10-C++11-throw-in-destructors.patch new file mode 100644 index 000000000000..322a0d6b8463 --- /dev/null +++ b/media-tv/me-tv/files/me-tv-1.4.0.10-C++11-throw-in-destructors.patch @@ -0,0 +1,35 @@ +--- a/server/data.cc ++++ b/server/data.cc +@@ -68,7 +68,7 @@ + } + } + +-Statement::~Statement() ++Statement::~Statement() NOEXCEPT + { + if (sqlite3_finalize(statement) != 0) + { +--- a/server/data.h ++++ b/server/data.h +@@ -26,6 +26,12 @@ + #include + #include + ++#if __cplusplus >= 201103L ++#define NOEXCEPT noexcept(false) ++#else ++#define NOEXCEPT ++#endif ++ + typedef std::list StringList; + + namespace Data +@@ -68,7 +74,7 @@ + + public: + Statement(Connection& connection, const Glib::ustring& command); +- ~Statement(); ++ ~Statement() NOEXCEPT; + + void reset(); + guint step(); diff --git a/media-tv/me-tv/me-tv-1.4.0.10.ebuild b/media-tv/me-tv/me-tv-1.4.0.10.ebuild index f508beeb224e..89efd2f0c89b 100644 --- a/media-tv/me-tv/me-tv-1.4.0.10.ebuild +++ b/media-tv/me-tv/me-tv-1.4.0.10.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -34,6 +34,7 @@ DEPEND="${RDEPEND} src_prepare() { append-cxxflags -std=c++11 epatch "${FILESDIR}"/${P}-gcc47.patch + epatch "${FILESDIR}"/${P}-C++11-throw-in-destructors.patch eautoreconf } -- 2.26.2