[gentoo-commits] repo/gentoo:master commit in: media-gfx/opentoonz/files/, media-gfx/opentoonz/

2023-02-07 Thread Andreas Sturmlechner 
commit: 5e7ff4bfe66536c713c038a3521e010302e3f62d
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Feb  7 12:37:30 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Feb  7 17:25:06 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e7ff4bf

media-gfx/opentoonz: drop 1.4.0, 1.4.0-r1

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/opentoonz/Manifest   |  1 -
 .../files/opentoonz-1.4.0-fix-header.patch | 13 
 .../opentoonz/files/opentoonz-1.4.0-qt-5.15.patch  | 22 --
 media-gfx/opentoonz/opentoonz-1.4.0-r1.ebuild  | 91 --
 media-gfx/opentoonz/opentoonz-1.4.0.ebuild | 86 
 5 files changed, 213 deletions(-)

diff --git a/media-gfx/opentoonz/Manifest b/media-gfx/opentoonz/Manifest
index af143750da35..e23c77a2c455 100644
--- a/media-gfx/opentoonz/Manifest
+++ b/media-gfx/opentoonz/Manifest
@@ -1,2 +1 @@
-DIST opentoonz-1.4.0.tar.gz 53531141 BLAKE2B 
adb7a85fb0581d92119b5f6b75dc320428ea0763955f8c883072cba78045acdeea75a5cea82065a29d2c59f53b4843d8ff92690c9a47c01605b4702fd36d6c13
 SHA512 
777f5d59ec8076e1e53a81347e15bef198bea77449073f1e9d5fdd371a61e20fd6dc8b26c6656c783959782bd71008fbb63c05742aaa50c92bd317aded7d0649
 DIST opentoonz-1.6.0.tar.gz 55011226 BLAKE2B 
e7e27d530ee8356071d38bb3d58de89edcdc6e7e0b28cdb9ba8f7681eda929e13211664a5502499aa3eccfcf090ad81970e9caef365e762b53b7a57f19310afe
 SHA512 
5ee7b724d51f058867d2c7e9c540e68ee3cb6d1350e32c5fd817b10b92ad79cc2a106d36dccc9234503e62788903e6058841dcd8dc39450c889393d0300636e9

diff --git a/media-gfx/opentoonz/files/opentoonz-1.4.0-fix-header.patch 
b/media-gfx/opentoonz/files/opentoonz-1.4.0-fix-header.patch
deleted file mode 100644
index 299c927a5817..
--- a/media-gfx/opentoonz/files/opentoonz-1.4.0-fix-header.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://bugs.gentoo.org/723946k
 a/toonz/sources/common/twain/twain.h
