commit:     e9a14bea18c4d4ef7948b5386de701e422583d61
Author:     Peter-Levine <plevine457 <AT> gmail <DOT> com>
AuthorDate: Tue Mar 28 01:07:02 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Apr 16 18:57:20 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9a14bea

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

 ...me-tv-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(-)

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 00000000000..322a0d6b846
--- /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 <linux/dvb/frontend.h>
+ #include <glibmm.h>
+ 
++#if __cplusplus >= 201103L
++#define NOEXCEPT noexcept(false)
++#else
++#define NOEXCEPT
++#endif
++
+ typedef std::list<Glib::ustring> 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 f508beeb224..89efd2f0c89 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
 }
 

Reply via email to