gentoo resync : 04.08.2018

3 files changed, 135 insertions, 0 deletions

diff --git a/media-gfx/opentoonz/Manifest b/media-gfx/opentoonz/Manifest
index 56b8185ae96f..f0655a923e05 100644
--- a/media-gfx/opentoonz/Manifest
+++ b/media-gfx/opentoonz/Manifest
@@ -1,4 +1,7 @@
 AUX opentoonz-1.1.2-gcc6-no-throw-in-destructors.patch 1469 BLAKE2B cb25eaa0b3e44bee9c4da81b6f50bfcd68c1566149d089fefddb9d90ed76cb3ae9f33b063bc3834e69da008660f689eb56b9597bd1702b40df761006b170c079 SHA512 c11194c06df6dc2e2ce18f3c6863c19191793512672779a2b5d4df2e2b59348dd4c71c7ab887546b96943e97e0257b3aa152f45aa53a3e5ed95008fa3d6b59d5
+AUX opentoonz-1.2.1-gcc6-no-throw-in-destructors.patch 1469 BLAKE2B cb25eaa0b3e44bee9c4da81b6f50bfcd68c1566149d089fefddb9d90ed76cb3ae9f33b063bc3834e69da008660f689eb56b9597bd1702b40df761006b170c079 SHA512 c11194c06df6dc2e2ce18f3c6863c19191793512672779a2b5d4df2e2b59348dd4c71c7ab887546b96943e97e0257b3aa152f45aa53a3e5ed95008fa3d6b59d5
 DIST opentoonz-1.1.2.tar.gz 36777909 BLAKE2B d822218c5ea1843a50da8d799bd9edf6998bd424ec2b65600371a0ae9f69aaea0d1c45aa53c3a0287c67459b8101a82bc0c339510859f4fbac3a116c9671df08 SHA512 800a741cb40e7dede79ef92705fc8fe3a23524c8a4397c30f80a81a7513c98606fb1bb5574188969ba08cfe8995d679f9fc5ecb696a6ac14c48aa2646a2c871e
+DIST opentoonz-1.2.1.tar.gz 39843446 BLAKE2B f9035bab5c6fa1d86459b401ca94acbffe8e38a2f5ec2bc97f303c7e829b9f6695480e7ab7a7560909f6ce45109ca1704d5020ff774964b5ed72b1b01588e93b SHA512 3eaf5983b5ec7424338e25975228b9bf6e9da61b2699c52377528966ecf07971868426bda0a64c780c2876cc1f0e4adb63c46767e8099fbfe32a8d1586c13f44
 EBUILD opentoonz-1.1.2.ebuild 2152 BLAKE2B bbad89bf0799119e05e7ec8e900e786f28e51d4609874e7b676922ab8cc8ecb4506652f836e40778d3963eaea2cf9ec58c8da8fde68393455e60f82868ae3913 SHA512 62ca55a27d0e4ca42f274747b530221e003e67774fb822969f1b7e4e77eb80b961894a6362c45633c642dcbb1e35572ca77056d7cf43fede9f632789bb53aa35
+EBUILD opentoonz-1.2.1.ebuild 2253 BLAKE2B b620d793a36f917b97fbd0e6910da5af293e47c602f2216eccfac294c4f65c124288336cbe84cbde3257436b4196bff11111ca62f1883e58937e58f032ea87f9 SHA512 b715e69ad8e8b013493c25c10cdcdf01c9a3de5bb70f689cf3ef971d3259874f040a3b977741957f645190b49f3da0dff171e6b05ca17bf85c8575befcc04be7
 MISC metadata.xml 453 BLAKE2B 5bcdb89e0cab891a18531065af9dc5d65510905f8c21178d62125901d0d65d0522b8e4a5ab94f92d09ed0085a0cfae6701c04001dc29bc5e138b12b888cf71ec SHA512 227ed636186b559a5c4fe8728bc8ad2fa519177451f61c6cc67e20be3f8b071715fe38c274956cc987c3c2a49a25b7c7ca61280608871861c0007c558c016d6f
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");
+ }
+ 
+ //------------------------------------------------------------------
diff --git a/media-gfx/opentoonz/opentoonz-1.2.1.ebuild b/media-gfx/opentoonz/opentoonz-1.2.1.ebuild
new file mode 100644
index 000000000000..84389a579e27
--- /dev/null
+++ b/media-gfx/opentoonz/opentoonz-1.2.1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="An open-source full-featured 2D animation creation software"
+HOMEPAGE="https://github.com/opentoonz/opentoonz"
+SRC_URI="https://github.com/opentoonz/opentoonz/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD libtiff"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	app-arch/lz4:=
+	>=dev-libs/boost-1.55.0:=
+	dev-libs/lzo:2=
+	>=dev-qt/qtcore-5.9:5
+	>=dev-qt/qtgui-5.9:5
+	>=dev-qt/qtmultimedia-5.9:5[widgets]
+	>=dev-qt/qtnetwork-5.9:5
+	>=dev-qt/qtopengl-5.9:5
+	>=dev-qt/qtprintsupport-5.9:5
+	>=dev-qt/qtscript-5.9:5
+	>=dev-qt/qtsvg-5.9:5
+	>=dev-qt/qtwidgets-5.9:5
+	>=dev-qt/qtxml-5.9:5
+	media-libs/freeglut:=
+	media-libs/freetype:2=
+	media-libs/glew:=
+	media-libs/libjpeg-turbo:=
+	>=media-libs/libmypaint-1.3.0
+	media-libs/libpng:=
+	media-libs/libsdl2:=
+	sci-libs/cblas-reference:=
+	>=sci-libs/superlu-4.1:=
+	sys-libs/zlib:=
+	virtual/libusb:=
+	virtual/opengl
+"
+DEPEND="
+	$RDEPEND
+	virtual/pkgconfig
+	dev-qt/linguist-tools:5
+"
+
+CMAKE_USE_DIR="${S}"/toonz/sources
+
+PATCHES=( "${FILESDIR}"/${P}-gcc6-no-throw-in-destructors.patch )
+
+src_configure()
+{
+	local mycmakeargs=(
+		-DTIFF_LIBRARY="${S}/thirdparty/tiff-4.0.3/libtiff/.libs/libtiff.a"
+		-DSUPERLU_INCLUDE_DIR="${EPREFIX%/}/usr/include/superlu"
+		-DLZO_INCLUDE_DIR="${EPREFIX%/}/usr/include/lzo"
+		-DCMAKE_SKIP_RPATH=ON
+	)
+
+	# The upstream uses their own modified libtiff
+	# See: https://github.com/opentoonz/opentoonz/blob/master/doc/how_to_build_linux.md#building-libtiff
+	cd thirdparty/tiff-4.0.3 || die
+	econf \
+		--with-pic \
+		--disable-jbig \
+		--enable-static \
+		--disable-shared
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cd "${S}"/thirdparty/tiff-4.0.3 || die
+	emake
+
+	cmake-utils_src_compile
+}
+
+pkg_postinst()
+{
+	elog "It is supposedly optional but some files are"
+	elog "actually required to run the executable properly."
+	elog
+	elog "The .config/OpenToonz/ directory in your home folder"
+	elog "will contain your settings, work and other files."
+	elog
+	elog "We need to create it from the command-line:"
+	elog
+	elog "$ mkdir -p \$HOME/.config/OpenToonz"
+	elog "$ cp -r /usr/share/opentoonz/stuff/ \$HOME/.config/OpenToonz/"
+}