diff options
| author |   Peter Levine <plevine457@gmail.com> | 2017-07-20 02:53:08 -0400 |
|---|---|---|
| committer |   David Seifert <soap@gentoo.org> | 2017-07-30 11:08:58 +0200 |
| commit | ef1a25ce2dff306620f671e330b7bccc50e7f7da (patch) | |
| tree | 9710c4771725ab0be1589e4ae7774673b57eb982 /media-gfx/opentoonz | |
| parent | games-action/armagetronad: Fix building with GCC-6 (diff) | |
| download | gentoo-ef1a25ce2dff306620f671e330b7bccc50e7f7da.tar.gz gentoo-ef1a25ce2dff306620f671e330b7bccc50e7f7da.tar.bz2 gentoo-ef1a25ce2dff306620f671e330b7bccc50e7f7da.zip | |
media-gfx/opentoonz: Fix building with GCC-6
Bug: https://bugs.gentoo.org/show_bug.cgi?id=612938
Package-Manager: Portage-2.3.6, Repoman-2.3.2
Closes: https://github.com/gentoo/gentoo/pull/5145
Diffstat (limited to 'media-gfx/opentoonz')
| -rw-r--r-- | media-gfx/opentoonz/files/opentoonz-1.1.2-gcc6-no-throw-in-destructors.patch | 38 | ||||
| -rw-r--r-- | media-gfx/opentoonz/opentoonz-1.1.2.ebuild | 2 |
2 files changed, 40 insertions, 0 deletions
diff --git a/media-gfx/opentoonz/files/opentoonz-1.1.2-gcc6-no-throw-in-destructors.patch b/media-gfx/opentoonz/files/opentoonz-1.1.2-gcc6-no-throw-in-destructors.patch new file mode 100644 index 000000000000..ad0e5a2758ea --- /dev/null +++ b/media-gfx/opentoonz/files/opentoonz-1.1.2-gcc6-no-throw-in-destructors.patch @@ -0,0 +1,38 @@ +Bug: https://bugs.gentoo.org/show_bug.cgi?id=612938 + +From ae91dbad8c33b35ea564d235c8eba63adfcc0fef Mon Sep 17 00:00:00 2001 +From: Peter-Levine <plevine457@gmail.com> +Date: Wed, 31 May 2017 04:49:36 -0400 +Subject: [PATCH] Don't allow throw() in destructors (#1182) + +--- + toonz/sources/image/3gp/tiio_3gp_proxy.cpp | 2 -- + toonz/sources/image/mov/tiio_mov_proxy.cpp | 2 -- + 2 files changed, 4 deletions(-) + +diff --git a/toonz/sources/image/3gp/tiio_3gp_proxy.cpp b/toonz/sources/image/3gp/tiio_3gp_proxy.cpp +index d1bd79717..03140f695 100644 +--- a/toonz/sources/image/3gp/tiio_3gp_proxy.cpp ++++ b/toonz/sources/image/3gp/tiio_3gp_proxy.cpp +@@ -138,8 +138,6 @@ TLevelWriter3gp::~TLevelWriter3gp() { + QString res; + + stream << (msg << QString("$closeLW3gp") << m_id); +- if (tipc::readMessage(stream, msg) != "ok") +- throw TException("Unable to write file"); + } + + //------------------------------------------------------------------ +diff --git a/toonz/sources/image/mov/tiio_mov_proxy.cpp b/toonz/sources/image/mov/tiio_mov_proxy.cpp +index 260bbb196..6be067c01 100644 +--- a/toonz/sources/image/mov/tiio_mov_proxy.cpp ++++ b/toonz/sources/image/mov/tiio_mov_proxy.cpp +@@ -206,8 +206,6 @@ TLevelWriterMov::~TLevelWriterMov() { + QString res; + + stream << (msg << QString("$closeLWMov") << m_id); +- if (tipc::readMessage(stream, msg) != "ok") +- throw TException("Unable to write file"); + } + + //------------------------------------------------------------------ diff --git a/media-gfx/opentoonz/opentoonz-1.1.2.ebuild b/media-gfx/opentoonz/opentoonz-1.1.2.ebuild index ed1e797dbbdf..ed5cd3d6884d 100644 --- a/media-gfx/opentoonz/opentoonz-1.1.2.ebuild +++ b/media-gfx/opentoonz/opentoonz-1.1.2.ebuild @@ -48,6 +48,8 @@ DEPEND=" CMAKE_USE_DIR="${S}"/toonz/sources +PATCHES=( "${FILESDIR}"/${P}-gcc6-no-throw-in-destructors.patch ) + src_configure() { local mycmakeargs=( |