Hello community, here is the log from the commit of package opentoonz for openSUSE:Factory checked in at 2020-06-10 00:50:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/opentoonz (Old) and /work/SRC/openSUSE:Factory/.opentoonz.new.3606 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "opentoonz" Wed Jun 10 00:50:06 2020 rev:9 rq:812827 version:1.4.0 Changes: -------- --- /work/SRC/openSUSE:Factory/opentoonz/opentoonz.changes 2020-04-18 00:33:14.558401710 +0200 +++ /work/SRC/openSUSE:Factory/.opentoonz.new.3606/opentoonz.changes 2020-06-10 00:50:10.003219760 +0200 @@ -1,0 +2,8 @@ +Tue Jun 9 06:52:38 UTC 2020 - Christophe Giboudeaux <[email protected]> + +- Add patch to fix build with GCC 10: + * 0001-Fix-build-with-GCC-10.patch +- Add patch to fix build with Qt 5.15: + * 0001-Fix-build-with-Qt-5.15.patch + +------------------------------------------------------------------- New: ---- 0001-Fix-build-with-GCC-10.patch 0001-Fix-build-with-Qt-5.15.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ opentoonz.spec ++++++ --- /var/tmp/diff_new_pack.miDrNl/_old 2020-06-10 00:50:10.999222365 +0200 +++ /var/tmp/diff_new_pack.miDrNl/_new 2020-06-10 00:50:10.999222365 +0200 @@ -26,11 +26,15 @@ URL: https://opentoonz.github.io/e/ Source0: %{name}-%{version}.tar.xz Source3: %{name}-rpmlintrc -Patch1: p_handle-no-return-in-nonvoid-function.patch +Patch0: p_handle-no-return-in-nonvoid-function.patch # PATCH-FIX-UPSTREAM -Patch2: 0001-Fix-linker-errors-on-Linux.patch +Patch1: 0001-Fix-linker-errors-on-Linux.patch # PATCH-FIX-OPENSUSE -- Use the system mypaint brushes -Patch3: 0001-Use-the-system-mypaint-brushes.patch +Patch2: 0001-Use-the-system-mypaint-brushes.patch +# PATCH-FIX-UPSTREAM +Patch3: 0001-Fix-build-with-GCC-10.patch +# PATCH-FIX-UPSTREAM +Patch4: 0001-Fix-build-with-Qt-5.15.patch BuildRequires: boost-devel >= 1.55 BuildRequires: cmake BuildRequires: freeglut-devel ++++++ 0001-Fix-build-with-GCC-10.patch ++++++ >From 05ead497ad4d95cf5c37154b780724d67da93f55 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux <[email protected]> Date: Tue, 9 Jun 2020 08:51:28 +0200 Subject: [PATCH] Fix build with GCC 10. The default option was fixed in the latest Twain releases but Opentoonz includes Twain 2.1. --- toonz/sources/common/twain/twain.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toonz/sources/common/twain/twain.h b/toonz/sources/common/twain/twain.h index c7dee179..1bfe9d50 100644 --- 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 -- 2.26.2 ++++++ 0001-Fix-build-with-Qt-5.15.patch ++++++ >From 63b56bdaa760bb6bf67b5a4fd30e3a508fdc1081 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux <[email protected]> Date: Tue, 9 Jun 2020 09:47:56 +0200 Subject: [PATCH] Fix build with Qt 5.15. QPainterPath is no longer included indirectly. --- toonz/sources/tnztools/toolutils.cpp | 1 + toonz/sources/toonzqt/functionpanel.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/toonz/sources/tnztools/toolutils.cpp b/toonz/sources/tnztools/toolutils.cpp index 1ceff937..db4032f7 100644 --- a/toonz/sources/tnztools/toolutils.cpp +++ b/toonz/sources/tnztools/toolutils.cpp @@ -42,6 +42,7 @@ #include "tools/strokeselection.h" #include <QPainter> +#include <QPainterPath> #include <QGLWidget> // for QGLWidget::convertToGLFormat #include <QFont> #include <QFontMetrics> diff --git a/toonz/sources/toonzqt/functionpanel.cpp b/toonz/sources/toonzqt/functionpanel.cpp index 4cc66126..b6a0c092 100644 --- a/toonz/sources/toonzqt/functionpanel.cpp +++ b/toonz/sources/toonzqt/functionpanel.cpp @@ -24,6 +24,7 @@ // Qt includes #include <QPainter> +#include <QPainterPath> #include <QMouseEvent> #include <QWheelEvent> #include <QMenu> -- 2.26.2
