New dicord / superslicer update

This commit is contained in:
Torsten Kurbad 2024-07-02 11:21:31 +02:00
parent 7cfa23e0e8
commit c6c09f00c0
11 changed files with 93 additions and 39 deletions

View File

@ -1,5 +1,8 @@
AUX orcaslicer-2.0.0-additional-imports-fixes.patch 1449 BLAKE2B 139e68e56db3ce2dafb8719629f518e8636c9e7c217e0921a22e3bea2e952754376bb32ac4e483c4b353ac539f96a9f89e1a7fa2513b9c3da3cd8801b3083964 SHA512 941d6fc312cfe19d8478da4e2890eb6e7d8921d7c03139dc46466a99a8fa3d0c9603383c660d7370b1e832c9ee4f43d1e7bb5a72b51be3d3885694f186bb969f
AUX orcaslicer-2.0.0-boost.patch 5808 BLAKE2B 03c24c3427bfd2beed4d7de22357654f509ea0cfff1ed0edec8b5707883c410eee4fd297804774d524e5f3b71e84670d7af99704047c86f331a57f5867906ef1 SHA512 7d0f4f0ee63281c3c9e9b7999f5235048ee70e78193662f83045131dda2ac8e2dd1e536e2216b6a781d9ecc17b3f1c6d150445c8cefd0d4d3b4e27cdda70645b
AUX orcaslicer-2.0.0-cmake.patch 881 BLAKE2B c9571c402edf89b4a52986297140daf26d8f071d98ce40f31bfb27e19d0f0e999e9d38247394b7a07b4d514e8e85048f78f15bce870ec3026c9fbea7329ad955 SHA512 befa9eaeb3ff23e974eef968c7f93349eb163b732559954ff1811da6d32fbe9bf36773619b43826262f8c5a7b468ec241b0f8bcc27ea5027b5d665675db8829e
AUX orcaslicer-2.0.0-opencascade-7.8.0.patch 505 BLAKE2B 4049568da9db4de53271f7da640642c59403075e9921caba7e425f5060ed456ebd186e76d149c1c24507f7e9f3cf5f631363eea95d65011996f84dff4c675216 SHA512 8f6822b05c58ea083c978c200cde214d774274b63dcf6dcdcc434d41fe071e3c1c0b9f1dbb8a8597545e13348dde3878df18270fffd1a6948ac6af3a92669e41
AUX orcaslicer-2.0.0-wxgtk3-wayland-fix.patch 594 BLAKE2B 1a24ef0a2c673e6f6c75f1dc12ed6759574001ef1850a3130eca6033f61b9bf3901e054012272f32fbd95803edb01182b0dbcd3a12a109486737efd77eca32e0 SHA512 f0aedb0c5a7e5304a549fe664301266dc461395ccd9044b6cc3ee278c2cdceae3ac001ed09605cab66e36e154e5e8e47469db2cf1ef7f4481c9f6f97d74fe7e7
DIST orcaslicer-2.0.0.tar.gz 98242411 BLAKE2B 08ad6246c23a3109f9afc4972e1bef250cf12422c336196ee2d5ed5a723486be45fe727f25c5e64fc300480d8ad091590b0343f96219d005e7d0a370f336cc37 SHA512 fe24e6f601bec31fc99d805cc00ab20f61bb91c2ec299cf1f3de46bfe7f7592e83c5e320f95fba35d434f3e6b22773e940e785e83ef1e52c32a8bb83191056d9
EBUILD orcaslicer-2.0.0.ebuild 2598 BLAKE2B 1a2ba35f9d5dd928f6eb8eccd472dc31d6ef9c5eb28abbd9baa3412ce303b7864d7b454a84cb393ae32b89e115d6836ac00d2b46d19230e7f2872355e76a5f7c SHA512 5c5f497b64e10d223cccd71aad4b0868499e9363da4ebb607c3f79bd55dc4227e2c3f9aaca2a4ad4a4c7b27b4cb48b77759dead8b42d1cd42c70bd1881a7c239
EBUILD orcaslicer-2.0.0.ebuild 2087 BLAKE2B d3e133e5a853e0ccbaf67c4cebffcca0ca2cd158f8a03cb74d4b1cc78e1008d80c031613a86bbfd617bd3ff5bab918cfcfb654542e32c2a183be9a2bfe25bd0d SHA512 063c9c77989d675f52bb0154ae1c98a0d3a59ef92702ae84bfd446400709121b589e1c16be7aa36a9ece0bd5cd07b7274059b4b7a6e3824d52a2c5fcc411c95c
MISC metadata.xml 407 BLAKE2B ab190b5924a411b963da85b5eae38ede8b54d9adb155e560b55e5cddd6640e04d23af943f0ed9ce1aa43d78cb423a0e2e96e35c8d32be34272a37befa4904fe4 SHA512 8a8833b58d2b948d20761af8474daf10041edbd5c8aa46d6b68405bfc609396c96c8adb0a38aa6e04e51c3416adc98b28af48461b5408954a79b571ee594d0ee

