opentoonz: forgot patch update

This commit is contained in:
Jerome Duval
2023-03-09 18:53:40 +01:00
parent 6e93d49efc
commit ca19e05f5e
2 changed files with 54 additions and 3 deletions

View File

@@ -7,7 +7,7 @@ Studio Ghibli (http://www.ghibli.jp/) over many years of production."
HOMEPAGE="https://github.com/opentoonz/opentoonz/"
COPYRIGHT="2016-2018, DWANGO Co., Ltd."
LICENSE="BSD (3-clause)"
REVISION="1"
REVISION="2"
srcGitRev="79abc3c572f9ec45b8a1c08d822bc36aecbe06bd"
SOURCE_URI="${HOMEPAGE}archive/$srcGitRev.tar.gz"
CHECKSUM_SHA256="705b3d4488cafc55536281d982257be76ceb035b985242b7b38dee076b06370b"

View File

@@ -1,11 +1,11 @@
From 3265d7fd80e1bcf75eaf6f83096905b578459260 Mon Sep 17 00:00:00 2001
From da048323884c9dd11141be463a1b2b1ae708e888 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Wed, 22 Mar 2017 22:05:39 +0100
Subject: Haiku patch
diff --git a/toonz/sources/CMakeLists.txt b/toonz/sources/CMakeLists.txt
index e01cde8..c3847a0 100644
index e01cde8..304b8e8 100644
--- a/toonz/sources/CMakeLists.txt
+++ b/toonz/sources/CMakeLists.txt
@@ -188,8 +188,12 @@ elseif(BUILD_ENV_APPLE)
@@ -21,6 +21,43 @@ index e01cde8..c3847a0 100644
elseif(CMAKE_SYSTEM_NAME MATCHES "^.*BSD$|DragonFly")
set(BUILD_TARGET_BSD ON)
add_definitions(-D_BSD_SOURCE -DFREEBSD)
@@ -472,6 +476,7 @@ elseif(BUILD_ENV_UNIXLIKE)
find_package(LZO REQUIRED)
message("LZO:" ${LZO_INCLUDE_DIR})
+ find_library(EXECINFO_LIBRARY execinfo)
find_library(PTHREAD_LIBRARY pthread)
if(NOT BUILD_TARGET_WIN)
diff --git a/toonz/sources/common/tapptools/tenv.cpp b/toonz/sources/common/tapptools/tenv.cpp
index 173c349..8f83764 100644
--- a/toonz/sources/common/tapptools/tenv.cpp
+++ b/toonz/sources/common/tapptools/tenv.cpp
@@ -6,6 +6,7 @@
#include <QDir>
#include <QSettings>
+#include <QStandardPaths>
#ifdef LEVO_MACOSX
@@ -79,12 +80,16 @@ public:
settingsPath = QString::fromStdString(getApplicationFileName()) +
QString(".app") +
QString("/Contents/Resources/SystemVar.ini");
+#else
+#ifdef HAIKU
+ settingsPath = QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/SystemVar.ini";
#else /* Generic Unix */
// TODO: use QStandardPaths::ConfigLocation when we drop Qt4
settingsPath = QDir::homePath();
settingsPath.append("/.config/");
settingsPath.append(getApplicationName().c_str());
settingsPath.append("/SystemVar.ini");
+#endif
#endif
QSettings settings(settingsPath, QSettings::IniFormat);
diff --git a/toonz/sources/common/tgl/tgl.cpp b/toonz/sources/common/tgl/tgl.cpp
index 453c07a..88c6989 100644
--- a/toonz/sources/common/tgl/tgl.cpp
@@ -417,6 +454,20 @@ index 770d6b7..d3aee49 100644
exec \$OPENTOONZ_BASE/bin/OpenToonz \"\$@\"
")
diff --git a/toonz/sources/toonz/main.cpp b/toonz/sources/toonz/main.cpp
index 826615c..b7dc6fe 100644
--- a/toonz/sources/toonz/main.cpp
+++ b/toonz/sources/toonz/main.cpp
@@ -479,7 +479,9 @@ int main(int argc, char *argv[]) {
fmt.setStencil(true);
QGLFormat::setDefaultFormat(fmt);
+#ifndef __HAIKU__
glutInit(&argc, argv);
+#endif
splash.showMessage(offsetStr + "Initializing Toonz environment ...",
Qt::AlignCenter, Qt::white);
diff --git a/toonz/sources/toonz/sceneviewer.cpp b/toonz/sources/toonz/sceneviewer.cpp
index 9b71873..ca4e52c 100644
--- a/toonz/sources/toonz/sceneviewer.cpp