[arch-commits] Commit in opentoonz (4 files)

[Balló György]

    Date: Sunday, June 14, 2020 @ 23:19:28
  Author: bgyorgy
Revision: 644737

archrelease: copy trunk to community-x86_64

Added:
  opentoonz/repos/
  opentoonz/repos/community-x86_64/
  opentoonz/repos/community-x86_64/PKGBUILD
    (from rev 644736, opentoonz/trunk/PKGBUILD)
  opentoonz/repos/community-x86_64/fix-build.patch
    (from rev 644736, opentoonz/trunk/fix-build.patch)

-----------------+
 PKGBUILD        |   47 ++++++++++++++++++++++++++++++++++++++++++
 fix-build.patch |   60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 107 insertions(+)

Copied: opentoonz/repos/community-x86_64/PKGBUILD (from rev 644736, opentoonz/trunk/PKGBUILD)
===================================================================
--- repos/community-x86_64/PKGBUILD	                        (rev 0)
+++ repos/community-x86_64/PKGBUILD	2020-06-14 23:19:28 UTC (rev 644737)
@@ -0,0 +1,47 @@
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: cyrant <cyrant at tuta dot io>
+
+pkgname=opentoonz
+pkgver=1.4.0
+pkgrel=2
+pkgdesc='Software for producing a 2D animation'
+arch=(x86_64)
+url='https://opentoonz.github.io/e/'
+license=(BSD)
+depends=(cblas ffmpeg freeglut glew hicolor-icon-theme libmypaint qt5-multimedia qt5-script qt5-svg superlu)
+makedepends=(boost cmake qt5-tools)
+source=("$pkgname-$pkgver.tar.gz::https://github.com/opentoonz/$pkgname/archive/v${pkgver}.tar.gz"
+        fix-build.patch)
+sha256sums=('176caca191bf2747964ecaf8cbb6be6a738fd04b464a2ba182b5aaf96ccaefa9'
+            '14c5ad66485bbbc7665068f0ee623a2cf87bb2b20a24a636753997acd708b43e')
+
+prepare() {
+  [[ -d build ]] || mkdir build
+
+  cd $pkgname-$pkgver
+
+  # Fix build
+  patch -Np1 -i ../fix-build.patch
+
+  # Specify path for ffmpeg
+  sed -i 's|"ffmpegPath", QMetaType::QString, ""|"ffmpegPath", QMetaType::QString, "/usr/bin"|' toonz/sources/toonzlib/preferences.cpp
+}
+
+build() {
+  pushd $pkgname-$pkgver/thirdparty/tiff-4.0.3
+  ./configure --with-pic --disable-jbig
+  make
+  popd
+
+  cd build
+  cmake -G "Unix Makefiles" ../$pkgname-$pkgver/toonz/sources \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_SKIP_RPATH=YES
+  make
+}
+
+package() {
+  cd build
+  make DESTDIR="$pkgdir" install
+  install -Dm644 ../$pkgname-$pkgver/LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE.txt"
+}

Copied: opentoonz/repos/community-x86_64/fix-build.patch (from rev 644736, opentoonz/trunk/fix-build.patch)
===================================================================
--- repos/community-x86_64/fix-build.patch	                        (rev 0)
+++ repos/community-x86_64/fix-build.patch	2020-06-14 23:19:28 UTC (rev 644737)
@@ -0,0 +1,60 @@
+From 05ead497ad4d95cf5c37154b780724d67da93f55 Mon Sep 17 00:00:00 2001
+From: Christophe Giboudeaux <christophe at krop.fr>
+Date: Tue, 9 Jun 2020 08:51:28 +0200
+Subject: [PATCH 1/2] 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 c7dee179c1..1bfe9d5001 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
+
+From 3ccd50532913049804bd7569fb7f88415cd45ee9 Mon Sep 17 00:00:00 2001
+From: Christophe Giboudeaux <christophe at krop.fr>
+Date: Tue, 9 Jun 2020 09:47:56 +0200
+Subject: [PATCH 2/2] 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
+--- 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 4cc6612634..b6a0c09239 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>