View File

@ -0,0 +1,15 @@
diff '--color=auto' -urN OrcaSlicer-2.0.0.orig/CMakeLists.txt OrcaSlicer-2.0.0/CMakeLists.txt
--- OrcaSlicer-2.0.0.orig/CMakeLists.txt 2024-03-30 03:10:30.000000000 +0100
+++ OrcaSlicer-2.0.0/CMakeLists.txt 2024-06-28 14:36:37.343289495 +0200
@@ -71,6 +71,11 @@
option(SLIC3R_BUILD_TESTS "Build unit tests" OFF)
option(ORCA_TOOLS "Build Orca tools" OFF)
+set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--copy-dt-needed-entries")
+set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--copy-dt-needed-entries")
+set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--copy-dt-needed-entries")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBOOST_LOG_DYN_LINK")
+
if (IS_CROSS_COMPILE)
message("Detected cross compilation setup. Tests and encoding checks will be forcedly disabled!")
set(SLIC3R_PERL_XS OFF CACHE BOOL "" FORCE)

View File

@ -0,0 +1,17 @@
diff '--color=auto' -urN OrcaSlicer-2.0.0.orig/src/libslic3r/CMakeLists.txt OrcaSlicer-2.0.0/src/libslic3r/CMakeLists.txt
--- OrcaSlicer-2.0.0.orig/src/libslic3r/CMakeLists.txt 2024-03-30 03:10:30.000000000 +0100
+++ OrcaSlicer-2.0.0/src/libslic3r/CMakeLists.txt 2024-06-26 21:55:05.757147680 +0200
@@ -517,11 +517,8 @@
find_package(JPEG REQUIRED)
set(OCCT_LIBS
- TKXDESTEP
- TKSTEP
- TKSTEP209
- TKSTEPAttr
- TKSTEPBase
+ TKDESTEP
+ TKDESTL
TKXCAF
TKXSBase
TKVCAF

View File

@ -0,0 +1,20 @@
diff '--color=auto' -urN OrcaSlicer-2.0.0.orig/src/slic3r/GUI/GUI.cpp OrcaSlicer-2.0.0/src/slic3r/GUI/GUI.cpp
--- OrcaSlicer-2.0.0.orig/src/slic3r/GUI/GUI.cpp 2024-03-30 03:10:30.000000000 +0100
+++ OrcaSlicer-2.0.0/src/slic3r/GUI/GUI.cpp 2024-06-28 10:28:35.591515129 +0200
@@ -36,6 +36,16 @@
namespace GUI {
+// wxgtk3 is broken on wayland: https://trac.wxwidgets.org/ticket/17702
+#ifdef __WXGTK3__
+struct ForceX11 {
+ ForceX11() {
+ setenv("GDK_BACKEND", "x11", 1);
+ }
+};
+static struct ForceX11 forcex11;
+#endif
+
#if __APPLE__
IOPMAssertionID assertionID;
#endif

View File

@ -5,7 +5,6 @@ EAPI=8
WX_GTK_VER="3.2-gtk3"
MY_PN="OrcaSlicer"
#SLICER_PROFILES_COMMIT="8f3bb94a9c60be9a3b40d88a36ff05ba5cf2d6a8"
inherit cmake wxwidgets xdg flag-o-matic
@ -18,9 +17,10 @@ SRC_URI="
LICENSE="AGPL-3 Boost-1.0 GPL-2 LGPL-3 MIT"
SLOT="0"
KEYWORDS="amd64 ~arm64 ~x86"
IUSE="test"
IUSE="+doc test"
RESTRICT="test"
DOCS="README.md LICENSE.txt SECURITY.md"
# No dep on sci-libs/libigl, in-tree version cannot build
# static library currently. Using bundled one.
@ -57,29 +57,13 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}/${P}-boost.patch"
"${FILESDIR}/${P}-additional-imports-fixes.patch"
"${FILESDIR}/${P}-opencascade-7.8.0.patch"
"${FILESDIR}/${P}-cmake.patch"
"${FILESDIR}/${P}-wxgtk3-wayland-fix.patch"
)
# "${FILESDIR}/${P}-cereal.patch"
# "${FILESDIR}/${P}-dont-install-angelscript.patch"
# "${FILESDIR}/${P}-missing-includes-fix.patch"
# "${FILESDIR}/${P}-openexr3.patch"
# "${FILESDIR}/${P}-wxgtk3-wayland-fix.patch"
# "${FILESDIR}/${P}-relax-OpenCASCADE-dep.patch"
# "${FILESDIR}/${P}-link-occtwrapper-statically.patch"
# "${FILESDIR}/${P}-fix-compilation-error-gnu17.patch"
# "${FILESDIR}/${P}-libnest2d-link-xcb.patch"
# "${FILESDIR}/${P}-boost-replace-load-string-file.patch"
#)
# "${FILESDIR}/${P}-gcodeviewer-symlink-fix.patch"
# "${FILESDIR}/${P}-fix-dereferencing-in-std-unique_ptr-to-nullptr.patch"
S="${WORKDIR}/${MY_PN}-${PV}"
#src_unpack() {
# default
#
# mv slic3r-profiles-*/* "${S}"/resources/profiles/ || die
#}
src_configure() {
CMAKE_BUILD_TYPE="Release"
@ -104,8 +88,17 @@ src_configure() {
cmake_src_configure
}
src_compile() {
# Limit build to -j1
cmake_src_compile -j1
}
src_install() {
cmake_src_install
rm "${D}/usr/LICENSE.txt"
# rm "${ED}/usr/lib/udev/rules.d/90-3dconnexion.rules" || die
if use doc; then
docinto doc
dodoc -r "${S}/doc"
fi
}

View File

@ -5,14 +5,14 @@ AUX superslicer-2.5.59.12-cereal.patch 1807 BLAKE2B 0ab8eb8e7f283e09e19c55d95bd6
AUX superslicer-2.5.59.12-dont-install-angelscript.patch 427 BLAKE2B 8f853d1c8c861bcb18e3272467c5a4ca745b67790d88be9943d4cf92f1f5dfdd3b4e022ba697c90997ead2c8ad77debf7ea96fc262a21caa2087cd7b62901bdb SHA512 c4a718ead714b9d2a22cff7e9a48846954f9606290ad533c0e491429b3455f43dee7a10a93a34f564e03e9e3b2eeef87d8276f6062d770f57afef27a7fbdb868
AUX superslicer-2.5.59.12-fix-compilation-error-gnu17.patch 812 BLAKE2B b9348bfc8ba5b9c63e269b453d39f3b56de7b1c62f5dd8ad376a6fb0abe7c520cb13c3befdd18521f4abfe4cb1eccae574f9d80ae355236733b8f0e683db5a95 SHA512 bbb36ed9572f2422c69be356b8f62531f4dabe0d9a731dff0697a0358d6bc4846dbe854c4e044ca06ba0ee6f87c2f80cb137ecf27f59d11cff829791376c9508
AUX superslicer-2.5.59.12-fix-dereferencing-in-std-unique_ptr-to-nullptr.patch 5193 BLAKE2B fcd3b72d51a67dc1670526f7b40e10a1b364f59201724db2739ad85aa99ae5184c6491c7d825b75df608d30d407be4a0c39e5b023ae9a320c918bb0f1aec5ea5 SHA512 385b017212241c4daa678fa4f83ec11833f2aa17294a68d2a6ce60deafe03710dfa55f262072fe8ef96d06247a9c2dd55433091699b173c5b8c49c8f8ad1bf98
AUX superslicer-2.5.59.12-gcodeviewer-symlink-fix.patch 686 BLAKE2B 869ba2516ecfb72cc59b50be5590ff07879b146dcec7b5b7e9cebd6d42d5bb011f353e89bf921b825392f4b0dbaa0cef5032f0a5a5b691e829ae7ad84e4e31a2 SHA512 5eb73e13d691e9b5a89a5f06181e7b8a5e13e7b26a9ce80b33618ab945aaaf2d7a29bf85aa4cf702212f33994ad28f19e11359ee29055175194e13173704f3ec
AUX superslicer-2.5.59.12-libnest2d-link-xcb.patch 678 BLAKE2B 7e6328a9058206d325c77a73d7621dffe3a92c187e9d27d8173e2f0f77211fba3a87421f3827124cfe819649afbba4e5767df6636bd0b70c84f12e785e5879a9 SHA512 d6152f9465e752e0f88bd69c4cfe0b39cbd6df05f27df7b98b174bf8100b93f69feb7ba00086f67b4962a3a544bd91dcafa24679286318f9abe5609454c2eb43
AUX superslicer-2.5.59.12-link-occtwrapper-statically.patch 2916 BLAKE2B 9f28ba510235b20ad5cc8cd919bce00137b62ac1b64141ccaf0559f2e5d263b9c71539cc302a7e2ed046b3965aa5de36dff6131491a666fd90275bbbee95f450 SHA512 b49f2db32814c1bc467751f6d1b73bf22bba75e37b84b42bb0b8f42b5aa712a30cc9bb70f2210abed124509ca3d037e2450700a82d0994e8c3e4bafe498c6dc9
AUX superslicer-2.5.59.12-missing-includes-fix.patch 3819 BLAKE2B 6c2fc6fad3e91ff68d4c307f19ea7641934063a75384881fb65948869a8209dfdce79086a7fb8f5348f15f40190f90424141c0ee5e6d23f636ea05a18a06bdfa SHA512 3554e5196444463a711dcc705b03a410f84e2f1f0571d7ed014ee1b7e58801979752bae5713fb93c53fd547bfdce78cad9f206bbd93e8d0dca3a74977b137c33
AUX superslicer-2.5.59.12-opencascade-7.8.0.patch 548 BLAKE2B 726689ba17a8f4511863bc9a5adcc1254977f14eb0f546a93c5fc562991d85b284de83e63f35d90b7983606a7b90528ee2d4c2d1cd54691714767424e1c7b0e5 SHA512 2e19333d288e9c715114288686e8fc5ace4f526b28cb7dd3fe4dd5a7bc4d361367cae4ca26cca811b612c1245d8673d2224070ff5e40c1f20266a3be345b3b49
AUX superslicer-2.5.59.12-openexr3.patch 2357 BLAKE2B 0d8c889817aaa7ddcdfd9ee434a668ce56b8c6906d61e73f118d8d37ef6a86d1315191956316e7d459629a9e60291ff86f0915bc5a877722ff99f8ce55af0351 SHA512 d3516333ce841b75c4da4f178e6e099b18fe64254484c286ad5b71d284407aa2e9cd4187b4c192b7ff3557170c0cee818d252b1c11e6b09263f9c2dc216e8aeb
AUX superslicer-2.5.59.12-relax-OpenCASCADE-dep.patch 384 BLAKE2B 25be6671e091d04dca0896448786d90a36e4b6ae5c9b31c8a249aa226788f338f0e40c9a8f849e7a731ce0ba1e5e531dd314138d6c5295d64067cecd9e0be6de SHA512 57a42c6936b369ebadcefb91da32125d265a763f073d7e8d0209a87481c057066848799bac998a83ab4aacdbe4da01fa4d721794d982d52d2f5cda1df59d47b5
AUX superslicer-2.5.59.12-wxgtk3-wayland-fix.patch 485 BLAKE2B 4bd5634f39ba6132bb4216807fef254a88f07f5eb1162de12589c22b038c2876185a801ed481738d9fbbb04796952d304f17010fd61eb347213b649b13f3064d SHA512 4867192b069829ff0fd3d2bf86e2117979e505f4764223f7d0b874c15fad9cffca58d8e55a518a56cf156fee2187040115866a10e92aa903e87dc6ec909d0339
DIST superslicer-2.5.59.12-profiles.tar.gz 17931886 BLAKE2B 953a777dd12971c355a5f48148d4c3831b9435cf08f1baecb32ff0ef6245678f81c53bf5078cc4d6d04642e9ee18e1023d5d1578ebdf1384c7c1ce44a1153c50 SHA512 2e4561de7c57308a91c8964c8a957bc10c5e4cedc47c5fc37633bbcf78e3576ed1eaa6d7126485e94eb0aa593940c73a460f3d5ad65f33001d32953caa2fb4e1
DIST superslicer-2.5.59.12.tar.gz 46041538 BLAKE2B c0a94de865f22d5f953c724bb751088ba3d31e17a7d3721b04591b895d265e489251705dee5dd72691e1fdb59b2575c6f9d88cc979a17369785ef4bffeb62056 SHA512 2a482628f59f597853ca14d2c603e2919b412296165aa501f052da8fa2be5f69a54570fd9c582961c7009f423c2128ba91a28628cf0056eefe11661345b1805a
EBUILD superslicer-2.5.59.12.ebuild 2645 BLAKE2B 5a8e7b01c5bac6da120484f7e1d5b0081e63c33ca19c65b49efb374bf001323a1db6f187ef40d9db6b26fc1c5f4a820f862a2474367bb3ebd8f23ae2be802f85 SHA512 761d0a220e7cdb3fe758e7ab833258c9c55f0e0fe51bc02b50659637975aea0e1e92ffbb5f2f275c8850e1d1d01d4b605af1466f708ae3a5eacab04c2a7ee89e
EBUILD superslicer-2.5.59.12.ebuild 2638 BLAKE2B e8a8bd33520ea1b523a0691e888274c39f874e33797d0381317ad2eef7127b0e30562d4a0a1ece686e44696fb3d196bc62b404d0055d6711c9e91cef9c3c3a89 SHA512 961df2bb9a539e8cb93a57025643d372c41f5f765fac7127dab403f32dbb8dacd75589c9fc269debed39bb2c5fcddcf1c0d13d82a4c52cf1ac1a41a4fa28119c
MISC metadata.xml 413 BLAKE2B a43550366844e53b0ebed37197d33bf38efb555eee344f053f90e35e939263e3959301fdd072d5b6925d1e3e0d1fd629e2f459356e2f227006f8784a4364fc11 SHA512 8e1abc223f2e24cca551b08cbc37910f2a43319fce7299e52dd586dd6454c83e98e59b8d14c18613c8894fdca33d04297affa2da1f4aa001a5e200e4b5f2c331

View File

@ -1,11 +0,0 @@
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ba2fe01..b84292b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -300,5 +300,5 @@ else ()
install(TARGETS Slic3r RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
# Install the symlink for gcodeviewer
- install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink slic3r ${GCODEVIEWER_APP_CMD} WORKING_DIRECTORY \$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR})")
+ install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink ${SLIC3R_APP_CMD} ${GCODEVIEWER_APP_CMD} WORKING_DIRECTORY \$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR})")
endif ()