-+++ b/toonz/sources/common/twain/twain.h
-@@ -2209,7 +2209,7 @@ typedef struct {
- #elif defined(TWH_CMP_GNU)
- #pragma pack(pop, before_twain)
- #elif defined(TWH_CMP_BORLAND)
--#pragma option –a.
-+#pragma option_a.
- #elif defined(TWH_CMP_XCODE)
- #if PRAGMA_STRUCT_ALIGN
- #pragma options align = reset
- 

diff --git a/media-gfx/opentoonz/files/opentoonz-1.4.0-qt-5.15.patch 
b/media-gfx/opentoonz/files/opentoonz-1.4.0-qt-5.15.patch
deleted file mode 100644
index 1a4f54e2ebb4..
--- a/media-gfx/opentoonz/files/opentoonz-1.4.0-qt-5.15.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://bugs.gentoo.org/723946
 a/toonz/sources/tnztools/toolutils.cpp
-+++ b/toonz/sources/tnztools/toolutils.cpp
-@@ -42,6 +42,7 @@
- #include "tools/strokeselection.h"
- 
- #include 
-+#include 
- #include   // for QGLWidget::convertToGLFormat
- #include 
- #include 
 a/toonz/sources/toonzqt/functionpanel.cpp
-+++ b/toonz/sources/toonzqt/functionpanel.cpp
-@@ -28,6 +28,7 @@
- #include 
- #include 
- #include 
-+#include 
- 
- #include 
- 
-

diff --git a/media-gfx/opentoonz/opentoonz-1.4.0-r1.ebuild 
b/media-gfx/opentoonz/opentoonz-1.4.0-r1.ebuild
deleted file mode 100644
index 4d3987c46011..
--- a/media-gfx/opentoonz/opentoonz-1.4.0-r1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR=emake
-inherit cmake xdg-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"
-
-BDEPEND="
-   dev-qt/linguist-tools:5
-   virtual/pkgconfig
-"
-RDEPEND="
-   app-arch/lz4:=
-   dev-libs/boost:=
-   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:=
-   >=sci-libs/superlu-4.1:=
-   sys-libs/zlib
-   virtual/cblas
-   virtual/libusb:1
-   virtual/opengl
-"
-DEPEND="
-   ${RDEPEND}
-"
-
-CMAKE_USE_DIR="${S}"/toonz/sources
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-1.4.0-fix-header.patch
-   "${FILESDIR}"/${PN}-1.4.0-qt-5.15.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"
-

[gentoo-commits] repo/gentoo:master commit in: media-gfx/opentoonz/files/, media-gfx/opentoonz/

2023-02-04 Thread Sam James 
commit: d2ca547e88fab4cffb9a2d70a7e85f194d164995
Author: Sam James  gentoo  org>
AuthorDate: Sat Feb  4 22:16:28 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Feb  4 22:49:36 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2ca547e

media-gfx/opentoonz: add build fixes

Closes: https://bugs.gentoo.org/723946
Signed-off-by: Sam James  gentoo.org>

 .../files/opentoonz-1.4.0-fix-header.patch | 13 
 .../opentoonz/files/opentoonz-1.4.0-qt-5.15.patch  | 22 ++
 media-gfx/opentoonz/opentoonz-1.4.0-r1.ebuild  | 91 ++
 3 files changed, 126 insertions(+)

diff --git a/media-gfx/opentoonz/files/opentoonz-1.4.0-fix-header.patch 
b/media-gfx/opentoonz/files/opentoonz-1.4.0-fix-header.patch
new file mode 100644
index ..299c927a5817
--- /dev/null
+++ b/media-gfx/opentoonz/files/opentoonz-1.4.0-fix-header.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/723946k
+--- a/toonz/sources/common/twain/twain.h
 b/toonz/sources/common/twain/twain.h
+@@ -2209,7 +2209,7 @@ typedef struct {
+ #elif defined(TWH_CMP_GNU)
+ #pragma pack(pop, before_twain)
+ #elif defined(TWH_CMP_BORLAND)
+-#pragma option –a.
++#pragma option_a.
+ #elif defined(TWH_CMP_XCODE)
+ #if PRAGMA_STRUCT_ALIGN
+ #pragma options align = reset
+ 

diff --git a/media-gfx/opentoonz/files/opentoonz-1.4.0-qt-5.15.patch 
b/media-gfx/opentoonz/files/opentoonz-1.4.0-qt-5.15.patch
new file mode 100644
index ..1a4f54e2ebb4
--- /dev/null
+++ b/media-gfx/opentoonz/files/opentoonz-1.4.0-qt-5.15.patch
@@ -0,0 +1,22 @@
+https://bugs.gentoo.org/723946
+--- a/toonz/sources/tnztools/toolutils.cpp
 b/toonz/sources/tnztools/toolutils.cpp
+@@ -42,6 +42,7 @@
+ #include "tools/strokeselection.h"
+ 
+ #include 
++#include 
+ #include   // for QGLWidget::convertToGLFormat
+ #include 
+ #include 
+--- a/toonz/sources/toonzqt/functionpanel.cpp
 b/toonz/sources/toonzqt/functionpanel.cpp
+@@ -28,6 +28,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ 
+ #include 
+ 
+

diff --git a/media-gfx/opentoonz/opentoonz-1.4.0-r1.ebuild 
b/media-gfx/opentoonz/opentoonz-1.4.0-r1.ebuild
new file mode 100644
index ..4d3987c46011
--- /dev/null
+++ b/media-gfx/opentoonz/opentoonz-1.4.0-r1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR=emake
+inherit cmake xdg-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"
+
+BDEPEND="
+   dev-qt/linguist-tools:5
+   virtual/pkgconfig
+"
+RDEPEND="
+   app-arch/lz4:=
+   dev-libs/boost:=
+   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:=
+   >=sci-libs/superlu-4.1:=
+   sys-libs/zlib
+   virtual/cblas
+   virtual/libusb:1
+   virtual/opengl
+"
+DEPEND="
+   ${RDEPEND}
+"
+
+CMAKE_USE_DIR="${S}"/toonz/sources
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.4.0-fix-header.patch
+   "${FILESDIR}"/${PN}-1.4.0-qt-5.15.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
+   CONFIG_SHELL="${BROOT}"/bin/bash econf \
+   --with-pic \
+   --disable-jbig \
+   --enable-static \
+   --disable-shared
+
+   cmake_src_configure
+}
+
+src_compile() {
+   cd "${S}"/thirdparty/tiff-4.0.3 || die
+   emake
+
+   cmake_src_compile
+}
+
+pkg_postinst() {
+   xdg_icon_cache_update
+}
+
+pkg_postrm() {
+   xdg_icon_cache_update
+}

[gentoo-commits] repo/gentoo:master commit in: media-gfx/opentoonz/files/, media-gfx/opentoonz/

2020-10-07 Thread Sam James 
commit: e894c12c617db62802e96461c177a43a5924b800
Author: Aisha Tammy  aisha  cc>
AuthorDate: Wed Oct  7 12:51:05 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Oct  7 17:58:25 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e894c12c

media-gfx/opentoonz: drop old version

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Aisha Tammy  aisha.cc>
Signed-off-by: Sam James  gentoo.org>

 media-gfx/opentoonz/Manifest   |  1 -
 ...ntoonz-1.1.2-gcc6-no-throw-in-destructors.patch | 38 -
 media-gfx/opentoonz/opentoonz-1.1.2.ebuild | 93 --
 3 files changed, 132 deletions(-)

diff --git a/media-gfx/opentoonz/Manifest b/media-gfx/opentoonz/Manifest
index fdd5434d27f..b9be7cab8c3 100644
--- a/media-gfx/opentoonz/Manifest
+++ b/media-gfx/opentoonz/Manifest
@@ -1,4 +1,3 @@
-DIST opentoonz-1.1.2.tar.gz 36777909 BLAKE2B 
d822218c5ea1843a50da8d799bd9edf6998bd424ec2b65600371a0ae9f69aaea0d1c45aa53c3a0287c67459b8101a82bc0c339510859f4fbac3a116c9671df08
 SHA512 
800a741cb40e7dede79ef92705fc8fe3a23524c8a4397c30f80a81a7513c98606fb1bb5574188969ba08cfe8995d679f9fc5ecb696a6ac14c48aa2646a2c871e
 DIST opentoonz-1.2.1.tar.gz 39843446 BLAKE2B 
f9035bab5c6fa1d86459b401ca94acbffe8e38a2f5ec2bc97f303c7e829b9f6695480e7ab7a7560909f6ce45109ca1704d5020ff774964b5ed72b1b01588e93b
 SHA512 
3eaf5983b5ec7424338e25975228b9bf6e9da61b2699c52377528966ecf07971868426bda0a64c780c2876cc1f0e4adb63c46767e8099fbfe32a8d1586c13f44
 DIST opentoonz-1.3.0.tar.gz 39920932 BLAKE2B 
292e01c078a4cf461fff0814a60e4ab6aea9a74a63f23e854815632432e07e65d5c01dce9d3aab36595f94ca06dd83b078e52858532d8dadb2e7518514c08b08
 SHA512 
5df272c943f2c222a457545c99388266579d88c702d6c7e71dfe0c924a0189e30323cf9e369c96755c507ee5347620da0140215b2647555f0b3bdae41c615c71
 DIST opentoonz-1.4.0.tar.gz 53531141 BLAKE2B 
adb7a85fb0581d92119b5f6b75dc320428ea0763955f8c883072cba78045acdeea75a5cea82065a29d2c59f53b4843d8ff92690c9a47c01605b4702fd36d6c13
 SHA512 
777f5d59ec8076e1e53a81347e15bef198bea77449073f1e9d5fdd371a61e20fd6dc8b26c6656c783959782bd71008fbb63c05742aaa50c92bd317aded7d0649

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
deleted file mode 100644
index ad0e5a2758e..000
--- 
a/media-gfx/opentoonz/files/opentoonz-1.1.2-gcc6-no-throw-in-destructors.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Bug: https://bugs.gentoo.org/show_bug.cgi?id=612938
-
-From ae91dbad8c33b35ea564d235c8eba63adfcc0fef Mon Sep 17 00:00:00 2001
-From: Peter-Levine 
-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
deleted file mode 100644
index ced01576533..000
--- a/media-gfx/opentoonz/opentoonz-1.1.2.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# 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
-   dev-qt/qtgui:5
-   dev-qt/qtmultimedia:5
-   dev-qt/qtnetwork:5
-   dev-qt/qtopengl:5
-   dev-qt/qtprintsupport:5
-   dev-qt/qtscript:5
-   dev-qt/qtsvg:5
-   dev-qt/qtwidgets:5
-   dev-qt/qtxml:5
-

[gentoo-commits] repo/gentoo:master commit in: media-gfx/opentoonz/files/

2018-08-31 Thread Patrice Clement 
commit: 92e3de766dea701b09f78a4da96bbe371d22d053
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Fri Aug 31 18:18:22 2018 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Fri Aug 31 22:12:30 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92e3de76

media-gfx/opentoonz: remove unused patch.

Closes: https://github.com/gentoo/gentoo/pull/9745

 ...ntoonz-1.2.1-gcc6-no-throw-in-destructors.patch | 38 --
 1 file changed, 38 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
deleted file mode 100644
index ad0e5a2758e..000
--- 
a/media-gfx/opentoonz/files/opentoonz-1.2.1-gcc6-no-throw-in-destructors.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Bug: https://bugs.gentoo.org/show_bug.cgi?id=612938
-
-From ae91dbad8c33b35ea564d235c8eba63adfcc0fef Mon Sep 17 00:00:00 2001
-From: Peter-Levine 
-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");
- }
- 
- //--

