Re: [PR PATCH] [Updated] New package: opentoonz-1.3.0

[voidlinux-github@inbox.vuxu.org]

[-- Attachment #1: Type: text/plain, Size: 387 bytes --]

There is an updated pull request by bra1nwave against master on the void-packages repository

https://github.com/bra1nwave/void-packages opentoonz
https://github.com/void-linux/void-packages/pull/14100

New package: opentoonz-1.3.0
closes https://github.com/void-linux/void-packages/issues/14038

A patch file from https://github.com/void-linux/void-packages/pull/14100.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-opentoonz-14100.patch --]
[-- Type: text/x-diff, Size: 3797 bytes --]

From 3cde5f2dedd1b62cb0c1d7621f2667fa6ec3c42b Mon Sep 17 00:00:00 2001
From: bra1nwave <brainwave@openmailbox.org>
Date: Sat, 31 Aug 2019 15:15:40 +0200
Subject: [PATCH] New package: opentoonz-1.3.0

---
 .../patches/Fix-Qt-5.13-build-error.patch     | 21 ++++++++++
 srcpkgs/opentoonz/patches/musl.patch          | 22 +++++++++++
 srcpkgs/opentoonz/template                    | 39 +++++++++++++++++++
 3 files changed, 82 insertions(+)
 create mode 100644 srcpkgs/opentoonz/patches/Fix-Qt-5.13-build-error.patch
 create mode 100644 srcpkgs/opentoonz/patches/musl.patch
 create mode 100644 srcpkgs/opentoonz/template

diff --git a/srcpkgs/opentoonz/patches/Fix-Qt-5.13-build-error.patch b/srcpkgs/opentoonz/patches/Fix-Qt-5.13-build-error.patch
new file mode 100644
index 00000000000..2149b2c3c01
--- /dev/null
+++ b/srcpkgs/opentoonz/patches/Fix-Qt-5.13-build-error.patch
@@ -0,0 +1,21 @@
+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
diff --git a/srcpkgs/opentoonz/patches/musl.patch b/srcpkgs/opentoonz/patches/musl.patch
new file mode 100644
index 00000000000..4ad393812b2
--- /dev/null
+++ b/srcpkgs/opentoonz/patches/musl.patch
@@ -0,0 +1,22 @@
+--- toonz/sources/common/tcore/tstopwatch.cpp.orig
++++ toonz/sources/common/tcore/tstopwatch.cpp
+@@ -11,7 +11,7 @@
+ #if defined(__APPLE_CC__)
+ #include <unistd.h>
+ #else
+-#include <sys/unistd.h>
++#include <unistd.h>
+ #endif
+ #include <limits.h>
+ #include <sys/times.h>
+--- toonz/sources/toonzfarm/tfarmserver/tfarmserver.cpp.orig
++++ toonz/sources/toonzfarm/tfarmserver/tfarmserver.cpp
+@@ -51,7 +51,7 @@
+ #endif
+ 
+ #ifdef LINUX
+-#include <sys/sysctl.h>
++#include <linux/sysctl.h>
+ #endif
+ 
+ // forward declaration
diff --git a/srcpkgs/opentoonz/template b/srcpkgs/opentoonz/template
new file mode 100644
index 00000000000..8cc60fc1bc7
--- /dev/null
+++ b/srcpkgs/opentoonz/template
@@ -0,0 +1,39 @@
+# Template file for 'opentoonz'
+pkgname=opentoonz
+version=1.3.0
+revision=1
+build_wrksrc="toonz/sources"
+build_style=cmake
+hostmakedepends="pkg-config automake libtool"
+makedepends="qt5-devel qt5-svg-devel qt5-script-devel qt5-tools-devel qt5-multimedia-devel
+ superlu-devel glew-devel libjpeg-turbo-devel liblzma-devel liblz4-devel lzo-devel
+ libusb-devel SDL2-devel libmypaint-devel boost-devel libfreeglut-devel
+ openblas-devel"
+short_desc="Full-featured 2D animation creation software"
+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
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt5-qmake qt5-host-tools"
+fi
+
+pre_configure() {
+	# Upstream uses their own modified version of tiff
+	if [ "$CROSS_BUILD" ]; then
+		configure_args="-DTIFF_LIBRARY=${wrksrc}/thirdparty/tiff-4.0.3/libtiff/.libs/libtiff.a
+		 -DTIFF_INCLUDE_DIR=${wrksrc}/thirdparty/tiff-4.0.3/libtiff"
+		_args="--host=${XBPS_TRIPLET}"
+	fi
+
+	cd ${wrksrc}/thirdparty/tiff-4.0.3
+	autoreconf -fi
+	./configure --with-pic --disable-jbig ${_args}
+	make ${makejobs}
+}
+
+post_install() {
+	vlicense ${wrksrc}/LICENSE.txt
+}