diff options
| -rw-r--r-- | .SRCINFO | 12 | ||||
| -rw-r--r-- | 0001-Replace-deprecated-Boost-header-in-admesh.patch | 63 | ||||
| -rw-r--r-- | PKGBUILD | 20 | ||||
| -rw-r--r-- | start-superslicer.sh | 7 | ||||
| -rw-r--r-- | superslicer.desktop | 12 |
5 files changed, 97 insertions, 17 deletions
@@ -1,6 +1,6 @@ pkgbase = superslicer pkgdesc = G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.) - pkgver = 2.3.55.5 + pkgver = 2.2.54.2 pkgrel = 3 url = https://github.com/supermerill/SuperSlicer arch = x86_64 @@ -19,12 +19,16 @@ pkgbase = superslicer depends = boost>=1.73.0 depends = qhull>=2020.2-4 replaces = slic3r++ - source = https://github.com/supermerill//SuperSlicer/archive/2.3.55.5.tar.gz + source = https://github.com/supermerill//SuperSlicer/archive/2.2.54.2.tar.gz + source = superslicer.desktop source = start-superslicer.sh source = 0001-wxgtk3-is-broken-on-wayland.patch - sha512sums = eeaabea0754220b3f9845cadc0f33cc9bb322ccf1e74ae7f94b855c23dfd9b08a083210aca16338eee7c652ab6bb5bae01b0a216f6d0a664af7c7db866298214 - sha512sums = 9a91e374b606447889ac517061fe559d7cbc7c6b2a79d521d46205b6ffdb8264e6fbcc09f62a6c6e462c1172b0ed08b1d4ddf839a3cc448ae1717888f1df287e + source = 0001-Replace-deprecated-Boost-header-in-admesh.patch + sha512sums = 3e28d28f463be49217d4aa19691bd190d644f86474786db69ec82d58090d2231a6c0add66eec59ac9f8c2169bfcd730a0c9deafd9df48182e92194bf6d2f39b6 + sha512sums = 8f75de56ba3e29b9c650d2946bd11afcf406a7fd42d2620ec44e4e76f6b64626de720190ce0f8be29ba7c48f714bfa0a71c45f868bdce7bc1ac7dbbc0e9e7583 + sha512sums = abfbd056be518b1b733cddef6c430cc3c4199d5df13067574dd3269cf35b798e11b43f55f1dfb57d6d8ee1da06882825fef0f7a170a9b069b95e9aea1ec8f31d sha512sums = acf35ebe467e9fb30f1b77d15348f1a7b82dcf45a5b829e375e972b5d6b49968603b3fa090c4d1f56e8b5148e2b820e79afa269da60ace70de1ceadcf6e820c5 + sha512sums = 9a860dbac69ca7a195ef43cb2b80a8b5cf2c34bddb91867aa8ba16bbb754ab68c4baf57fa7e2562f96facc435c64ed8445505edb152382dbc5106a509136a2c8 pkgname = superslicer diff --git a/0001-Replace-deprecated-Boost-header-in-admesh.patch b/0001-Replace-deprecated-Boost-header-in-admesh.patch new file mode 100644 index 000000000000..bea239bfadcb --- /dev/null +++ b/0001-Replace-deprecated-Boost-header-in-admesh.patch @@ -0,0 +1,63 @@ +From 3a194f91871684b5fc8c6c78300b87e0ee1cb610 Mon Sep 17 00:00:00 2001 +From: Megidd <megiddgit@gmail.com> +Date: Mon, 21 Sep 2020 18:00:52 +0330 +Subject: [PATCH] Replace deprecated Boost header in "admesh" + +--- + src/admesh/stlinit.cpp | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/src/admesh/stlinit.cpp b/src/admesh/stlinit.cpp +index 390fe56a4..6aa2c4417 100644 +--- a/src/admesh/stlinit.cpp ++++ b/src/admesh/stlinit.cpp +@@ -28,7 +28,7 @@ + + #include <boost/log/trivial.hpp> + #include <boost/nowide/cstdio.hpp> +-#include <boost/detail/endian.hpp> ++#include <boost/predef/other/endian.h> + + #include "stl.h" + +@@ -36,9 +36,9 @@ + #error "SEEK_SET not defined" + #endif + +-#ifndef BOOST_LITTLE_ENDIAN ++#if BOOST_ENDIAN_BIG_BYTE + extern void stl_internal_reverse_quads(char *buf, size_t cnt); +-#endif /* BOOST_LITTLE_ENDIAN */ ++#endif /* BOOST_ENDIAN_BIG_BYTE */ + + static FILE* stl_open_count_facets(stl_file *stl, const char *file) + { +@@ -89,10 +89,10 @@ static FILE* stl_open_count_facets(stl_file *stl, const char *file) + // Read the int following the header. This should contain # of facets. + uint32_t header_num_facets; + bool header_num_faces_read = fread(&header_num_facets, sizeof(uint32_t), 1, fp) != 0; +-#ifndef BOOST_LITTLE_ENDIAN ++#if BOOST_ENDIAN_BIG_BYTE + // Convert from little endian to big endian. + stl_internal_reverse_quads((char*)&header_num_facets, 4); +-#endif /* BOOST_LITTLE_ENDIAN */ ++#endif /* BOOST_ENDIAN_BIG_BYTE */ + if (! header_num_faces_read || num_facets != header_num_facets) + BOOST_LOG_TRIVIAL(info) << "stl_open_count_facets: Warning: File size doesn't match number of facets in the header: " << file; + } +@@ -158,10 +158,10 @@ static bool stl_read(stl_file *stl, FILE *fp, int first_facet, bool first) + // Read a single facet from a binary .STL file. We assume little-endian architecture! + if (fread(&facet, 1, SIZEOF_STL_FACET, fp) != SIZEOF_STL_FACET) + return false; +-#ifndef BOOST_LITTLE_ENDIAN ++#if BOOST_ENDIAN_BIG_BYTE + // Convert the loaded little endian data to big endian. + stl_internal_reverse_quads((char*)&facet, 48); +-#endif /* BOOST_LITTLE_ENDIAN */ ++#endif /* BOOST_ENDIAN_BIG_BYTE */ + } else { + // Read a single facet from an ASCII .STL file + // skip solid/endsolid +-- +2.29.2 + @@ -1,22 +1,26 @@ # Maintainer: Lukas1818 aur at lukas1818 dot de pkgname=superslicer -pkgver=2.3.55.5 +pkgver=2.2.54.2 _pkgtag=$pkgver pkgrel=3 pkgdesc="G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)" -arch=("$CARCH") +arch=('x86_64') url="https://github.com/supermerill/SuperSlicer" license=('AGPL3') depends=('cgal' 'glew' 'nlopt' 'openvdb' 'wxgtk3-dev-opt' 'boost>=1.73.0' 'qhull>=2020.2-4') replaces=('slic3r++') makedepends=('cereal' 'cmake' 'eigen' 'libigl' 'openvdb' 'wxgtk2-dev-opt') # cmake doesn't detect wx if not both gtk2 and gtk3 are installed source=("https://github.com/supermerill//SuperSlicer/archive/$_pkgtag.tar.gz" + "superslicer.desktop" "start-superslicer.sh" - "0001-wxgtk3-is-broken-on-wayland.patch") -sha512sums=('eeaabea0754220b3f9845cadc0f33cc9bb322ccf1e74ae7f94b855c23dfd9b08a083210aca16338eee7c652ab6bb5bae01b0a216f6d0a664af7c7db866298214' - '9a91e374b606447889ac517061fe559d7cbc7c6b2a79d521d46205b6ffdb8264e6fbcc09f62a6c6e462c1172b0ed08b1d4ddf839a3cc448ae1717888f1df287e' - 'acf35ebe467e9fb30f1b77d15348f1a7b82dcf45a5b829e375e972b5d6b49968603b3fa090c4d1f56e8b5148e2b820e79afa269da60ace70de1ceadcf6e820c5') + "0001-wxgtk3-is-broken-on-wayland.patch" + "0001-Replace-deprecated-Boost-header-in-admesh.patch") +sha512sums=('3e28d28f463be49217d4aa19691bd190d644f86474786db69ec82d58090d2231a6c0add66eec59ac9f8c2169bfcd730a0c9deafd9df48182e92194bf6d2f39b6' + '8f75de56ba3e29b9c650d2946bd11afcf406a7fd42d2620ec44e4e76f6b64626de720190ce0f8be29ba7c48f714bfa0a71c45f868bdce7bc1ac7dbbc0e9e7583' + 'abfbd056be518b1b733cddef6c430cc3c4199d5df13067574dd3269cf35b798e11b43f55f1dfb57d6d8ee1da06882825fef0f7a170a9b069b95e9aea1ec8f31d' + 'acf35ebe467e9fb30f1b77d15348f1a7b82dcf45a5b829e375e972b5d6b49968603b3fa090c4d1f56e8b5148e2b820e79afa269da60ace70de1ceadcf6e820c5' + '9a860dbac69ca7a195ef43cb2b80a8b5cf2c34bddb91867aa8ba16bbb754ab68c4baf57fa7e2562f96facc435c64ed8445505edb152382dbc5106a509136a2c8') prepare() { @@ -27,6 +31,7 @@ prepare() # apply patches patch --forward --strip=1 --input="$srcdir/0001-wxgtk3-is-broken-on-wayland.patch" + patch --forward --strip=1 --input="$srcdir/0001-Replace-deprecated-Boost-header-in-admesh.patch" } build() @@ -56,6 +61,9 @@ package() make DESTDIR="$pkgdir" install test ! -h "$pkgdir/usr/share/SuperSlicer/resources" || rm "$pkgdir/usr/share/SuperSlicer/resources" + install -d "$pkgdir/usr/share/applications" + install -m 644 "$srcdir/superslicer.desktop" "$pkgdir/usr/share/applications/" + mv "$pkgdir/usr/bin/superslicer" "$pkgdir/usr/share/SuperSlicer" install -Dm 755 "${srcdir}/start-superslicer.sh" "${pkgdir}/usr/bin/superslicer" } diff --git a/start-superslicer.sh b/start-superslicer.sh index 7bf3fdb3c477..9c38b060309b 100644 --- a/start-superslicer.sh +++ b/start-superslicer.sh @@ -1,9 +1,2 @@ #!/bin/bash - -if [ -d "$HOME/.SuperSlicer" ] && [ ! -d "$HOME/.config/SuperSlicer-alpha" ] -then - echo "copy data from ~/.SuperSlicer to the new data folder ~/.config/SuperSlicer-alpha" - cp -r "$HOME/.SuperSlicer" "$HOME/.config/SuperSlicer-alpha" -fi - LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/opt/wxgtk-dev/lib" /usr/share/SuperSlicer/superslicer "$@" diff --git a/superslicer.desktop b/superslicer.desktop new file mode 100644 index 000000000000..2dedba6947f0 --- /dev/null +++ b/superslicer.desktop @@ -0,0 +1,12 @@ +[Desktop Entry] +Name=SuperSlicer +Comment=G-code generator for 3D printers +Exec=superslicer %F +Icon=/usr/share/SuperSlicer/icons/Slic3r_192px.png +Terminal=false +StartupNotify=false +Type=Application +MimeType=model/stl;model/obj;model/amf;model/3mf;model/prusa +Encoding=UTF-8 +Categories=Graphics;3DGraphics; +Keywords=3D;Printing;Slicer; |