diff options
Diffstat (limited to 'media-gfx/opentoonz')
| -rw-r--r-- | media-gfx/opentoonz/Manifest | 3 | ||||
| -rw-r--r-- | media-gfx/opentoonz/files/opentoonz-1.6.0-gcc13.patch | 36 | ||||
| -rw-r--r-- | media-gfx/opentoonz/opentoonz-1.6.0.ebuild | 4 |
3 files changed, 42 insertions, 1 deletions
diff --git a/media-gfx/opentoonz/Manifest b/media-gfx/opentoonz/Manifest index 5b4e4173bf75..4364049bf0c3 100644 --- a/media-gfx/opentoonz/Manifest +++ b/media-gfx/opentoonz/Manifest @@ -1,3 +1,4 @@ +AUX opentoonz-1.6.0-gcc13.patch 1152 BLAKE2B 931f7c7f5a98e53fdd93fa86c55fa6dcaaf8d6dbb51634439370e00444ba8d5e6cceeff9bc81289dfafee24153432124e62c54a80d31f82f2af1f3073a5d1364 SHA512 3862135ecaf850bad8bf8ad09c3f25ca5d00201acf98549cc68a2f3c5cf8b3db99369a61d9bf4a28761dee67043d9e5b961fcaa272d8ff1b3a4ef4fbdfe5a57b DIST opentoonz-1.6.0.tar.gz 55011226 BLAKE2B e7e27d530ee8356071d38bb3d58de89edcdc6e7e0b28cdb9ba8f7681eda929e13211664a5502499aa3eccfcf090ad81970e9caef365e762b53b7a57f19310afe SHA512 5ee7b724d51f058867d2c7e9c540e68ee3cb6d1350e32c5fd817b10b92ad79cc2a106d36dccc9234503e62788903e6058841dcd8dc39450c889393d0300636e9 -EBUILD opentoonz-1.6.0.ebuild 1964 BLAKE2B 6afa50e8c6b720d2ce925c7f9f1fc8a7979fc92b3a758daa49cadf4ce4913dd2945cfa2c75dff3c12649f540af3fd38c36eeb520cc0fa4a78756a37e53512dae SHA512 e8c0dba3ee7d940d47d6efe8b7ea7fc8aa04b9399d3f15155dbaa745f7cec9787772bae2156db77e565b100b7ce6b66bc7cc3c89ebd96dcf9dd88861b5fed4f3 +EBUILD opentoonz-1.6.0.ebuild 2016 BLAKE2B b35ec70960dd2c28aaf5251caab031b76dc2cbcfb08f9897c8e8b9a5ab861ab76fc76a0ea611d1a45dcf0e7c10fe95c1785f31280c7c0c7b82701376f29c1cc4 SHA512 4ab0f301e677416cc6fb09683d919196436d4fdbeed14f1c053e43c1d1dea7025091ff834cf75cccef2b64b1e4185dd5c40c72102d998f5240adcdb7ed149cfd MISC metadata.xml 484 BLAKE2B 3850af092b035bf6ef637fcf1d09fa79526011ab3629a6e918f952bba06de73b21a0ca3dcb2e6532faaab444404d3e767bff25d59c042650a4ab9b356c1f5a2e SHA512 5daa54628d2d677dc10934d3d43b1df1972f5515461bdaaa0684d4f9f26fb2b065f3fa64a3f0eed8403570ab64a919b7831269dcc68638b7da2e3d40730c01dd 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 |