summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter-Levine <plevine457@gmail.com>2017-03-27 21:07:02 -0400
committerDavid Seifert <soap@gentoo.org>2017-04-16 20:57:20 +0200
commite9a14bea18c4d4ef7948b5386de701e422583d61 (patch)
treee3d5a16c87c1e849d1ea1383d2c33fdc597fa218 /media-tv/me-tv
parentsci-electronics/klayout: Fix "error: throw will always call terminate()" (bug... (diff)
downloadgentoo-e9a14bea18c4d4ef7948b5386de701e422583d61.tar.gz
gentoo-e9a14bea18c4d4ef7948b5386de701e422583d61.tar.bz2
gentoo-e9a14bea18c4d4ef7948b5386de701e422583d61.zip
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
Diffstat (limited to 'media-tv/me-tv')
-rw-r--r--media-tv/me-tv/files/me-tv-1.4.0.10-C++11-throw-in-destructors.patch35
-rw-r--r--media-tv/me-tv/me-tv-1.4.0.10.ebuild3
2 files changed, 37 insertions, 1 deletions
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
}