| 1 |
commit: e9a14bea18c4d4ef7948b5386de701e422583d61 |
| 2 |
Author: Peter-Levine <plevine457 <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Tue Mar 28 01:07:02 2017 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Apr 16 18:57:20 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9a14bea |
| 7 |
|
| 8 |
media-tv/me-tv: Fix building with GCC6 and -Werror=terminate (bug #613426) |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.5, Repoman-2.3.2 |
| 11 |
Closes: https://github.com/gentoo/gentoo/pull/4308 |
| 12 |
|
| 13 |
...me-tv-1.4.0.10-C++11-throw-in-destructors.patch | 35 ++++++++++++++++++++++ |
| 14 |
media-tv/me-tv/me-tv-1.4.0.10.ebuild | 3 +- |
| 15 |
2 files changed, 37 insertions(+), 1 deletion(-) |
| 16 |
|
| 17 |
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 |
| 18 |
new file mode 100644 |
| 19 |
index 00000000000..322a0d6b846 |
| 20 |
--- /dev/null |
| 21 |
+++ b/media-tv/me-tv/files/me-tv-1.4.0.10-C++11-throw-in-destructors.patch |
| 22 |
@@ -0,0 +1,35 @@ |
| 23 |
+--- a/server/data.cc |
| 24 |
++++ b/server/data.cc |
| 25 |
+@@ -68,7 +68,7 @@ |
| 26 |
+ } |
| 27 |
+ } |
| 28 |
+ |
| 29 |
+-Statement::~Statement() |
| 30 |
++Statement::~Statement() NOEXCEPT |
| 31 |
+ { |
| 32 |
+ if (sqlite3_finalize(statement) != 0) |
| 33 |
+ { |
| 34 |
+--- a/server/data.h |
| 35 |
++++ b/server/data.h |
| 36 |
+@@ -26,6 +26,12 @@ |
| 37 |
+ #include <linux/dvb/frontend.h> |
| 38 |
+ #include <glibmm.h> |
| 39 |
+ |
| 40 |
++#if __cplusplus >= 201103L |
| 41 |
++#define NOEXCEPT noexcept(false) |
| 42 |
++#else |
| 43 |
++#define NOEXCEPT |
| 44 |
++#endif |
| 45 |
++ |
| 46 |
+ typedef std::list<Glib::ustring> StringList; |
| 47 |
+ |
| 48 |
+ namespace Data |
| 49 |
+@@ -68,7 +74,7 @@ |
| 50 |
+ |
| 51 |
+ public: |
| 52 |
+ Statement(Connection& connection, const Glib::ustring& command); |
| 53 |
+- ~Statement(); |
| 54 |
++ ~Statement() NOEXCEPT; |
| 55 |
+ |
| 56 |
+ void reset(); |
| 57 |
+ guint step(); |
| 58 |
|
| 59 |
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 |
| 60 |
index f508beeb224..89efd2f0c89 100644 |
| 61 |
--- a/media-tv/me-tv/me-tv-1.4.0.10.ebuild |
| 62 |
+++ b/media-tv/me-tv/me-tv-1.4.0.10.ebuild |
| 63 |
@@ -1,4 +1,4 @@ |
| 64 |
-# Copyright 1999-2014 Gentoo Foundation |
| 65 |
+# Copyright 1999-2017 Gentoo Foundation |
| 66 |
# Distributed under the terms of the GNU General Public License v2 |
| 67 |
|
| 68 |
EAPI=5 |
| 69 |
@@ -34,6 +34,7 @@ DEPEND="${RDEPEND} |
| 70 |
src_prepare() { |
| 71 |
append-cxxflags -std=c++11 |
| 72 |
epatch "${FILESDIR}"/${P}-gcc47.patch |
| 73 |
+ epatch "${FILESDIR}"/${P}-C++11-throw-in-destructors.patch |
| 74 |
eautoreconf |
| 75 |
} |
Archives