Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package opentoonz for openSUSE:Factory
checked in at 2023-03-21 17:44:24
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/opentoonz (Old)
and /work/SRC/openSUSE:Factory/.opentoonz.new.31432 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "opentoonz"
Tue Mar 21 17:44:24 2023 rev:17 rq:1073516 version:1.6.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/opentoonz/opentoonz.changes 2022-04-02
18:21:10.801844413 +0200
+++ /work/SRC/openSUSE:Factory/.opentoonz.new.31432/opentoonz.changes
2023-03-21 17:44:49.654777088 +0100
@@ -1,0 +2,6 @@
+Tue Mar 21 10:13:04 UTC 2023 - Christophe Marin <christo...@krop.fr>
+
+- Add upstream change:
+ * 0001-Clarify-size_t-origin-for-tgc-hash-BucketNode.patch
+
+-------------------------------------------------------------------
New:
----
0001-Clarify-size_t-origin-for-tgc-hash-BucketNode.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ opentoonz.spec ++++++
--- /var/tmp/diff_new_pack.srjkz0/_old 2023-03-21 17:44:50.430780752 +0100
+++ /var/tmp/diff_new_pack.srjkz0/_new 2023-03-21 17:44:50.430780752 +0100
@@ -29,6 +29,8 @@
Patch0: 0001-Fix-linker-errors-on-Linux.patch
# PATCH-FIX-OPENSUSE -- Use the system mypaint brushes
Patch1: 0001-Use-the-system-mypaint-brushes.patch
+# PATCH-FIX-UPSTREAM
+Patch2: 0001-Clarify-size_t-origin-for-tgc-hash-BucketNode.patch
BuildRequires: boost-devel >= 1.55
BuildRequires: cmake
BuildRequires: freeglut-devel
@@ -42,6 +44,7 @@
BuildRequires: sed
BuildRequires: superlu-devel
BuildRequires: update-desktop-files
+BuildRequires: cmake(OpenCV)
BuildRequires: cmake(Qt5Core)
BuildRequires: cmake(Qt5Gui)
BuildRequires: cmake(Qt5LinguistTools)
@@ -63,16 +66,11 @@
BuildRequires: pkgconfig(libusb-1.0)
BuildRequires: pkgconfig(lzo2)
BuildRequires: pkgconfig(mypaint-brushes-1.0) >= 1.3
-%if 0%{suse_version} == 1500 && 0%{?sle_version} < 150400
-BuildRequires: pkgconfig(opencv)
-%else
-BuildRequires: cmake(OpenCV)
-%endif
BuildRequires: pkgconfig(sdl2)
BuildRequires: pkgconfig(zlib)
Requires: mypaint-brushes1
# build fails on ARM (conflicting declaration between glew and gles)
-ExclusiveArch: %{ix86} x86_64 ppc64 ppc64le %{riscv} %{mips}
+ExclusiveArch: %{ix86} x86_64 ppc64 ppc64le %{riscv}
%description
2D animation software previously known as Toonz.
++++++ 0001-Clarify-size_t-origin-for-tgc-hash-BucketNode.patch ++++++
>From d28d005d2a8fcb81461516a37e30526063aba448 Mon Sep 17 00:00:00 2001
From: Grillo <11585030+grillo-del...@users.noreply.github.com>
Date: Mon, 6 Feb 2023 20:48:32 -0300
Subject: [PATCH] Clarify size_t origin for tgc::hash::BucketNode
---
toonz/sources/include/tcg/hash.h | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/toonz/sources/include/tcg/hash.h b/toonz/sources/include/tcg/hash.h
index c668090d..78770e95 100644
--- a/toonz/sources/include/tcg/hash.h
+++ b/toonz/sources/include/tcg/hash.h
@@ -21,6 +21,11 @@ public:
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 @@ public:
~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;
--
2.40.0
