diff --git a/.gitignore b/.gitignore index 6b560a66c2..d249553e98 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,4 @@ src/OrcaSlicer-doc/ **/filament_full/ /deps/DL_CACHE/ /deps/DL_CACHE +**/.flatpak-builder/ diff --git a/flatpak/patches/0001-Add-support-for-building-WebView-with-libwebkit2gtk-.patch b/deps/wxWidgets/0001-Add-support-for-building-WebView-with-libwebkit2gtk-.patch similarity index 100% rename from flatpak/patches/0001-Add-support-for-building-WebView-with-libwebkit2gtk-.patch rename to deps/wxWidgets/0001-Add-support-for-building-WebView-with-libwebkit2gtk-.patch diff --git a/deps/wxWidgets/wxWidgets.cmake b/deps/wxWidgets/wxWidgets.cmake index df6e35c93c..1861b2f0e4 100644 --- a/deps/wxWidgets/wxWidgets.cmake +++ b/deps/wxWidgets/wxWidgets.cmake @@ -23,7 +23,7 @@ else () endif () if (CMAKE_SYSTEM_NAME STREQUAL "Linux") - set(_patch_cmd ${PATCH_CMD} ${CMAKE_CURRENT_LIST_DIR}/0001-wx-3.1.5-patch-for-Orca.patch) + set(_patch_cmd ${PATCH_CMD} ${CMAKE_CURRENT_LIST_DIR}/0001-wx-3.1.5-patch-for-Orca.patch ${CMAKE_CURRENT_LIST_DIR}/0001-Add-support-for-building-WebView-with-libwebkit2gtk-.patch) endif () orcaslicer_add_cmake_project( @@ -44,6 +44,7 @@ orcaslicer_add_cmake_project( -DwxUSE_UNICODE=ON ${_wx_private_font} -DwxUSE_OPENGL=ON + -DwxUSE_WEBREQUEST=ON -DwxUSE_WEBVIEW=ON ${_wx_edge} -DwxUSE_WEBVIEW_IE=OFF @@ -57,6 +58,7 @@ orcaslicer_add_cmake_project( -DwxUSE_ZLIB=sys -DwxUSE_LIBJPEG=sys -DwxUSE_LIBTIFF=sys + -DwxUSE_NANOSVG=OFF -DwxUSE_EXPAT=sys ) diff --git a/src/slic3r/GUI/PrinterWebView.hpp b/src/slic3r/GUI/PrinterWebView.hpp index 0e42f05a84..0f51836351 100644 --- a/src/slic3r/GUI/PrinterWebView.hpp +++ b/src/slic3r/GUI/PrinterWebView.hpp @@ -6,7 +6,7 @@ #include "wx/cmdline.h" #include "wx/notifmsg.h" #include "wx/settings.h" -#include "wx/webview.h" +#include #include #if wxUSE_WEBVIEW_EDGE diff --git a/src/slic3r/GUI/WebViewDialog.hpp b/src/slic3r/GUI/WebViewDialog.hpp index 6a9c8296d1..ed0d28542b 100644 --- a/src/slic3r/GUI/WebViewDialog.hpp +++ b/src/slic3r/GUI/WebViewDialog.hpp @@ -6,7 +6,7 @@ #include "wx/cmdline.h" #include "wx/notifmsg.h" #include "wx/settings.h" -#include "wx/webview.h" +#include #if wxUSE_WEBVIEW_EDGE #include "wx/msw/webview_edge.h"