[gentoo-commits] repo/gentoo:master commit in: media-gfx/opentoonz/files/, media-gfx/opentoonz/

2018-07-23 Thread Tony Vroon 
commit: f6a0df382ce2a8668a9573f661213aaa19fa3997
Author: Tact Yoshida  gmail  com>
AuthorDate: Wed Jul 18 18:59:44 2018 +
Commit: Tony Vroon  gentoo  org>
CommitDate: Mon Jul 23 08:42:20 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6a0df38

media-gfx/opentoonz: Version bump to 1.2.1

Package-Manager: Portage-2.3.40, Repoman-2.3.9
Closes: https://github.com/gentoo/gentoo/pull/9276
Closes: https://bugs.gentoo.org/612938

 media-gfx/opentoonz/Manifest   |  1 +
 ...ntoonz-1.2.1-gcc6-no-throw-in-destructors.patch | 38 +
 media-gfx/opentoonz/opentoonz-1.2.1.ebuild | 94 ++
 3 files changed, 133 insertions(+)

diff --git a/media-gfx/opentoonz/Manifest b/media-gfx/opentoonz/Manifest
index fb7bd6893f2..19f8c7123f0 100644
--- a/media-gfx/opentoonz/Manifest
+++ b/media-gfx/opentoonz/Manifest
@@ -1 +1,2 @@
 DIST opentoonz-1.1.2.tar.gz 36777909 BLAKE2B 