View File

@ -0,0 +1,17 @@
diff '--color=auto' -urN SuperSlicer-2.5.59.12.orig/src/occt_wrapper/CMakeLists.txt SuperSlicer-2.5.59.12/src/occt_wrapper/CMakeLists.txt
--- SuperSlicer-2.5.59.12.orig/src/occt_wrapper/CMakeLists.txt 2024-06-12 00:43:03.000000000 +0200
+++ SuperSlicer-2.5.59.12/src/occt_wrapper/CMakeLists.txt 2024-06-29 08:14:24.231392562 +0200
@@ -22,11 +22,8 @@
find_package(OpenCASCADE 7.6.2 REQUIRED)
set(OCCT_LIBS
- TKXDESTEP
- TKSTEP
- TKSTEP209
- TKSTEPAttr
- TKSTEPBase
+ TKDESTEP
+ TKDESTL
TKXCAF
TKXSBase
TKVCAF

View File

@ -66,8 +66,8 @@ PATCHES=(
"${FILESDIR}/${P}-fix-compilation-error-gnu17.patch"
"${FILESDIR}/${P}-libnest2d-link-xcb.patch"
"${FILESDIR}/${P}-boost-replace-load-string-file.patch"
"${FILESDIR}/${P}-opencascade-7.8.0.patch"
)
# "${FILESDIR}/${P}-gcodeviewer-symlink-fix.patch"
# "${FILESDIR}/${P}-fix-dereferencing-in-std-unique_ptr-to-nullptr.patch"
# "${FILESDIR}/${P}-additional-imports-fixes.patch"

View File

@ -1,3 +1,3 @@
DIST discord-0.0.57.tar.gz 101436594 BLAKE2B 689d7b8dc6ad266a2e6d1ce7212761279a320c5e517ec6ba396f1ad043f3bd07f674f1bbafdbe3536f6f0a2001483d6f824bc02edd640462e2609190c727cabd SHA512 5db4a92ca32fd697f7319f81fd4dc29ac6df0296e8a2c55acae25df7225e546880760f3e0b72a09734a01251444aa37320a3db671cf052592daaef78856e7fee
EBUILD discord-0.0.57.ebuild 3517 BLAKE2B 376f475de1231064440fa4508621101f2668319cc0d1b91592bfed39e5673994fc2c7a6fbd4e8df88e301d17ca6975e75cb2a5ecc0db591ad608235ad29769c1 SHA512 2e7678d3c65b235ec6d955e13af6b73447a1e32cd79592bcca1948ab232cb5f6f270cc6cc61c8f356f9c32ad539d9920f613d2df749590fd9498a1195532e751
DIST discord-0.0.58.tar.gz 103212154 BLAKE2B 62b9d598c101c885cd87277020d1d1182fd288b4c3883f1f8b16f12fe62df81725dcc70167c644eb4195a0e6019004033f4775e37ae24382ff4eadddf0f0d465 SHA512 8efab6f4a476c05b620f3e95c082ae3f5423a2aaab310687f8b67711b0b34e7c82105e8c9ea5d4e0b92fc368443bc6a0e8970143d28ef7cb2d5f9e05f85b038d
EBUILD discord-0.0.58.ebuild 3517 BLAKE2B 376f475de1231064440fa4508621101f2668319cc0d1b91592bfed39e5673994fc2c7a6fbd4e8df88e301d17ca6975e75cb2a5ecc0db591ad608235ad29769c1 SHA512 2e7678d3c65b235ec6d955e13af6b73447a1e32cd79592bcca1948ab232cb5f6f270cc6cc61c8f356f9c32ad539d9920f613d2df749590fd9498a1195532e751
MISC metadata.xml 506 BLAKE2B ff098a1c9341a94ebb21da57c3028d3d96e884e19e3adf2df8d50b694a1ca3eee61f5dfd90eaa557a0a0eee769fd11dfa7bbf63308386a11faa56d13687e33c3 SHA512 56baf0a5323057b4af83a7b7d760b2b1e071e15ca4eef6546eab4104fbdd026906f68d8023a3155f492d8d93cd7022c5d0017372cbaf2894b94bd253b2ce3665