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

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

[Sam James]

commit:     12c3fee5e9dbc0bfdd67b3ba0813f3484fd40121
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 28 00:45:15 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Apr 28 00:45:15 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12c3fee5

media-gfx/opentoonz: fix build w/ gcc 13

Closes: https://bugs.gentoo.org/899748
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../opentoonz/files/opentoonz-1.6.0-gcc13.patch    | 36 ++++++++++++++++++++++
 media-gfx/opentoonz/opentoonz-1.6.0.ebuild         |  4 +++
 2 files changed, 40 insertions(+)

diff --git a/media-gfx/opentoonz/files/opentoonz-1.6.0-gcc13.patch b/media-gfx/opentoonz/files/opentoonz-1.6.0-gcc13.patch
new file mode 100644
index 000000000000..cd9f936f4a88
--- /dev/null
+++ b/media-gfx/opentoonz/files/opentoonz-1.6.0-gcc13.patch
@@ -0,0 +1,36 @@
+https://bugs.gentoo.org/899748
+https://github.com/opentoonz/opentoonz/issues/4738
+https://github.com/opentoonz/opentoonz/pull/4739
+
+From d28d005d2a8fcb81461516a37e30526063aba448 Mon Sep 17 00:00:00 2001
+From: Grillo <11585030+grillo-delmal@users.noreply.github.com>
+Date: Mon, 6 Feb 2023 20:48:32 -0300
+Subject: [PATCH] Clarify size_t origin for tgc::hash::BucketNode
+
+--- a/toonz/sources/include/tcg/hash.h
++++ b/toonz/sources/include/tcg/hash.h
+@@ -21,6 +21,11 @@ class hash {
+   typedef T value_type;
+   typedef Hash_functor hash_type;
+ 
++  struct BucketNode;
++  typedef typename tcg::list<BucketNode>::size_t size_t;
++  typedef typename tcg::list<BucketNode>::iterator iterator;
++  typedef typename tcg::list<BucketNode>::const_iterator const_iterator;
++
+   struct BucketNode {
+     K m_key;
+     T m_val;
+@@ -34,11 +39,6 @@ class hash {
+     ~BucketNode() {}
+   };
+ 
+-  typedef typename tcg::list<BucketNode>::size_t size_t;
+-
+-  typedef typename tcg::list<BucketNode>::iterator iterator;
+-  typedef typename tcg::list<BucketNode>::const_iterator const_iterator;
+-
+ private:
+   std::vector<size_t> m_bucketsIdx;
+   tcg::list<BucketNode> m_items;
+

diff --git a/media-gfx/opentoonz/opentoonz-1.6.0.ebuild b/media-gfx/opentoonz/opentoonz-1.6.0.ebuild
index 455a47d16a18..7e44462107c5 100644
--- a/media-gfx/opentoonz/opentoonz-1.6.0.ebuild
+++ b/media-gfx/opentoonz/opentoonz-1.6.0.ebuild
@@ -50,6 +50,10 @@ DEPEND="${RDEPEND}"
 
 CMAKE_USE_DIR="${S}"/toonz/sources
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.0-gcc13.patch
+)
+
 src_configure() {
 	# bug #859778
 	append-flags -fno-strict-aliasing