diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-08-04 08:53:53 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-08-04 08:53:53 +0100 |
commit | e3872864be25f7421015bef2732fa57c0c9fb726 (patch) | |
tree | 9cb29a544215119b5c5538e37211b994ce1c87ae /media-gfx/opentoonz/files | |
parent | 480486b52ea64765faf696c88b2c6a26a5a454d4 (diff) |
gentoo resync : 04.08.2018
Diffstat (limited to 'media-gfx/opentoonz/files')
-rw-r--r-- | media-gfx/opentoonz/files/opentoonz-1.2.1-gcc6-no-throw-in-destructors.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/media-gfx/opentoonz/files/opentoonz-1.2.1-gcc6-no-throw-in-destructors.patch b/media-gfx/opentoonz/files/opentoonz-1.2.1-gcc6-no-throw-in-destructors.patch new file mode 100644 index 000000000000..ad0e5a2758ea --- /dev/null +++ b/media-gfx/opentoonz/files/opentoonz-1.2.1-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"); + } + + //------------------------------------------------------------------ |