From c192f781677c174580925a58a119995db2387186 Mon Sep 17 00:00:00 2001 From: Alexey Dokuchaev Date: Sun, 14 Mar 2021 09:02:35 +0000 Subject: - Switch appleseed.studio build to Python 3.x and enable by default - Register missing dependency on the `graphics/opencolorio' port --- ...-src_appleseed.studio_mainwindow_mainwindow.cpp | 29 ++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 graphics/appleseed/files/patch-src_appleseed.studio_mainwindow_mainwindow.cpp (limited to 'graphics/appleseed/files/patch-src_appleseed.studio_mainwindow_mainwindow.cpp') diff --git a/graphics/appleseed/files/patch-src_appleseed.studio_mainwindow_mainwindow.cpp b/graphics/appleseed/files/patch-src_appleseed.studio_mainwindow_mainwindow.cpp new file mode 100644 index 000000000000..4c6b990c020a --- /dev/null +++ b/graphics/appleseed/files/patch-src_appleseed.studio_mainwindow_mainwindow.cpp @@ -0,0 +1,29 @@ +--- src/appleseed.studio/mainwindow/mainwindow.cpp.orig 2019-08-31 15:49:01 UTC ++++ src/appleseed.studio/mainwindow/mainwindow.cpp +@@ -27,6 +27,9 @@ + // THE SOFTWARE. + // + ++// XXX: must be included before Qt headers because of `slot' redefine ++#include "mainwindow/pythonconsole/pythonconsolewidget.h" ++ + // Interface header. + #include "mainwindow.h" + +@@ -39,7 +42,6 @@ + #include "mainwindow/minimizebutton.h" + #include "mainwindow/project/attributeeditor.h" + #include "mainwindow/project/projectexplorer.h" +-#include "mainwindow/pythonconsole/pythonconsolewidget.h" + #include "mainwindow/rendering/lightpathstab.h" + #include "mainwindow/rendering/materialdrophandler.h" + #include "mainwindow/rendering/renderwidget.h" +@@ -684,7 +686,7 @@ void MainWindow::build_log_panel() + + void MainWindow::build_python_console_panel() + { +- char* python_home = Py_GetPythonHome(); ++ char* python_home = Py_EncodeLocale(Py_GetPythonHome(), nullptr); + if (python_home == nullptr) + RENDERER_LOG_INFO("Python home not set."); + else RENDERER_LOG_INFO("Python home set to %s.", python_home); -- cgit v1.2.3