diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-07-23 20:53:51 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-07-23 20:53:51 +0100 |
| commit | 3018b5a4bd4777c51e2793818305d7af2409a7fd (patch) | |
| tree | 614c2151adcf4d5a47d494f83ec3f57d35f8e0a7 /media-gfx/prusaslicer/files | |
| parent | 2508f64d6edae6ffd910973df8285893a791b64a (diff) | |
gentoo auto-resync : 23:07:2023 - 20:53:51
Diffstat (limited to 'media-gfx/prusaslicer/files')
| -rw-r--r-- | media-gfx/prusaslicer/files/prusaslicer-2.6.0-disable-noisy-asserts.patch | 14 | ||||
| -rw-r--r-- | media-gfx/prusaslicer/files/prusaslicer-2.6.0-libexpat-double-definition-fix.patch | 22 |
2 files changed, 36 insertions, 0 deletions
diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.6.0-disable-noisy-asserts.patch b/media-gfx/prusaslicer/files/prusaslicer-2.6.0-disable-noisy-asserts.patch new file mode 100644 index 000000000000..0e3d1d340572 --- /dev/null +++ b/media-gfx/prusaslicer/files/prusaslicer-2.6.0-disable-noisy-asserts.patch @@ -0,0 +1,14 @@ +diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp +index e855b6290..2479bf054 100644 +--- a/src/slic3r/GUI/GUI_App.cpp ++++ b/src/slic3r/GUI/GUI_App.cpp +@@ -1128,6 +1128,9 @@ bool GUI_App::OnInit() + + bool GUI_App::on_init_inner() + { ++ // Disable the wxWidgets asserts breakpoints, end users have no use for them. ++ wxSizerFlags::DisableConsistencyChecks(); ++ + // Set initialization of image handlers before any UI actions - See GH issue #7469 + wxInitAllImageHandlers(); + diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.6.0-libexpat-double-definition-fix.patch b/media-gfx/prusaslicer/files/prusaslicer-2.6.0-libexpat-double-definition-fix.patch new file mode 100644 index 000000000000..23006a2ceedf --- /dev/null +++ b/media-gfx/prusaslicer/files/prusaslicer-2.6.0-libexpat-double-definition-fix.patch @@ -0,0 +1,22 @@ +From fdae4a9817b01aacd70ab033dfac711af2acb61e Mon Sep 17 00:00:00 2001 +From: Malte kleine Piening <mkl.piening@gmail.com> +Date: Tue, 18 Apr 2023 22:29:04 +0200 +Subject: [PATCH] fixed double definition of target libexpat described in #9581 + +--- + cmake/modules/FindEXPAT.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cmake/modules/FindEXPAT.cmake b/cmake/modules/FindEXPAT.cmake +index de204c60f7e..5863e136ec5 100644 +--- a/cmake/modules/FindEXPAT.cmake ++++ b/cmake/modules/FindEXPAT.cmake +@@ -25,7 +25,7 @@ if (NOT EXPAT_FOUND) + endif () + endif() + +-if (EXPAT_FOUND AND NOT TARGET EXPAT::EXPAT) ++if (EXPAT_FOUND AND NOT (TARGET EXPAT::EXPAT OR TARGET expat::expat)) + add_library(libexpat INTERFACE) + add_library(EXPAT::EXPAT ALIAS libexpat) + target_link_libraries(libexpat INTERFACE expat::expat) |