broken: Added initial support for authelia + lldap oidc for nextcloud
This commit is contained in:
@@ -0,0 +1,34 @@
|
||||
From 7eed499898226222a949a792e0400ec10db4a1c9 Mon Sep 17 00:00:00 2001
|
||||
From: Zhaofeng Li <hello@zhaofeng.li>
|
||||
Date: Tue, 22 Nov 2022 13:00:39 -0700
|
||||
Subject: [PATCH] [not for upstream] CMakeLists: Link against webkit2gtk in
|
||||
libslic3r_gui
|
||||
|
||||
WebView.cpp uses symbols from webkitgtk directly. Upstream setup
|
||||
links wxGTK statically so webkitgtk is already pulled in.
|
||||
|
||||
> /nix/store/039g378vc3pc3dvi9dzdlrd0i4q93qwf-binutils-2.39/bin/ld: slic3r/liblibslic3r_gui.a(WebView.cpp.o): undefined reference to symbol 'webkit_web_view_run_javascript_finish'
|
||||
> /nix/store/039g378vc3pc3dvi9dzdlrd0i4q93qwf-binutils-2.39/bin/ld: /nix/store/8yvy428jy2nwq4dhmrcs7gj5r27a2pv6-webkitgtk-2.38.2+abi=4.0/lib/libwebkit2gtk-4.0.so.37: error adding symbols: DSO missing from command line
|
||||
---
|
||||
src/CMakeLists.txt | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index 9c5cb96..e92a0e3 100644
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -175,6 +175,11 @@ if (WIN32)
|
||||
target_link_libraries(BambuStudio_app_gui PRIVATE boost_headeronly)
|
||||
endif ()
|
||||
|
||||
+# We link against webkit2gtk symbols in src/slic3r/GUI/Widgets/WebView.cpp
|
||||
+if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
|
||||
+ target_link_libraries(libslic3r_gui "-lwebkit2gtk-4.0")
|
||||
+endif ()
|
||||
+
|
||||
# Link the resources dir to where Slic3r GUI expects it
|
||||
set(output_dlls_Release "")
|
||||
set(output_dlls_Debug "")
|
||||
--
|
||||
2.38.1
|
||||
|
||||
54
home/apps/orcaslicer/patches/allow_wayland.patch
Normal file
54
home/apps/orcaslicer/patches/allow_wayland.patch
Normal file
@@ -0,0 +1,54 @@
|
||||
commit c9282b73f3d09daff23a2603addd94605596ebe7
|
||||
Author: Robert Schiele <rschiele@gmail.com>
|
||||
Date: Thu May 8 19:16:46 2025 +0200
|
||||
|
||||
remove forcing GDK_BACKEND to x11
|
||||
|
||||
It seems the problems on Wayland from the past are removed meanwhile.
|
||||
|
||||
diff --git a/src/CLI/GuiParams.cpp b/src/CLI/GuiParams.cpp
|
||||
index f44b91651f..41b42ff368 100644
|
||||
--- a/src/CLI/GuiParams.cpp
|
||||
+++ b/src/CLI/GuiParams.cpp
|
||||
@@ -107,9 +107,8 @@ int start_gui_with_params(GUI::GUI_InitParams& params)
|
||||
#if !defined(_WIN32) && !defined(__APPLE__)
|
||||
// likely some linux / unix system
|
||||
const char* display = boost::nowide::getenv("DISPLAY");
|
||||
- // const char *wayland_display = boost::nowide::getenv("WAYLAND_DISPLAY");
|
||||
- //if (! ((display && *display) || (wayland_display && *wayland_display))) {
|
||||
- if (!(display && *display)) {
|
||||
+ const char *wayland_display = boost::nowide::getenv("WAYLAND_DISPLAY");
|
||||
+ if (! ((display && *display) || (wayland_display && *wayland_display))) {
|
||||
// DISPLAY not set.
|
||||
boost::nowide::cerr << "DISPLAY not set, GUI mode not available." << std::endl << std::endl;
|
||||
print_help(false);
|
||||
@@ -141,4 +140,4 @@ int start_as_gcode_viewer(GUI::GUI_InitParams& gui_params)
|
||||
}
|
||||
#else // SLIC3R_GUI
|
||||
// If there is no GUI, we shall ignore the parameters. Remove them from the list.
|
||||
-#endif // SLIC3R_GUI
|
||||
\ No newline at end of file
|
||||
+#endif // SLIC3R_GUI
|
||||
diff --git a/src/CLI/Setup.cpp b/src/CLI/Setup.cpp
|
||||
index 82e03d466d..95acdf3477 100644
|
||||
--- a/src/CLI/Setup.cpp
|
||||
+++ b/src/CLI/Setup.cpp
|
||||
@@ -212,11 +212,6 @@ static bool setup_common()
|
||||
save_main_thread_id();
|
||||
|
||||
#ifdef __WXGTK__
|
||||
- // On Linux, wxGTK has no support for Wayland, and the app crashes on
|
||||
- // startup if gtk3 is used. This env var has to be set explicitly to
|
||||
- // instruct the window manager to fall back to X server mode.
|
||||
- ::setenv("GDK_BACKEND", "x11", /* replace */ true);
|
||||
-
|
||||
// https://github.com/prusa3d/PrusaSlicer/issues/12969
|
||||
::setenv("WEBKIT_DISABLE_COMPOSITING_MODE", "1", /* replace */ false);
|
||||
::setenv("WEBKIT_DISABLE_DMABUF_RENDERER", "1", /* replace */ false);
|
||||
@@ -338,4 +333,4 @@ bool setup(Data& cli, int argc, char** argv)
|
||||
return true;
|
||||
}
|
||||
|
||||
-}
|
||||
\ No newline at end of file
|
||||
+}
|
||||
@@ -0,0 +1,14 @@
|
||||
diff --git a/src/libslic3r/CMakeLists.txt b/src/libslic3r/CMakeLists.txt
|
||||
index 64e0a9e87..e14f29488 100644
|
||||
--- a/src/libslic3r/CMakeLists.txt
|
||||
+++ b/src/libslic3r/CMakeLists.txt
|
||||
@@ -576,7 +576,8 @@ target_link_libraries(libslic3r
|
||||
mcut
|
||||
JPEG::JPEG
|
||||
qoi
|
||||
- opencv_world
|
||||
+ opencv_core
|
||||
+ opencv_imgproc
|
||||
noise::noise
|
||||
)
|
||||
|
||||
13
home/apps/orcaslicer/patches/no-osmesa.patch
Normal file
13
home/apps/orcaslicer/patches/no-osmesa.patch
Normal file
@@ -0,0 +1,13 @@
|
||||
diff --git a/src/slic3r/CMakeLists.txt b/src/slic3r/CMakeLists.txt
|
||||
index e695acd48..174e233e6 100644
|
||||
--- a/src/slic3r/CMakeLists.txt
|
||||
+++ b/src/slic3r/CMakeLists.txt
|
||||
@@ -587,7 +587,7 @@ elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux")
|
||||
FIND_LIBRARY(WAYLAND_EGL_LIBRARIES NAMES wayland-egl)
|
||||
FIND_LIBRARY(WAYLAND_CLIENT_LIBRARIES NAMES wayland-client)
|
||||
find_package(CURL REQUIRED)
|
||||
- target_link_libraries(libslic3r_gui ${DBUS_LIBRARIES} OSMesa)
|
||||
+ target_link_libraries(libslic3r_gui ${DBUS_LIBRARIES})
|
||||
target_link_libraries(libslic3r_gui
|
||||
OpenGL::EGL
|
||||
${WAYLAND_SERVER_LIBRARIES}
|
||||
Reference in New Issue
Block a user