Sources changed, two file in patch failed. tiio_3gp_proxy.cpp.rej: --- toonz/sources/image/3gp/tiio_3gp_proxy.cpp +++ 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"); } //------------------------------------------------------------------ tiio_mov_proxy.cpp.rej --- toonz/sources/image/mov/tiio_mov_proxy.cpp +++ 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"); } //------------------------------------------------------------------ Build err: >>> Preparing source in /var/calculate/tmp/portage/media-gfx/opentoonz-1.2.1/work/opentoonz-1.2.1 ... * Applying opentoonz-1.2.1-gcc6-no-throw-in-destructors.patch ... 1 out of 1 hunk FAILED -- saving rejects to file toonz/sources/image/3gp/tiio_3gp_proxy.cpp.rej 1 out of 1 hunk FAILED -- saving rejects to file toonz/sources/image/mov/tiio_mov_proxy.cpp.rej
The gcc6-no-throw-in-destructors.patch can simply be removed from the ebuild. Neither of these destructors throw exceptions in the new version.
The bug has been closed via the following commit(s): https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3fe080adc287347ffcce29782596b85c6c1da69 commit d3fe080adc287347ffcce29782596b85c6c1da69 Author: Tact Yoshida <otakuto.gentoo@gmail.com> AuthorDate: 2018-08-05 10:22:01 +0000 Commit: Patrice Clement <monsieurp@gentoo.org> CommitDate: 2018-08-07 22:24:21 +0000 media-gfx/opentoonz: unapply invalid patch. Closes: https://bugs.gentoo.org/662138 Package-Manager: Portage-2.3.44, Repoman-2.3.9 Closes: https://github.com/gentoo/gentoo/pull/9455 media-gfx/opentoonz/opentoonz-1.2.1-r1.ebuild | 92 +++++++++++++++++++++++++++ 1 file changed, 92 insertions(+)
