mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
media-gfx/prusaslicer: dropped obsolete 2.8.1-r2
Bug: https://bugs.gentoo.org/949375 Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
This commit is contained in:
Miroslav Šulc
@@ -1,2 +1 @@
|
||||
DIST prusaslicer-2.8.1.tar.gz 69409077 BLAKE2B dd3ee810ea00d03f1790386d1fe1fd044c038429700cd33f21299abdf5def12902f7a07c23aa3d2a6cfc5e18d1e2534080889d4a33beefb493a504978a742453 SHA512 0471fa579a494d66e6b49c0bc1a9fa91f3a5f9147d8b7fa8133c6f03391f8daddddb19ed222d1be44f6f22e2de3021f3fb839331e3c3ccdf5643caa8a61d6912
|
||||
DIST prusaslicer-2.9.2.tar.gz 76992191 BLAKE2B ac88d2549baeb896137f85531eabe8e3c87b2998766e9f21d5e10be62fd421d821d2e66a818462c26fd20105fa3589e5396300f8795f0f97cbf26d11d25dd1bf SHA512 f43d6c2e639f029f91e722bcbac7db993ff4df69a850421e9acac4165bafeeb7f765a9ecab88d5bd5221524b3fbce78ae84f62d290a406406fd75644811440c1
|
||||
|
||||
@@ -1,20 +0,0 @@
|
||||
--- a/src/slic3r/Config/Version.cpp
|
||||
+++ b/src/slic3r/Config/Version.cpp
|
||||
@@ -7,6 +7,7 @@
|
||||
#include <cctype>
|
||||
|
||||
#include <boost/filesystem/operations.hpp>
|
||||
+#include <boost/filesystem/directory.hpp>
|
||||
#include <boost/nowide/fstream.hpp>
|
||||
|
||||
#include "libslic3r/libslic3r.h"
|
||||
--- a/src/slic3r/GUI/UserAccountCommunication.cpp
|
||||
+++ b/src/slic3r/GUI/UserAccountCommunication.cpp
|
||||
@@ -13,6 +13,7 @@
|
||||
#include <boost/filesystem.hpp>
|
||||
#include <boost/nowide/cstdio.hpp>
|
||||
#include <boost/nowide/fstream.hpp>
|
||||
+#include <boost/nowide/convert.hpp>
|
||||
#include <curl/curl.h>
|
||||
#include <string>
|
||||
|
||||
@@ -1,28 +0,0 @@
|
||||
From f67a877d583eba5472003f0ea4df3f7420d70734 Mon Sep 17 00:00:00 2001
|
||||
From: Gregor Riepl <onitake@gmail.com>
|
||||
Date: Mon, 27 Nov 2023 13:01:55 +0100
|
||||
Subject: [PATCH] Make initializers explicit to avoid ambiguous wxArrayString
|
||||
overloads
|
||||
|
||||
--- a/src/slic3r/GUI/PhysicalPrinterDialog.cpp
|
||||
+++ b/src/slic3r/GUI/PhysicalPrinterDialog.cpp
|
||||
@@ -606,7 +606,7 @@ void PhysicalPrinterDialog::build_printhost_settings(ConfigOptionsGroup* m_optgr
|
||||
// Always fill in the "printhost_port" combo box from the config and select it.
|
||||
{
|
||||
Choice* choice = dynamic_cast<Choice*>(m_optgroup->get_field("printhost_port"));
|
||||
- choice->set_values({ m_config->opt_string("printhost_port") });
|
||||
+ choice->set_values(std::vector<std::string>({ m_config->opt_string("printhost_port") }));
|
||||
choice->set_selection();
|
||||
}
|
||||
|
||||
--- a/src/slic3r/GUI/Plater.cpp
|
||||
+++ b/src/slic3r/GUI/Plater.cpp
|
||||
@@ -4048,7 +4048,7 @@ void Plater::load_project(const wxString& filename)
|
||||
|
||||
p->reset();
|
||||
|
||||
- if (! load_files({ into_path(filename) }).empty()) {
|
||||
+ if (! load_files(std::vector<boost::filesystem::path>({ into_path(filename) })).empty()) {
|
||||
// At least one file was loaded.
|
||||
p->set_project_filename(filename);
|
||||
// Save the names of active presets and project specific config into ProjectDirtyStateManager.
|
||||
@@ -1,20 +0,0 @@
|
||||
--- a/src/slic3r/CMakeLists.txt
|
||||
+++ b/src/slic3r/CMakeLists.txt
|
||||
@@ -383,6 +383,7 @@ set(SLIC3R_GUI_SOURCES
|
||||
)
|
||||
|
||||
find_package(NanoSVG REQUIRED)
|
||||
+find_package(OpenSSL REQUIRED)
|
||||
|
||||
if (APPLE)
|
||||
list(APPEND SLIC3R_GUI_SOURCES
|
||||
@@ -438,6 +439,9 @@ target_link_libraries(
|
||||
NanoSVG::nanosvgrast
|
||||
stb_dxt
|
||||
fastfloat
|
||||
+ OpenSSL::SSL
|
||||
+ OpenSSL::Crypto
|
||||
+ Boost::log
|
||||
)
|
||||
|
||||
if (MSVC)
|
||||
@@ -1,37 +0,0 @@
|
||||
From a7c15a3ae9877dcf7da8c8fd80de8b128251db2b Mon Sep 17 00:00:00 2001
|
||||
From: Yuri D'Elia <wavexx@thregr.org>
|
||||
Date: Fri, 3 Jan 2025 00:07:50 +0100
|
||||
Subject: [PATCH] Build libslic3r-arrange/wrapper as static
|
||||
|
||||
Fix build on linux without SLIC3R_STATIC (these are for internal use
|
||||
only).
|
||||
|
||||
- Avoids the need for installation (fixes
|
||||
https://github.com/prusa3d/PrusaSlicer/pull/13812)
|
||||
- Fixes build without PIC (fixes
|
||||
https://github.com/prusa3d/PrusaSlicer/pull/13810,
|
||||
https://github.com/prusa3d/PrusaSlicer/issues/13694), which would
|
||||
still result in broken behavior (duplicate static initialization
|
||||
crashing on startup).
|
||||
--- a/src/slic3r-arrange-wrapper/CMakeLists.txt
|
||||
+++ b/src/slic3r-arrange-wrapper/CMakeLists.txt
|
||||
@@ -1,7 +1,7 @@
|
||||
project(slic3r-arrange-wrapper)
|
||||
cmake_minimum_required(VERSION 3.13)
|
||||
|
||||
-add_library(slic3r-arrange-wrapper
|
||||
+add_library(slic3r-arrange-wrapper STATIC
|
||||
include/arrange-wrapper/Arrange.hpp
|
||||
include/arrange-wrapper/ArrangeSettingsDb_AppCfg.hpp
|
||||
include/arrange-wrapper/ArrangeSettingsView.hpp
|
||||
--- a/src/slic3r-arrange/CMakeLists.txt
|
||||
+++ b/src/slic3r-arrange/CMakeLists.txt
|
||||
@@ -1,7 +1,7 @@
|
||||
project(slic3r-arrange)
|
||||
cmake_minimum_required(VERSION 3.13)
|
||||
|
||||
-add_library(slic3r-arrange
|
||||
+add_library(slic3r-arrange STATIC
|
||||
include/arrange/Beds.hpp
|
||||
include/arrange/ArrangeItemTraits.hpp
|
||||
include/arrange/PackingContext.hpp
|
||||
@@ -1,10 +0,0 @@
|
||||
--- a/src/slic3r/GUI/UserAccountCommunication.cpp
|
||||
+++ b/src/slic3r/GUI/UserAccountCommunication.cpp
|
||||
@@ -13,6 +13,7 @@
|
||||
#include <boost/filesystem.hpp>
|
||||
#include <boost/nowide/cstdio.hpp>
|
||||
#include <boost/nowide/fstream.hpp>
|
||||
+#include <boost/nowide/convert.hpp>
|
||||
#include <curl/curl.h>
|
||||
#include <string>
|
||||
|
||||
@@ -1,117 +0,0 @@
|
||||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
WX_GTK_VER="3.2-gtk3"
|
||||
MY_PN="PrusaSlicer"
|
||||
MY_PV="$(ver_rs 3 -)"
|
||||
|
||||
inherit cmake wxwidgets xdg
|
||||
|
||||
if [[ ${PV} == *9999* ]]; then
|
||||
inherit git-r3
|
||||
EGIT_REPO_URI="https://github.com/prusa3d/prusaslicer.git"
|
||||
else
|
||||
SRC_URI="https://github.com/prusa3d/PrusaSlicer/archive/refs/tags/version_${MY_PV}.tar.gz -> ${P}.tar.gz"
|
||||
KEYWORDS="amd64 ~arm64 ~x86"
|
||||
S="${WORKDIR}/${MY_PN}-version_${MY_PV}"
|
||||
fi
|
||||
|
||||
DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)"
|
||||
HOMEPAGE="https://www.prusa3d.com/prusaslicer/"
|
||||
|
||||
LICENSE="AGPL-3 Boost-1.0 GPL-2 LGPL-3 MIT"
|
||||
SLOT="0"
|
||||
IUSE="test"
|
||||
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
RDEPEND="
|
||||
dev-cpp/eigen:3
|
||||
dev-cpp/tbb:=
|
||||
dev-libs/boost:=[nls]
|
||||
dev-libs/cereal
|
||||
dev-libs/expat
|
||||
dev-libs/glib:2
|
||||
dev-libs/gmp:=
|
||||
dev-libs/mpfr:=
|
||||
media-gfx/openvdb:=
|
||||
media-gfx/libbgcode
|
||||
net-misc/curl[adns]
|
||||
media-libs/glew:0=
|
||||
media-libs/libjpeg-turbo:=
|
||||
media-libs/libpng:0=
|
||||
media-libs/qhull:=
|
||||
net-libs/webkit-gtk:4.1
|
||||
sci-libs/libigl
|
||||
sci-libs/nlopt
|
||||
sci-libs/opencascade:=
|
||||
sci-mathematics/cgal:=
|
||||
sys-apps/dbus
|
||||
sys-libs/zlib:=
|
||||
virtual/opengl
|
||||
x11-libs/gtk+:3
|
||||
x11-libs/wxGTK:${WX_GTK_VER}=[X,opengl,webkit]
|
||||
media-libs/nanosvg:=
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
media-libs/qhull[static-libs]
|
||||
test? ( =dev-cpp/catch-2* )
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-2.6.0-dont-force-link-to-wayland-and-x11.patch"
|
||||
"${FILESDIR}/${PN}-2.8.0-missing-includes.patch"
|
||||
"${FILESDIR}/${PN}-2.8.0-wxwidgets-3.2.4.patch"
|
||||
"${FILESDIR}/${PN}-2.8.1-fixed-linking.patch"
|
||||
"${FILESDIR}/${PN}-2.8.1-cgal-6.0.patch"
|
||||
"${FILESDIR}/${PN}-2.8.1-fstream.patch"
|
||||
"${FILESDIR}/${PN}-2.8.1-fix-libsoup-double-linking.patch"
|
||||
"${FILESDIR}/${PN}-2.8.1-boost-1.87.patch"
|
||||
"${FILESDIR}/${PN}-2.9.2-boost-1.88.patch"
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
if has_version ">=sci-libs/opencascade-7.8.0"; then
|
||||
eapply "${FILESDIR}/prusaslicer-2.8.1-opencascade-7.8.0.patch"
|
||||
fi
|
||||
|
||||
sed -i -e 's/PrusaSlicer-${SLIC3R_VERSION}+UNKNOWN/PrusaSlicer-${SLIC3R_VERSION}+Gentoo/g' version.inc || die
|
||||
|
||||
sed -i -e 's/find_package(OpenCASCADE 7.6.[0-9] REQUIRED)/find_package(OpenCASCADE REQUIRED)/g' \
|
||||
src/occt_wrapper/CMakeLists.txt || die
|
||||
|
||||
# remove broken cmake find file: https://github.com/prusa3d/PrusaSlicer/issues/13608
|
||||
rm cmake/modules/FindEigen3.cmake || die
|
||||
|
||||
cmake_src_prepare
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
CMAKE_BUILD_TYPE="Release"
|
||||
|
||||
setup-wxwidgets
|
||||
|
||||
local mycmakeargs=(
|
||||
-DOPENVDB_FIND_MODULE_PATH="/usr/$(get_libdir)/cmake/OpenVDB"
|
||||
|
||||
-DSLIC3R_BUILD_TESTS=$(usex test)
|
||||
-DSLIC3R_FHS=ON
|
||||
-DSLIC3R_GTK=3
|
||||
-DSLIC3R_GUI=ON
|
||||
-DSLIC3R_PCH=OFF
|
||||
-DSLIC3R_STATIC=OFF
|
||||
-DSLIC3R_WX_STABLE=ON
|
||||
-Wno-dev
|
||||
)
|
||||
|
||||
cmake_src_configure
|
||||
}
|
||||
|
||||
src_test() {
|
||||
CMAKE_SKIP_TESTS=(
|
||||
"^libslic3r_tests$"
|
||||
)
|
||||
cmake_src_test
|
||||
}
|
||||
Reference in New Issue
Block a user