From b1681bf8223358c2712d2649ea0fb3334957b110bdbf6ea220c1d067b4261022 Mon Sep 17 00:00:00 2001 From: Benjamin Greiner Date: Mon, 5 Sep 2022 21:51:15 +0000 Subject: [PATCH] Accepting request 1001306 from home:frispete:3dprinting - Quoting Lucas Matena (see gh#prusa3d/PrusaSlicer#8299, issue 2): if you link PrusaSlicer 2.5.x with wxWidgets 3.2, you will most likely break it: link against wxWidgets 3.0.5 OBS-URL: https://build.opensuse.org/request/show/1001306 OBS-URL: https://build.opensuse.org/package/show/science/PrusaSlicer?expand=0&rev=48 --- PrusaSlicer.changes | 7 +++++++ PrusaSlicer.spec | 8 ++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/PrusaSlicer.changes b/PrusaSlicer.changes index 0962188..5447622 100644 --- a/PrusaSlicer.changes +++ b/PrusaSlicer.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Sep 5 17:17:49 UTC 2022 - Hans-Peter Jansen + +- Quoting Lucas Matena (see gh#prusa3d/PrusaSlicer#8299, issue 2): + if you link PrusaSlicer 2.5.x with wxWidgets 3.2, you will most + likely break it: link against wxWidgets 3.0.5 + ------------------------------------------------------------------- Mon Aug 1 15:42:40 UTC 2022 - Ben Greiner diff --git a/PrusaSlicer.spec b/PrusaSlicer.spec index 1cf3cd6..c17d846 100644 --- a/PrusaSlicer.spec +++ b/PrusaSlicer.spec @@ -64,7 +64,10 @@ BuildRequires: openvdb-tools BuildRequires: pkgconfig BuildRequires: tbb-devel BuildRequires: update-desktop-files -BuildRequires: wxGTK3-devel >= 3.1 +# Quoting Lucas Matena (see gh#prusa3d/PrusaSlicer#8299, issue 2): +# if you link PrusaSlicer 2.5.x with wxWidgets 3.2, you will most likely break it. +BuildRequires: wxWidgets-3_0-devel +BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(libudev) Requires: noto-sans-fonts @@ -102,7 +105,8 @@ sed -i tests/libslic3r/CMakeLists.txt -e '\@test_voronoi.cpp@d' %cmake \ -DSLIC3R_FHS=1 \ - -DSLIC3R_GTK=3 \ + -DSLIC3R_GTK=2 \ + -DSLIC3R_WX_STABLE=1 \ -DOPENVDB_FIND_MODULE_PATH=%{_libdir}/cmake/OpenVDB %cmake_build