d822218c5ea1843a50da8d799bd9edf6998bd424ec2b65600371a0ae9f69aaea0d1c45aa53c3a0287c67459b8101a82bc0c339510859f4fbac3a116c9671df08
 SHA512 
800a741cb40e7dede79ef92705fc8fe3a23524c8a4397c30f80a81a7513c98606fb1bb5574188969ba08cfe8995d679f9fc5ecb696a6ac14c48aa2646a2c871e
+DIST opentoonz-1.2.1.tar.gz 39843446 BLAKE2B 
f9035bab5c6fa1d86459b401ca94acbffe8e38a2f5ec2bc97f303c7e829b9f6695480e7ab7a7560909f6ce45109ca1704d5020ff774964b5ed72b1b01588e93b
 SHA512 
3eaf5983b5ec7424338e25975228b9bf6e9da61b2699c52377528966ecf07971868426bda0a64c780c2876cc1f0e4adb63c46767e8099fbfe32a8d1586c13f44

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 000..ad0e5a2758e
--- /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 
+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 000..84389a579e2
--- /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=(

[gentoo-commits] repo/gentoo:master commit in: media-gfx/opentoonz/files/, media-gfx/opentoonz/

2017-07-30 Thread David Seifert 
commit: ef1a25ce2dff306620f671e330b7bccc50e7f7da
Author: Peter Levine  gmail  com>
AuthorDate: Thu Jul 20 06:53:08 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Jul 30 09:08:58 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef1a25ce

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

 ...ntoonz-1.1.2-gcc6-no-throw-in-destructors.patch | 38 ++
 media-gfx/opentoonz/opentoonz-1.1.2.ebuild |  2 ++
 2 files changed, 40 insertions(+)

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 000..ad0e5a2758e
--- /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 
+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 ed1e797dbbd..ed5cd3d6884 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=(