opentoonz: update to 1.4.0.
This commit is contained in:
parent
b0bbf36764
commit
1ed26ac221
5 changed files with 69 additions and 25 deletions
|
@ -1,21 +0,0 @@
|
|||
From adae1528d6f580d56b5499c97b30acfb84af4390 Mon Sep 17 00:00:00 2001
|
||||
From: manongjohn <manongjohn@users.noreply.github.com>
|
||||
Date: Tue, 9 Jul 2019 23:19:16 -0400
|
||||
Subject: [PATCH] Fix Qt 5.13 build error (#2665)
|
||||
|
||||
---
|
||||
toonz/sources/include/tfxattributes.h | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/toonz/sources/include/tfxattributes.h b/toonz/sources/include/tfxattributes.h
|
||||
index 224a94426..92245cb8d 100644
|
||||
--- toonz/sources/include/tfxattributes.h
|
||||
+++ toonz/sources/include/tfxattributes.h
|
||||
@@ -5,6 +5,7 @@
|
||||
|
||||
#include "tgeometry.h"
|
||||
#include <QStack>
|
||||
+#include <QList>
|
||||
|
||||
#undef DVAPI
|
||||
#undef DVVAR
|
35
srcpkgs/opentoonz/patches/QPainterPath.patch
Normal file
35
srcpkgs/opentoonz/patches/QPainterPath.patch
Normal file
|
@ -0,0 +1,35 @@
|
|||
From 3ccd50532913049804bd7569fb7f88415cd45ee9 Mon Sep 17 00:00:00 2001
|
||||
From: Christophe Giboudeaux <christophe@krop.fr>
|
||||
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 1ceff93722..db4032f737 100644
|
||||
--- toonz/sources/tnztools/toolutils.cpp
|
||||
+++ 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 4cc6612634..b6a0c09239 100644
|
||||
--- toonz/sources/toonzqt/functionpanel.cpp
|
||||
+++ toonz/sources/toonzqt/functionpanel.cpp
|
||||
@@ -24,6 +24,7 @@
|
||||
|
||||
// Qt includes
|
||||
#include <QPainter>
|
||||
+#include <QPainterPath>
|
||||
#include <QMouseEvent>
|
||||
#include <QWheelEvent>
|
||||
#include <QMenu>
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
#ifdef LINUX
|
||||
-#include <sys/sysctl.h>
|
||||
+#include <linux/sysctl.h>
|
||||
+#include <unistd.h>
|
||||
#endif
|
||||
|
||||
// forward declaration
|
||||
|
|
30
srcpkgs/opentoonz/patches/musl2.patch
Normal file
30
srcpkgs/opentoonz/patches/musl2.patch
Normal file
|
@ -0,0 +1,30 @@
|
|||
Based on https://github.com/opentoonz/opentoonz/pull/3500
|
||||
|
||||
diff --git a/toonz/sources/stdfx/igs_resource_msg_from_err_unix.cpp b/toonz/sources/stdfx/igs_resource_msg_from_err_unix.cpp
|
||||
index da51594e..c3a9da17 100644
|
||||
--- toonz/sources/stdfx/igs_resource_msg_from_err_unix.cpp
|
||||
+++ toonz/sources/stdfx/igs_resource_msg_from_err_unix.cpp
|
||||
@@ -1,3 +1,5 @@
|
||||
+#define _POSIX_C_SOURCE 200809L
|
||||
+#undef _GNU_SOURCE
|
||||
#include <cerrno>
|
||||
#include <cstring> /* memset */
|
||||
#include <vector>
|
||||
@@ -120,7 +121,7 @@ HP-UX(v11.23)では、strerror_r()をサポートしない。
|
||||
注意::strerror()はThread SafeではなくMulti Threadでは正常動作しない
|
||||
*/
|
||||
errmsg += ::strerror(erno);
|
||||
-#elif ((_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !_GNU_SOURCE)
|
||||
+#elif !defined(__APPLE__)
|
||||
/*
|
||||
http://japanese-linux-man-pages.coding-school.com/man/X_strerror_r-3
|
||||
より、POSIX.1.2002で規定されたXSI準拠のバージョンのstrerror_r()
|
||||
@@ -130,7 +131,7 @@ http://japanese-linux-man-pages.coding-school.com/man/X_strerror_r-3
|
||||
if (0 == ret) {
|
||||
errmsg += buff;
|
||||
} else if (-1 == ret) {
|
||||
- swtich(errno) {
|
||||
+ switch(errno) {
|
||||
case EINVAL:
|
||||
errmsg +=
|
||||
"strerror_r() gets Error : The value of errnum is not a "
|
|
@ -1,7 +1,7 @@
|
|||
# Template file for 'opentoonz'
|
||||
pkgname=opentoonz
|
||||
version=1.3.0
|
||||
revision=2
|
||||
version=1.4.0
|
||||
revision=1
|
||||
build_wrksrc="toonz/sources"
|
||||
build_style=cmake
|
||||
hostmakedepends="qt5-qmake qt5-host-tools pkg-config automake libtool"
|
||||
|
@ -14,7 +14,7 @@ maintainer="bra1nwave <brainwave@openmailbox.org>"
|
|||
license="BSD-3-Clause"
|
||||
homepage="https://opentoonz.github.io/e/"
|
||||
distfiles="https://github.com/opentoonz/opentoonz/archive/v${version}.tar.gz"
|
||||
checksum=a5dd0286a58017a086a3533016b9b4f54ada25a230c62de63b995bc04d0cd5a8
|
||||
checksum=176caca191bf2747964ecaf8cbb6be6a738fd04b464a2ba182b5aaf96ccaefa9
|
||||
|
||||
pre_configure() {
|
||||
# Upstream uses their own modified version of tiff
|
||||
|
|
Loading…
Reference in a new issue