[gentoo-commits] repo/proj/guru:dev commit in: media-gfx/superslicer/, media-gfx/superslicer/files/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/proj/guru:dev commit in: media-gfx/superslicer/, media-gfx/superslicer/files/
@ 2021-12-04 20:15 Yahor Berdnikau
  0 siblings, 0 replies; 7+ messages in thread
From: Yahor Berdnikau @ 2021-12-04 20:15 UTC (permalink / raw
  To: gentoo-commits

commit:     62b321a0809520d9454e284736301b19f12b273d
Author:     Yahor Berdnikau <egorr.berd <AT> gmail <DOT> com>
AuthorDate: Sat Dec  4 19:57:06 2021 +0000
Commit:     Yahor Berdnikau <egorr.berd <AT> gmail <DOT> com>
CommitDate: Sat Dec  4 20:15:19 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=62b321a0

media-gfx/superslicer: new package

Added slotted ebuilds for 2.2.53.4 and 2.3.56.9 SuperSlicer versions.

Signed-off-by: Yahor Berdnikau <egorr.berd <AT> gmail.com>

 media-gfx/superslicer/Manifest                     |  16 +++
 ...or-HiDPI-in-OpenGL-on-Linux-GTK3-2.2.53.4.patch |  64 +++++++++++
 .../superslicer/files/boost-endian-2.2.53.4.patch  |  49 +++++++++
 .../files/boost-mouse-atomic-2.2.53.4.patch        |   9 ++
 .../files/freecad-dialog-2.2.53.4.patch            |   9 ++
 .../files/miniz-zip-header-2.2.53.4.patch          |  20 ++++
 .../files/missing-imports-2.3.56.9.patch           | 118 +++++++++++++++++++++
 .../files/string-to-char-conversion-2.3.56.9.patch |  10 ++
 .../files/version-suffix-2.2.53.4.patch            |  13 +++
 .../files/version-suffix-2.3.56.9.patch            |  17 +++
 .../wxwidget-canvas-set-context-2.3.56.9.patch     |  11 ++
 media-gfx/superslicer/metadata.xml                 |  14 +++
 media-gfx/superslicer/superslicer-2.2.53.4.ebuild  |  88 +++++++++++++++
 media-gfx/superslicer/superslicer-2.3.56.9.ebuild  | 112 +++++++++++++++++++
 14 files changed, 550 insertions(+)

diff --git a/media-gfx/superslicer/Manifest b/media-gfx/superslicer/Manifest
new file mode 100644
index 000000000..db834aeb2
--- /dev/null
+++ b/media-gfx/superslicer/Manifest
@@ -0,0 +1,16 @@
+AUX Support-for-HiDPI-in-OpenGL-on-Linux-GTK3-2.2.53.4.patch 2485 BLAKE2B 3dbb842ec582212b91c3938750d42afb32e790e2f3f0e42ee11ed7bff0e8b5c3c8deb8968d3e3b8fd5fcf12767c06361489c24c780121681991a29d9435d38b3 SHA512 6412b8492ef8581b412f8e35d88f2a78a00a317db2aa3a9a35a85881b4b71b62c54982bc2aa1a74c022a7aaa31611687457e3f00adcb1f619a2ff7b54bcecd1c
+AUX boost-endian-2.2.53.4.patch 1789 BLAKE2B b436e2e15edcee8e1713231e18a4973764ee20c7d142248a71b2ff6f9deabab7e7540f5043db8d60732eea07c8eac77d2086356a6875f0c475e0d1c0db0a3517 SHA512 a31808a54232fa68e09f737981cae75e785ae20d07dd8b1b885431532bb6d2c11aea81bb625f90a84bbd34d66d0d0922556c17feab75f624bb1df44a52df22b1
+AUX boost-mouse-atomic-2.2.53.4.patch 201 BLAKE2B 51de568b16301cd0ffb4b8645b29b74c791b532815fcc53291f87a7eaf1077169996cd6a8d4ef0bad990774e27931c522441980ac7e8b4e0b598e016dfc7d751 SHA512 84292f447a88e35b3046c6ed838af1297cc5ba340768adacaf000de0a2d2f7f5d97ac30e54eafce93d8007524cd245b2d6700ff095ba5d0c8ceb08a3515f5a0f
+AUX freecad-dialog-2.2.53.4.patch 481 BLAKE2B 1ad2d3e195c5c5bada1200133f702e0072e67b93f0ba56c5971bff52416f44e05ccba5eb3e47a240c76306b333884c4e1e0104052f9ade58265cb56b230e078b SHA512 a42806fe4fd64fea888cdb45b70ad9846022b6acf80ce6a8cc5cac758bbec161fd70379be95d2f62a3197f961fbccdd408eb2d6895d920748d14c134d22efac4
+AUX miniz-zip-header-2.2.53.4.patch 627 BLAKE2B f75874226b8e3b42080fb9adabc7b0bc73cc62f01839925f7d5c565df4eb9368c8ea5396760d8ff917f22766da0a60cfa1bb48a9b2c428a03ab0221de1cd796b SHA512 4b668d32fa66c192c6130b678061b6c63388971a950a9610d03041983972b7ce3f49405f2d7b4e2b41bb8146ab3b8ed95c009ef8be5c5f8c57067c7887adb306
+AUX missing-imports-2.3.56.9.patch 3114 BLAKE2B ff21f476f0e04df3c694a4962cfb3b588c9799ffe4a60df2d1149800dc81edd734110eb06841dd0da3118b6d4174e58ab581021b826779f221c66b46af4448b9 SHA512 0f30957f28140de61a10adcf625358d0df7ea6c0a4ef48061a31a324d9487496792f72506ac5f235d749402ad049cea9e418f9fd8814e641f5815f43c6c295ce
+AUX string-to-char-conversion-2.3.56.9.patch 713 BLAKE2B 726166a605a711350bc436bd31a69211750e3e9cc459a03091c4e857ae600b6d0b5c3ed8528334eed09ff0453c39f381cc4aef7391a9e310f5ffdee55225cb89 SHA512 1156f1cdbc8d27d5b24cce0cecbfa26479e5e340e8895d20bbd0d4588068011d12e3a57a536c4ac7d4c5a3105d4c8d6b7274df9cf1b7c45c33642401ab3f3985
+AUX version-suffix-2.2.53.4.patch 468 BLAKE2B 9b698a981bf0101d8ce39c32afe3b1e9559fe1fcb00cbd45bec95d56d222736abd79394b181d9eb164aa67096542bfcc61a8d031b8f82bda41a48a7aa5235968 SHA512 5bd96eb4b4ae6b1050a8843868479a3cead2fa214476170c05305a98b48e8d3bb3d3c57cfc1e5993a33fa95989b07a83ae117820de3e1892cfd7b95a819ea079
+AUX version-suffix-2.3.56.9.patch 628 BLAKE2B 0890f85e487b33012a498845319042faf653e50a9a7857a5792fc5ee4c273a45954db7e228ccdbbfb3d95f46a59c3c737447a8de44e44dc833b55c80685a7eff SHA512 3a457236422b9124ee405d5e97432419da8a2fff2b1d1e88de109670218d9456c26d613aa05341db973e283e0bc6d8ef27a756398726f6d546eb44fc8f16c948
+AUX wxwidget-canvas-set-context-2.3.56.9.patch 404 BLAKE2B 443e6a78147d002e54c552ebd217c494125d092a3c241a5407b3df2198ef0be4ab25bd074ca213d3bf75c8459d3c15772d4de44b71d2bd94af14513765eed573 SHA512 0ad5754c82d6e4273d6860aacaa05a26b84f876d7eb34703f506fe97e9f916ffc735ec203fe2d5da1aa16eee3918e26594364fca0d54984f4988256f980a0dba
+DIST superslicer-2.2.53.4.tar.gz 33791161 BLAKE2B c8454ac66a5d75f5bbcd1c29f600897c697f03ad581c97539033758942eac1d4ba0d2acbac43e75307a06e565d25a39b192e6cde522cce6b728afc04c42f82bb SHA512 f883cca3eb2575186c5077e2c1f9ca37e497ff6ed9aeae45a58c1db4de1c52db36fc0f14e7fdcd95aaf375b340932674014614cdab8c6995c56b9988fe5baa06
+DIST superslicer-2.3.56.9-profiles.zip 12193950 BLAKE2B c61be0190345bf886cbe60495f95266ec0b07824c803eaca7a29853a3465ab3d631d794899aebb9ef5f7660cb9341c70e9c38d6f8247a58655ed720deebbc584 SHA512 6beab170ae7e50e9880288673fd482f2903d5e9b87a0ddd6549098fa35f9b87e4891f015d0a26aedfac9736c3f55dcd1794d8abb3f9cc072bcdbb7e87f42a9fa
+DIST superslicer-2.3.56.9.tar.gz 32260311 BLAKE2B 2da3201d789dd66a4a26c365b020f67dd5f43a71b9616681eb5dfed1ec759943398ce82fa2c8d5fd9a4f66a6887c25f0f86286ec4f52364a97a29cee548c3f0c SHA512 05c57765770889dc365eb721a2e6491f16de5a03c03493a682c49b769435d6db6e0ad52c0cfced7aa402dc751e4fdcbfc0623fa82d8431e45a590e64b12b6769
+EBUILD superslicer-2.2.53.4.ebuild 2170 BLAKE2B 24d707ffe3d2feb9ba625411755056337df14b6cd540ca64551d0fe32b080c597604fe404b0239ac0e13eca54b1622f90f4ebcb201ac627acbc2f7e4bdc4a0f4 SHA512 bbc8bf3a2b66dd7ae5fa3749c7ab123a1983f9842966ea5bf3024dfc75ccd57c5dc2fc45b2cabc9dd0a5e01af97716603fbdab9052e19728a2b1f8b94264037d
+EBUILD superslicer-2.3.56.9.ebuild 3374 BLAKE2B 40f8173e21a5fd676a5f674d362669740d9a3b35c070218c0d674254c2bd9cf615b29c1a181129d937e1d877aefa54129839af26927ed4b50068c24a9a498a11 SHA512 fd785be9d565132f7709399ae6247d792036ec7cbb4cd961b6dfde6bcb99fcd8f168004a9a4ccb1d3ea3f936066311ebaebf74806252657d6b920677cc6fa742
+MISC metadata.xml 469 BLAKE2B 542259ec3961e5fbeae4a0fd894f2a289278a86039a9a7862e6ec2c745b32433ed9b6dbf6659a171f2decddea2018dc7e608404f4b7c99aa94d236a86fdc5b2d SHA512 28a53bfcfc4ab83cf071f2d7e5ec939251b569d1a657bc725ee5530a7a1d18c67926fabb911dc48912a0bb43a2058fad84622f04e4fe3dd9838935d8cd3e4fb6

diff --git a/media-gfx/superslicer/files/Support-for-HiDPI-in-OpenGL-on-Linux-GTK3-2.2.53.4.patch b/media-gfx/superslicer/files/Support-for-HiDPI-in-OpenGL-on-Linux-GTK3-2.2.53.4.patch
new file mode 100644
index 000000000..214395524
--- /dev/null
+++ b/media-gfx/superslicer/files/Support-for-HiDPI-in-OpenGL-on-Linux-GTK3-2.2.53.4.patch
@@ -0,0 +1,64 @@
+From a13b35ce92efed202ef43f02debb83dfb533d9b0 Mon Sep 17 00:00:00 2001
+From: Vojtech Bubnik <bubnikv@gmail.com>
+Date: Tue, 15 Dec 2020 12:14:30 +0100
+Subject: [PATCH] Support for HiDPI in OpenGL on Linux / GTK3. wxGTK3 HiDPI
+ support seems to emulate what OSX does quite closely, thus the changes are
+ relatively minimal.
+
+Also fixed an ugly rounding issue when populating the ImGUI font map
+with image thumbnails.
+
+Fixes Gtk3 issue on 4k+ screens #4135
+Fixes HiDPI screens with Wayland on Fedora 30 cause Plater view to be too small. #3245
+
+Signed-off-by: Yahor Berdnikau <egorr.berd@gmail.com>
+---
+ src/slic3r/GUI/GLCanvas3D.cpp   | 10 +++++++++-
+ src/slic3r/GUI/GLCanvas3D.hpp   |  5 +++--
+ src/slic3r/GUI/ImGuiWrapper.cpp |  8 ++++++--
+ src/slic3r/GUI/MainFrame.cpp    |  3 ++-
+ 4 files changed, 20 insertions(+), 6 deletions(-)
+
+diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp
+index e778de879..c2e442431 100644
+--- a/src/slic3r/GUI/GLCanvas3D.cpp
++++ b/src/slic3r/GUI/GLCanvas3D.cpp
+@@ -86,6 +86,13 @@ static const size_t VERTEX_BUFFER_RESERVE_SIZE_SUM_MAX = 1024 * 1024 * 128 / 4;
+ namespace Slic3r {
+ namespace GUI {
+ 
++#ifdef __WXGTK3__
++// wxGTK3 seems to simulate OSX behavior in regard to HiDPI scaling support.
++RetinaHelper::RetinaHelper(wxWindow* window) : m_window(window), m_self(nullptr) {}
++RetinaHelper::~RetinaHelper() {}
++float RetinaHelper::get_scale_factor() { return float(m_window->GetContentScaleFactor()); }
++#endif // __WXGTK3__
++
+ Size::Size()
+     : m_width(0)
+     , m_height(0)
+@@ -3732,7 +3739,8 @@ void GLCanvas3D::update_ui_from_settings()
+ {
+     m_dirty = true;
+ 
+-#if ENABLE_RETINA_GL
++#if __APPLE__
++    // Update OpenGL scaling on OSX after the user toggled the "use_retina_opengl" settings in Preferences dialog.
+     const float orig_scaling = m_retina_helper->get_scale_factor();
+ 
+     const bool use_retina = wxGetApp().app_config->get("use_retina_opengl") == "1";
+diff --git a/src/slic3r/GUI/GLCanvas3D.hpp b/src/slic3r/GUI/GLCanvas3D.hpp
+index 9c80aa236..e64e65d1b 100644
+--- a/src/slic3r/GUI/GLCanvas3D.hpp
++++ b/src/slic3r/GUI/GLCanvas3D.hpp
+@@ -31,7 +31,8 @@ class wxPaintEvent;
+ class wxGLCanvas;
+ class wxGLContext;
+ 
+-// Support for Retina OpenGL on Mac OS
+-#define ENABLE_RETINA_GL __APPLE__
++// Support for Retina OpenGL on Mac OS.
++// wxGTK3 seems to simulate OSX behavior in regard to HiDPI scaling support, enable it as well.
++#define ENABLE_RETINA_GL (__APPLE__ || __WXGTK3__)
+ 
+ namespace Slic3r {

diff --git a/media-gfx/superslicer/files/boost-endian-2.2.53.4.patch b/media-gfx/superslicer/files/boost-endian-2.2.53.4.patch
new file mode 100644
index 000000000..226ad261a
--- /dev/null
+++ b/media-gfx/superslicer/files/boost-endian-2.2.53.4.patch
@@ -0,0 +1,49 @@
+--- 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 @@
+     	// 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 @@
+       		// 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

diff --git a/media-gfx/superslicer/files/boost-mouse-atomic-2.2.53.4.patch b/media-gfx/superslicer/files/boost-mouse-atomic-2.2.53.4.patch
new file mode 100644
index 000000000..e7556e0aa
--- /dev/null
+++ b/media-gfx/superslicer/files/boost-mouse-atomic-2.2.53.4.patch
@@ -0,0 +1,9 @@
+--- a/src/slic3r/GUI/Mouse3DController.hpp
++++ b/src/slic3r/GUI/Mouse3DController.hpp
+@@ -11,5 +11,6 @@
+ #include "hidapi.h"
+
+ #include <queue>
++#include <atomic>
+ #include <thread>
+ #include <vector>

diff --git a/media-gfx/superslicer/files/freecad-dialog-2.2.53.4.patch b/media-gfx/superslicer/files/freecad-dialog-2.2.53.4.patch
new file mode 100644
index 000000000..880ef6b1f
--- /dev/null
+++ b/media-gfx/superslicer/files/freecad-dialog-2.2.53.4.patch
@@ -0,0 +1,9 @@
+--- a/src/slic3r/GUI/FreeCADDialog.cpp
++++ b/src/slic3r/GUI/FreeCADDialog.cpp
+@@ -706,5 +706,5 @@
+     m_text->Bind(wxEVT_KEY_DOWN, &FreeCADDialog::on_key_type, this);
+     m_text->Bind(wxEVT_CHAR, &FreeCADDialog::on_char_type, this);
+-    m_text->Bind(wxEVT_STC_AUTOCOMP_COMPLETED, &FreeCADDialog::on_autocomp_complete, this);
++   //m_text->Bind(wxEVT_STC_AUTOCOMP_COMPLETED, &FreeCADDialog::on_autocomp_complete, this);
+     m_text->Connect(wxID_ANY,
+            wxEVT_KEY_DOWN,

diff --git a/media-gfx/superslicer/files/miniz-zip-header-2.2.53.4.patch b/media-gfx/superslicer/files/miniz-zip-header-2.2.53.4.patch
new file mode 100644
index 000000000..2294ba0b5
--- /dev/null
+++ b/media-gfx/superslicer/files/miniz-zip-header-2.2.53.4.patch
@@ -0,0 +1,20 @@
+https://bugs.gentoo.org/761541
+--- a/src/libslic3r/miniz_extension.hpp	2021-01-11 08:01:51.000000000 -0500
++++ b/src/libslic3r/miniz_extension.hpp	2021-01-12 01:16:10.503404521 -0500
+@@ -4,4 +4,5 @@
+ #include <string>
+ #include <miniz.h>
++#include <miniz_zip.h>
+ 
+ namespace Slic3r {
+
+--- a/src/libslic3r/Format/3mf.cpp
++++ b/src/libslic3r/Format/3mf.cpp
+@@ -30,6 +30,7 @@ namespace pt = boost::property_tree;
+ #include <expat.h>
+ #include <Eigen/Dense>
+ #include "miniz_extension.hpp"
++#include <miniz_zip.h>
+
+ // VERSION NUMBERS
+ // 0 : .3mf, files saved by older slic3r or other applications. No version definition in them.

diff --git a/media-gfx/superslicer/files/missing-imports-2.3.56.9.patch b/media-gfx/superslicer/files/missing-imports-2.3.56.9.patch
new file mode 100644
index 000000000..200f1663c
--- /dev/null
+++ b/media-gfx/superslicer/files/missing-imports-2.3.56.9.patch
@@ -0,0 +1,118 @@
+--- a/src/libslic3r/AppConfig.cpp
++++ b/src/libslic3r/AppConfig.cpp
+@@ -10,6 +10,7 @@
+
+ #include <boost/filesystem/path.hpp>
+ #include <boost/filesystem/operations.hpp>
++#include <boost/locale/generator.hpp>
+ #include <boost/nowide/cenv.hpp>
+ #include <boost/nowide/fstream.hpp>
+ #include <boost/property_tree/ini_parser.hpp>
+
+--- a/src/libslic3r/Format/CWS.cpp
++++ b/src/libslic3r/Format/CWS.cpp
+@@ -1,6 +1,8 @@
+ #include "libslic3r/Format/CWS.hpp"
+ #include "libslic3r/PrintConfig.hpp"
+ #include "libslic3r/Time.hpp"
++#include <boost/filesystem.hpp>
++#include <boost/log/trivial.hpp>
+
+ namespace Slic3r {
+
+--- a/src/slic3r/GUI/CalibrationAbstractDialog.cpp
++++ b/src/slic3r/GUI/CalibrationAbstractDialog.cpp
+@@ -5,6 +5,7 @@
+ #include "GUI.hpp"
+ #include "GUI_ObjectList.hpp"
+ #include "Tab.hpp"
++#include <boost/filesystem.hpp>
+ #include <wx/scrolwin.h>
+ #include <wx/display.h>
+ #include <wx/file.h>
+
+--- a/src/slic3r/GUI/Preferences.cpp
++++ b/src/slic3r/GUI/Preferences.cpp
+@@ -4,6 +4,7 @@
+ #include "Plater.hpp"
+ #include "I18N.hpp"
+ #include "libslic3r/AppConfig.hpp"
++#include <boost/filesystem.hpp>
+ #include <wx/notebook.h>
+
+ namespace Slic3r {
+
+--- a/src/slic3r/GUI/GUI_ObjectList.cpp
++++ b/src/slic3r/GUI/GUI_ObjectList.cpp
+@@ -15,6 +15,7 @@
+ #include "Selection.hpp"
+
+ #include <boost/algorithm/string.hpp>
++#include <boost/log/trivial.hpp>
+ #include "slic3r/Utils/FixModelByWin10.hpp"
+
+ #ifdef __WXMSW__
+--- a/src/slic3r/GUI/Tab.cpp
++++ b/src/slic3r/GUI/Tab.cpp
+@@ -22,6 +22,7 @@
+
+ #include <wx/bmpcbox.h>
+ #include <wx/bmpbuttn.h>
++#include <wx/collpane.h>
+ #include <wx/treectrl.h>
+ #include <wx/imaglist.h>
+ #include <wx/settings.h>
+--- a/src/slic3r/GUI/3DBed.cpp
++++ b/src/slic3r/GUI/3DBed.cpp
+@@ -16,7 +16,11 @@
+
+ #include <boost/algorithm/string/predicate.hpp>
+ #include <boost/filesystem/operations.hpp>
++#include <boost/locale/generator.hpp>
+ #include <boost/log/trivial.hpp>
++#include <boost/property_tree/ini_parser.hpp>
++#include <boost/property_tree/ptree.hpp>
++#include <boost/nowide/fstream.hpp>
+
+ static const float GROUND_Z = -0.02f;
+
+--- a/src/slic3r/Utils/PresetUpdater.cpp
++++ b/src/slic3r/Utils/PresetUpdater.cpp
+@@ -12,6 +12,8 @@
+ #include <boost/filesystem/fstream.hpp>
+ #include <boost/lexical_cast.hpp>
+ #include <boost/log/trivial.hpp>
++#include <boost/property_tree/ptree.hpp>
++#include <boost/property_tree/json_parser.hpp>
+
+ #include <wx/app.h>
+ #include <wx/msgdlg.h>
+--- a/src/slic3r/GUI/NotificationManager.hpp
++++ b/src/slic3r/GUI/NotificationManager.hpp
+@@ -6,6 +6,7 @@
+
+ #include <libslic3r/ObjectID.hpp>
+ #include <libslic3r/Technologies.hpp>
++#include "libslic3r_version.h"
+
+ #include <wx/time.h>
+
+--- a/src/slic3r/GUI/Search.cpp
++++ b/src/slic3r/GUI/Search.cpp
+@@ -2,6 +2,7 @@
+
+ #include <cstddef>
+ #include <string>
++#include <regex>
+ #include <boost/algorithm/string.hpp>
+ #include <boost/optional.hpp>
+ #include <boost/nowide/convert.hpp>
+--- a/src/libslic3r/Optimize/Optimizer.hpp
++++ b/src/libslic3r/Optimize/Optimizer.hpp
+@@ -8,5 +8,6 @@
+ #include <functional>
+ #include <limits>
+ #include <cassert>
++#include <optional>
+
+ namespace Slic3r { namespace opt {

diff --git a/media-gfx/superslicer/files/string-to-char-conversion-2.3.56.9.patch b/media-gfx/superslicer/files/string-to-char-conversion-2.3.56.9.patch
new file mode 100644
index 000000000..6cb596bf0
--- /dev/null
+++ b/media-gfx/superslicer/files/string-to-char-conversion-2.3.56.9.patch
@@ -0,0 +1,10 @@
+--- a/src/slic3r/GUI/GUI_App.cpp
++++ b/src/slic3r/GUI/GUI_App.cpp
+@@ -837,7 +837,7 @@ bool GUI_App::on_init_inner()
+         }
+         wxString artist;
+         if (!file_name.empty() && file_name != (std::string(SLIC3R_APP_NAME) + L(" icon"))) {
+-            wxString splash_screen_path = wxString::FromUTF8((boost::filesystem::path(Slic3r::resources_dir()) / "splashscreen" / file_name).string());
++            wxString splash_screen_path = wxString::FromUTF8((boost::filesystem::path(Slic3r::resources_dir()) / "splashscreen" / file_name).c_str());
+         // make a bitmap with dark grey banner on the left side
+             bmp = SplashScreen::MakeBitmap(wxBitmap(splash_screen_path, wxBITMAP_TYPE_JPEG));

diff --git a/media-gfx/superslicer/files/version-suffix-2.2.53.4.patch b/media-gfx/superslicer/files/version-suffix-2.2.53.4.patch
new file mode 100644
index 000000000..d7408fe5d
--- /dev/null
+++ b/media-gfx/superslicer/files/version-suffix-2.2.53.4.patch
@@ -0,0 +1,13 @@
+--- a/version.inc
++++ b/version.inc
+@@ -1,8 +1,8 @@
+ # Included by CMakeLists, edited by the build script
+ # (the version numbers are generated by the build script from the git current label)
+
+-set(SLIC3R_APP_NAME "SuperSlicer")
+-set(SLIC3R_APP_KEY "SuperSlicer")
++set(SLIC3R_APP_NAME "SuperSlicer2.2")
++set(SLIC3R_APP_KEY "SuperSlicer2.2")
+ set(SLIC3R_VERSION "2.2.53")
+ set(SLIC3R_BUILD_ID "SuperSlicer_${SLIC3R_VERSION}+UNKNOWN")
+ set(SLIC3R_RC_VERSION "2,2,53,0")

diff --git a/media-gfx/superslicer/files/version-suffix-2.3.56.9.patch b/media-gfx/superslicer/files/version-suffix-2.3.56.9.patch
new file mode 100644
index 000000000..74e982cad
--- /dev/null
+++ b/media-gfx/superslicer/files/version-suffix-2.3.56.9.patch
@@ -0,0 +1,17 @@
+--- a/version.inc
++++ b/version.inc
+@@ -2,11 +2,11 @@
+ # (the version numbers are generated by the build script from the git current label)
+
+ # name of the slicer
+-set(SLIC3R_APP_NAME "SuperSlicer")
++set(SLIC3R_APP_NAME "SuperSlicer2.3")
+ # Key fo the slicer, must only contains ascii chars and no spaces (be valid in all filesystems)
+-set(SLIC3R_APP_KEY "SuperSlicer")
++set(SLIC3R_APP_KEY "SuperSlicer2.3")
+ # exe name of the slicer, should be lowercase and valid in all os
+-set(SLIC3R_APP_CMD "superslicer")
++set(SLIC3R_APP_CMD "superslicer-2.3")
+ # versions
+ set(SLIC3R_VERSION "2.3.56")
+ set(SLIC3R_VERSION_FULL "2.3.56.7")

diff --git a/media-gfx/superslicer/files/wxwidget-canvas-set-context-2.3.56.9.patch b/media-gfx/superslicer/files/wxwidget-canvas-set-context-2.3.56.9.patch
new file mode 100644
index 000000000..598780949
--- /dev/null
+++ b/media-gfx/superslicer/files/wxwidget-canvas-set-context-2.3.56.9.patch
@@ -0,0 +1,11 @@
+--- a/src/slic3r/GUI/GLCanvas3D.cpp
++++ b/src/slic3r/GUI/GLCanvas3D.cpp
+@@ -4834,5 +4833,5 @@ bool GLCanvas3D::_init_collapse_toolbar()
+
+ bool GLCanvas3D::_set_current()
+ {
+-    return m_context != nullptr && m_canvas->SetCurrent(*m_context);
++    return m_context != nullptr && _is_shown_on_screen() && m_canvas->SetCurrent(*m_context);
+     }
+
+ void GLCanvas3D::_resize(unsigned int w, unsigned int h)

diff --git a/media-gfx/superslicer/metadata.xml b/media-gfx/superslicer/metadata.xml
new file mode 100644
index 000000000..7b63c69a8
--- /dev/null
+++ b/media-gfx/superslicer/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+  <email>egorr.berd@gmail.com</email>
+  <name>Yahor Berdnikau</name>
+</maintainer>
+<longdescription lang="en">
+  A mesh slicer to generated G-Code for fused-filament fabrication based on PrusaSlicer.
+</longdescription>
+<use>
+  <flag name="profiles">Install additional 3d printer profiles.</flag>
+</use>
+</pkgmetadata>

diff --git a/media-gfx/superslicer/superslicer-2.2.53.4.ebuild b/media-gfx/superslicer/superslicer-2.2.53.4.ebuild
new file mode 100644
index 000000000..a985d7c65
--- /dev/null
+++ b/media-gfx/superslicer/superslicer-2.2.53.4.ebuild
@@ -0,0 +1,88 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WX_GTK_VER="3.0-gtk3"
+
+inherit xdg cmake desktop wxwidgets
+
+MY_PN="SuperSlicer"
+DESCRIPTION="A mesh slicer to generated G-Code for fused-filament fabrication"
+HOMEPAGE="https://github.com/supermerill/SuperSlicer"
+SRC_URI="https://github.com/supermerill/SuperSlicer/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="AGPL-3"
+SLOT="22"
+KEYWORDS="~amd64"
+IUSE="gui test"
+
+# tests fail to link with USE=-gui, bug #760096
+REQUIRED_USE="test? ( gui )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+		dev-cpp/tbb
+		>=dev-libs/boost-1.73.0:=[nls,threads(+)]
+		dev-libs/c-blosc
+		dev-libs/cereal
+		dev-libs/openssl
+		>=dev-libs/miniz-2.1.0-r2
+		>=media-gfx/openvdb-5.0.0
+		media-libs/qhull:=
+		media-libs/openexr:=
+		sci-libs/libigl
+		sci-libs/nlopt
+		>=sci-mathematics/cgal-5.0:=
+		sys-libs/zlib:=
+		gui? (
+				dev-libs/glib:2
+				media-libs/glew:0=
+				net-misc/curl
+				virtual/glu
+				virtual/opengl
+				x11-libs/gtk+:3
+				x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
+		)
+"
+DEPEND="${RDEPEND}
+		media-libs/qhull[static-libs]
+		test? ( dev-cpp/gtest )
+"
+
+PATCHES=(
+	"${FILESDIR}/boost-endian-${PV}.patch"
+	"${FILESDIR}/miniz-zip-header-${PV}.patch"
+	"${FILESDIR}/freecad-dialog-${PV}.patch"
+	"${FILESDIR}/boost-mouse-atomic-${PV}.patch"
+	"${FILESDIR}/Support-for-HiDPI-in-OpenGL-on-Linux-GTK3-${PV}.patch"
+	"${FILESDIR}/version-suffix-${PV}.patch"
+)
+
+src_configure() {
+	use gui && setup-wxwidgets
+
+	CMAKE_BUILD_TYPE=Release
+	local mycmakeargs=(
+		-DSLIC3R_BUILD_TESTS=$(usex test)
+		-DSLIC3R_FHS=1
+		-DSLIC3R_GUI=$(usex gui)
+		-DSLIC3R_PCH=0
+		-DSLIC3R_WX_STABLE=1
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	if use gui; then
+		newicon -s 128 resources/icons/Slic3r_128px.png SuperSli3er_2.2.png
+		make_desktop_entry superslicer "SuperSlicer 2.2" "SuperSli3er_2.2" "Graphics;3DGraphics;Engineering;" \
+			"MimeType=model/stl;application/vnd.ms-3mfdocument;application/prs.wavefront-obj;application/x-amf;" \
+			"GenericName=3D Printing Software" \
+			"Keywords=3D;Printing;Slicer;slice;3D;printer;convert;gcode;stl;obj;amf;SLA"
+	fi
+}

diff --git a/media-gfx/superslicer/superslicer-2.3.56.9.ebuild b/media-gfx/superslicer/superslicer-2.3.56.9.ebuild
new file mode 100644
index 000000000..5bef37976
--- /dev/null
+++ b/media-gfx/superslicer/superslicer-2.3.56.9.ebuild
@@ -0,0 +1,112 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WX_GTK_VER="3.0-gtk3"
+
+inherit xdg cmake desktop wxwidgets
+
+MY_PN="SuperSlicer"
+DESCRIPTION="A mesh slicer to generated G-Code for fused-filament fabrication"
+HOMEPAGE="https://github.com/supermerill/SuperSlicer"
+SRC_URI="https://github.com/supermerill/SuperSlicer/archive/${PV}.tar.gz -> ${P}.tar.gz
+	profiles? ( https://github.com/slic3r/slic3r-profiles/archive/118aa919c16837eb2ff6ba97e2934fa4144ef806.zip -> ${P}-profiles.zip )"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="AGPL-3"
+SLOT="23"
+KEYWORDS="~amd64"
+IUSE="gui test profiles"
+
+# tests fail to link with USE=-gui, bug #760096
+REQUIRED_USE="test? ( gui )"
+RESTRICT="!test? ( test )"
+
+BDEPEND="profiles? ( app-arch/unzip )"
+RDEPEND="
+		dev-cpp/eigen:3
+		dev-cpp/tbb
+		>=dev-libs/boost-1.73.0:=[nls,threads(+)]
+		dev-libs/cereal
+		dev-libs/expat
+		dev-libs/c-blosc
+		dev-libs/gmp:=
+		>=dev-libs/miniz-2.1.0-r2
+		dev-libs/mpfr:=
+		>=media-gfx/openvdb-5.0.0
+		media-libs/ilmbase:=
+		media-libs/libpng:0=
+		media-libs/openexr:0=
+		media-libs/qhull:=
+		sci-libs/libigl
+		sci-libs/nlopt
+		>=sci-mathematics/cgal-5.0:=
+		sys-apps/dbus
+		sys-libs/zlib:=
+		gui? (
+				dev-libs/glib:2
+				media-libs/glew:0=
+				net-misc/curl
+				virtual/glu
+				virtual/opengl
+				x11-libs/gtk+:3
+				>=x11-libs/wxGTK-3.0.5.1:=[X,opengl]
+		)
+"
+DEPEND="${RDEPEND}
+		media-libs/qhull[static-libs]
+		test? ( dev-cpp/gtest )
+"
+
+PATCHES=(
+	"${FILESDIR}/miniz-zip-header-2.2.53.4.patch"
+	"${FILESDIR}/freecad-dialog-2.2.53.4.patch"
+	"${FILESDIR}/missing-imports-${PV}.patch"
+	"${FILESDIR}/string-to-char-conversion-${PV}.patch"
+	"${FILESDIR}/version-suffix-${PV}.patch"
+	"${FILESDIR}/wxwidget-canvas-set-context-2.3.56.9.patch"
+)
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	mv "${S}/resources/icons/SuperSlicer_192px.png" "${S}/resources/icons/SuperSlicer2.3_192px.png" || die "Failed to rename icons"
+	mv "${S}/resources/icons/SuperSlicer_128px.png" "${S}/resources/icons/SuperSlicer2.3_128px.png" || die "Failed to rename icons"
+	mv "${S}/resources/icons/SuperSlicer-gcodeviewer_128px.png" "${S}/resources/icons/SuperSlicer2.3-gcodeviewer_128px.png" || die "Failed to rename icons"
+	mv "${S}/resources/icons/SuperSlicer-gcodeviewer_192px.png" "${S}/resources/icons/SuperSlicer2.3-gcodeviewer_192px.png" || die "Failed to rename icons"
+
+	use profiles && unpack ${P}-profiles.zip &&
+	if use profiles ; then
+		cp -r "${WORKDIR}/slic3r-profiles-118aa919c16837eb2ff6ba97e2934fa4144ef806/"* "${S}/resources/profiles" || die "Failed to copy profiles"
+	fi
+}
+
+src_configure() {
+	use gui && setup-wxwidgets
+
+	CMAKE_BUILD_TYPE=Release
+	local mycmakeargs=(
+		-DSLIC3R_BUILD_TESTS=$(usex test)
+		-DSLIC3R_FHS=ON
+		-DSLIC3R_GTK=3
+		-DSLIC3R_GUI=$(usex gui)
+		-DSLIC3R_PCH=OFF
+		-DSLIC3R_WX_STABLE=ON
+		-Wno-dev
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	if use gui; then
+		newicon -s 128 resources/icons/Slic3r_128px.png SuperSli3er_2.3.png
+		dosym superslicer-2.3 /usr/bin/superslicer-2.3-gcodeviewer
+		make_desktop_entry superslicer "SuperSlicer 2.3" "SuperSli3er_2.3" "Graphics;3DGraphics;Engineering;" \
+			"MimeType=model/stl;application/vnd.ms-3mfdocument;application/prs.wavefront-obj;application/x-amf;" \
+			"GenericName=3D Printing Software" \
+			"Keywords=3D;Printing;Slicer;slice;3D;printer;convert;gcode;stl;obj;amf;SLA"
+	fi
+}


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: media-gfx/superslicer/, media-gfx/superslicer/files/
@ 2022-01-26  8:47 Yahor Berdnikau
  0 siblings, 0 replies; 7+ messages in thread
From: Yahor Berdnikau @ 2022-01-26  8:47 UTC (permalink / raw
  To: gentoo-commits

commit:     fae8f4d27be38997d4208219af428f1cab721e03
Author:     Yahor Berdnikau <egorr.berd <AT> gmail <DOT> com>
AuthorDate: Mon Jan 24 19:10:39 2022 +0000
Commit:     Yahor Berdnikau <egorr.berd <AT> gmail <DOT> com>
CommitDate: Wed Jan 26 08:47:10 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=fae8f4d2

media-gfx/superslicer: drop superslicer-2.3.56.9 version

Signed-off-by: Yahor Berdnikau <egorr.berd <AT> gmail.com>

 media-gfx/superslicer/Manifest                     |   2 -
 .../files/missing-imports-2.3.56.9.patch           | 118 ---------------------
 .../files/version-suffix-2.3.56.9.patch            |  17 ---
 .../wxwidget-canvas-set-context-2.3.56.9.patch     |  11 --
 .../superslicer/superslicer-2.3.56.9-r1.ebuild     | 112 -------------------
 5 files changed, 260 deletions(-)

diff --git a/media-gfx/superslicer/Manifest b/media-gfx/superslicer/Manifest
index 10f99aa0f..4f5e87cc6 100644
--- a/media-gfx/superslicer/Manifest
+++ b/media-gfx/superslicer/Manifest
@@ -1,5 +1,3 @@
 DIST superslicer-2.2.53.4.tar.gz 33791161 BLAKE2B c8454ac66a5d75f5bbcd1c29f600897c697f03ad581c97539033758942eac1d4ba0d2acbac43e75307a06e565d25a39b192e6cde522cce6b728afc04c42f82bb SHA512 f883cca3eb2575186c5077e2c1f9ca37e497ff6ed9aeae45a58c1db4de1c52db36fc0f14e7fdcd95aaf375b340932674014614cdab8c6995c56b9988fe5baa06
-DIST superslicer-2.3.56.9-profiles.tar.gz 12157428 BLAKE2B 2ce1a98987c601fc979f895e6902b7e43db336eb0d44bb1f38370969d9c514a29430d5db32fe2766f6887a20970f49aa74a573862eefeeaab63cfff482bdd729 SHA512 87fbd56a104d205f2d32f9e71e6c679fb63a48aa74387c87fd551dad47709e5491e7ce597d0b0f8bc448191674a8f9e71d240a8f7ade35cf359e3bf1d5059213
-DIST superslicer-2.3.56.9.tar.gz 32260311 BLAKE2B 2da3201d789dd66a4a26c365b020f67dd5f43a71b9616681eb5dfed1ec759943398ce82fa2c8d5fd9a4f66a6887c25f0f86286ec4f52364a97a29cee548c3f0c SHA512 05c57765770889dc365eb721a2e6491f16de5a03c03493a682c49b769435d6db6e0ad52c0cfced7aa402dc751e4fdcbfc0623fa82d8431e45a590e64b12b6769
 DIST superslicer-2.3.57.7-profiles.tar.gz 12157428 BLAKE2B 2ce1a98987c601fc979f895e6902b7e43db336eb0d44bb1f38370969d9c514a29430d5db32fe2766f6887a20970f49aa74a573862eefeeaab63cfff482bdd729 SHA512 87fbd56a104d205f2d32f9e71e6c679fb63a48aa74387c87fd551dad47709e5491e7ce597d0b0f8bc448191674a8f9e71d240a8f7ade35cf359e3bf1d5059213
 DIST superslicer-2.3.57.7.tar.gz 32400355 BLAKE2B bcacf218ad18146327a9f7005d2c2217cf859d2793e8f74bfd453e2b8b12bf83d224f0325f6908b806735fb94c476b87c5dfe35c16026006bf5bd38de26e5f36 SHA512 d9a92366ed426dab77a5d49cddd7c7f37f2a0e026574bcbff342e579c555aefb19aaea8de7b5180bb87ab2749ba0cef96e870d808914fdbc58f3ddf04e1a4a65

diff --git a/media-gfx/superslicer/files/missing-imports-2.3.56.9.patch b/media-gfx/superslicer/files/missing-imports-2.3.56.9.patch
deleted file mode 100644
index 200f1663c..000000000
--- a/media-gfx/superslicer/files/missing-imports-2.3.56.9.patch
+++ /dev/null
@@ -1,118 +0,0 @@
---- a/src/libslic3r/AppConfig.cpp
-+++ b/src/libslic3r/AppConfig.cpp
-@@ -10,6 +10,7 @@
-
- #include <boost/filesystem/path.hpp>
- #include <boost/filesystem/operations.hpp>
-+#include <boost/locale/generator.hpp>
- #include <boost/nowide/cenv.hpp>
- #include <boost/nowide/fstream.hpp>
- #include <boost/property_tree/ini_parser.hpp>
-
---- a/src/libslic3r/Format/CWS.cpp
-+++ b/src/libslic3r/Format/CWS.cpp
-@@ -1,6 +1,8 @@
- #include "libslic3r/Format/CWS.hpp"
- #include "libslic3r/PrintConfig.hpp"
- #include "libslic3r/Time.hpp"
-+#include <boost/filesystem.hpp>
-+#include <boost/log/trivial.hpp>
-
- namespace Slic3r {
-
---- a/src/slic3r/GUI/CalibrationAbstractDialog.cpp
-+++ b/src/slic3r/GUI/CalibrationAbstractDialog.cpp
-@@ -5,6 +5,7 @@
- #include "GUI.hpp"
- #include "GUI_ObjectList.hpp"
- #include "Tab.hpp"
-+#include <boost/filesystem.hpp>
- #include <wx/scrolwin.h>
- #include <wx/display.h>
- #include <wx/file.h>
-
---- a/src/slic3r/GUI/Preferences.cpp
-+++ b/src/slic3r/GUI/Preferences.cpp
-@@ -4,6 +4,7 @@
- #include "Plater.hpp"
- #include "I18N.hpp"
- #include "libslic3r/AppConfig.hpp"
-+#include <boost/filesystem.hpp>
- #include <wx/notebook.h>
-
- namespace Slic3r {
-
---- a/src/slic3r/GUI/GUI_ObjectList.cpp
-+++ b/src/slic3r/GUI/GUI_ObjectList.cpp
-@@ -15,6 +15,7 @@
- #include "Selection.hpp"
-
- #include <boost/algorithm/string.hpp>
-+#include <boost/log/trivial.hpp>
- #include "slic3r/Utils/FixModelByWin10.hpp"
-
- #ifdef __WXMSW__
---- a/src/slic3r/GUI/Tab.cpp
-+++ b/src/slic3r/GUI/Tab.cpp
-@@ -22,6 +22,7 @@
-
- #include <wx/bmpcbox.h>
- #include <wx/bmpbuttn.h>
-+#include <wx/collpane.h>
- #include <wx/treectrl.h>
- #include <wx/imaglist.h>
- #include <wx/settings.h>
---- a/src/slic3r/GUI/3DBed.cpp
-+++ b/src/slic3r/GUI/3DBed.cpp
-@@ -16,7 +16,11 @@
-
- #include <boost/algorithm/string/predicate.hpp>
- #include <boost/filesystem/operations.hpp>
-+#include <boost/locale/generator.hpp>
- #include <boost/log/trivial.hpp>
-+#include <boost/property_tree/ini_parser.hpp>
-+#include <boost/property_tree/ptree.hpp>
-+#include <boost/nowide/fstream.hpp>
-
- static const float GROUND_Z = -0.02f;
-
---- a/src/slic3r/Utils/PresetUpdater.cpp
-+++ b/src/slic3r/Utils/PresetUpdater.cpp
-@@ -12,6 +12,8 @@
- #include <boost/filesystem/fstream.hpp>
- #include <boost/lexical_cast.hpp>
- #include <boost/log/trivial.hpp>
-+#include <boost/property_tree/ptree.hpp>
-+#include <boost/property_tree/json_parser.hpp>
-
- #include <wx/app.h>
- #include <wx/msgdlg.h>
---- a/src/slic3r/GUI/NotificationManager.hpp
-+++ b/src/slic3r/GUI/NotificationManager.hpp
-@@ -6,6 +6,7 @@
-
- #include <libslic3r/ObjectID.hpp>
- #include <libslic3r/Technologies.hpp>
-+#include "libslic3r_version.h"
-
- #include <wx/time.h>
-
---- a/src/slic3r/GUI/Search.cpp
-+++ b/src/slic3r/GUI/Search.cpp
-@@ -2,6 +2,7 @@
-
- #include <cstddef>
- #include <string>
-+#include <regex>
- #include <boost/algorithm/string.hpp>
- #include <boost/optional.hpp>
- #include <boost/nowide/convert.hpp>
---- a/src/libslic3r/Optimize/Optimizer.hpp
-+++ b/src/libslic3r/Optimize/Optimizer.hpp
-@@ -8,5 +8,6 @@
- #include <functional>
- #include <limits>
- #include <cassert>
-+#include <optional>
-
- namespace Slic3r { namespace opt {

diff --git a/media-gfx/superslicer/files/version-suffix-2.3.56.9.patch b/media-gfx/superslicer/files/version-suffix-2.3.56.9.patch
deleted file mode 100644
index 74e982cad..000000000
--- a/media-gfx/superslicer/files/version-suffix-2.3.56.9.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/version.inc
-+++ b/version.inc
-@@ -2,11 +2,11 @@
- # (the version numbers are generated by the build script from the git current label)
-
- # name of the slicer
--set(SLIC3R_APP_NAME "SuperSlicer")
-+set(SLIC3R_APP_NAME "SuperSlicer2.3")
- # Key fo the slicer, must only contains ascii chars and no spaces (be valid in all filesystems)
--set(SLIC3R_APP_KEY "SuperSlicer")
-+set(SLIC3R_APP_KEY "SuperSlicer2.3")
- # exe name of the slicer, should be lowercase and valid in all os
--set(SLIC3R_APP_CMD "superslicer")
-+set(SLIC3R_APP_CMD "superslicer-2.3")
- # versions
- set(SLIC3R_VERSION "2.3.56")
- set(SLIC3R_VERSION_FULL "2.3.56.7")

diff --git a/media-gfx/superslicer/files/wxwidget-canvas-set-context-2.3.56.9.patch b/media-gfx/superslicer/files/wxwidget-canvas-set-context-2.3.56.9.patch
deleted file mode 100644
index 598780949..000000000
--- a/media-gfx/superslicer/files/wxwidget-canvas-set-context-2.3.56.9.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/slic3r/GUI/GLCanvas3D.cpp
-+++ b/src/slic3r/GUI/GLCanvas3D.cpp
-@@ -4834,5 +4833,5 @@ bool GLCanvas3D::_init_collapse_toolbar()
-
- bool GLCanvas3D::_set_current()
- {
--    return m_context != nullptr && m_canvas->SetCurrent(*m_context);
-+    return m_context != nullptr && _is_shown_on_screen() && m_canvas->SetCurrent(*m_context);
-     }
-
- void GLCanvas3D::_resize(unsigned int w, unsigned int h)

diff --git a/media-gfx/superslicer/superslicer-2.3.56.9-r1.ebuild b/media-gfx/superslicer/superslicer-2.3.56.9-r1.ebuild
deleted file mode 100644
index 258c4f71d..000000000
--- a/media-gfx/superslicer/superslicer-2.3.56.9-r1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WX_GTK_VER="3.0-gtk3"
-
-inherit xdg cmake desktop wxwidgets
-
-MY_PN="SuperSlicer"
-DESCRIPTION="A mesh slicer to generated G-Code for fused-filament fabrication"
-HOMEPAGE="https://github.com/supermerill/SuperSlicer"
-SRC_URI="https://github.com/supermerill/SuperSlicer/archive/${PV}.tar.gz -> ${P}.tar.gz
-	profiles? ( https://github.com/slic3r/slic3r-profiles/archive/118aa919c16837eb2ff6ba97e2934fa4144ef806.tar.gz -> ${P}-profiles.tar.gz )"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="AGPL-3"
-SLOT="23"
-KEYWORDS="~amd64"
-IUSE="gui test profiles"
-
-# tests fail to link with USE=-gui, bug #760096
-REQUIRED_USE="test? ( gui )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-		dev-cpp/eigen:3
-		dev-cpp/tbb
-		>=dev-libs/boost-1.73.0:=[nls,threads(+)]
-		dev-libs/cereal
-		dev-libs/expat
-		dev-libs/c-blosc
-		dev-libs/gmp:=
-		>=dev-libs/miniz-2.1.0-r2
-		dev-libs/mpfr:=
-		>=media-gfx/openvdb-5.0.0
-		media-libs/ilmbase:=
-		media-libs/libpng:0=
-		media-libs/openexr:0=
-		media-libs/qhull:=
-		sci-libs/libigl
-		sci-libs/nlopt
-		>=sci-mathematics/cgal-5.0:=
-		sys-apps/dbus
-		sys-libs/zlib:=
-		gui? (
-				dev-libs/glib:2
-				media-libs/glew:0=
-				net-misc/curl
-				virtual/glu
-				virtual/opengl
-				x11-libs/gtk+:3
-				>=x11-libs/wxGTK-3.0.5.1:=[X,opengl]
-		)
-"
-DEPEND="${RDEPEND}
-		media-libs/qhull[static-libs]
-		test? ( dev-cpp/gtest )
-"
-
-PATCHES=(
-	"${FILESDIR}/miniz-zip-header-2.2.53.4.patch"
-	"${FILESDIR}/freecad-dialog-2.2.53.4.patch"
-	"${FILESDIR}/missing-imports-${PV}.patch"
-	"${FILESDIR}/string-to-char-conversion-${PV}.patch"
-	"${FILESDIR}/version-suffix-${PV}.patch"
-	"${FILESDIR}/wxwidget-canvas-set-context-2.3.56.9.patch"
-)
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	mv "${S}/resources/icons/SuperSlicer_192px.png" "${S}/resources/icons/SuperSlicer2.3_192px.png" || die "Failed to rename icons"
-	mv "${S}/resources/icons/SuperSlicer_128px.png" "${S}/resources/icons/SuperSlicer2.3_128px.png" || die "Failed to rename icons"
-	mv "${S}/resources/icons/SuperSlicer-gcodeviewer_128px.png" "${S}/resources/icons/SuperSlicer2.3-gcodeviewer_128px.png" || die "Failed to rename icons"
-	mv "${S}/resources/icons/SuperSlicer-gcodeviewer_192px.png" "${S}/resources/icons/SuperSlicer2.3-gcodeviewer_192px.png" || die "Failed to rename icons"
-	cp "${S}/resources/icons/SuperSlicer.png" "${S}/resources/icons/SuperSlicer2.3_logo.png" || die "Failed to make logo icon"
-
-	use profiles && unpack ${P}-profiles.tar.gz &&
-	if use profiles ; then
-		cp -r "${WORKDIR}/slic3r-profiles-118aa919c16837eb2ff6ba97e2934fa4144ef806/"* "${S}/resources/profiles" || die "Failed to copy profiles"
-	fi
-}
-
-src_configure() {
-	use gui && setup-wxwidgets
-
-	CMAKE_BUILD_TYPE=Release
-	local mycmakeargs=(
-		-DSLIC3R_BUILD_TESTS=$(usex test)
-		-DSLIC3R_FHS=ON
-		-DSLIC3R_GTK=3
-		-DSLIC3R_GUI=$(usex gui)
-		-DSLIC3R_PCH=OFF
-		-DSLIC3R_WX_STABLE=ON
-		-Wno-dev
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	if use gui; then
-		newicon -s 128 resources/icons/Slic3r_128px.png SuperSli3er_2.3.png
-		dosym superslicer-2.3 /usr/bin/superslicer-2.3-gcodeviewer
-		make_desktop_entry superslicer "SuperSlicer 2.3" "SuperSli3er_2.3" "Graphics;3DGraphics;Engineering;" \
-			"MimeType=model/stl;application/vnd.ms-3mfdocument;application/prs.wavefront-obj;application/x-amf;" \
-			"GenericName=3D Printing Software" \
-			"Keywords=3D;Printing;Slicer;slice;3D;printer;convert;gcode;stl;obj;amf;SLA"
-	fi
-}


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: media-gfx/superslicer/, media-gfx/superslicer/files/
@ 2022-02-06 20:14 Yahor Berdnikau
  0 siblings, 0 replies; 7+ messages in thread
From: Yahor Berdnikau @ 2022-02-06 20:14 UTC (permalink / raw
  To: gentoo-commits

commit:     55c70952ea85860759fbb0f9736188a504230f7c
Author:     Yahor Berdnikau <egorr.berd <AT> gmail <DOT> com>
AuthorDate: Sun Feb  6 20:03:55 2022 +0000
Commit:     Yahor Berdnikau <egorr.berd <AT> gmail <DOT> com>
CommitDate: Sun Feb  6 20:03:55 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=55c70952

media-gfx/superslicer: fix app name for 2.2.53.4

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Yahor Berdnikau <egorr.berd <AT> gmail.com>

 media-gfx/superslicer/files/version-suffix-2.2.53.4.patch           | 6 ++----
 .../{superslicer-2.2.53.4.ebuild => superslicer-2.2.53.4-r1.ebuild} | 0
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/media-gfx/superslicer/files/version-suffix-2.2.53.4.patch b/media-gfx/superslicer/files/version-suffix-2.2.53.4.patch
index d7408fe5d..e970f2e09 100644
--- a/media-gfx/superslicer/files/version-suffix-2.2.53.4.patch
+++ b/media-gfx/superslicer/files/version-suffix-2.2.53.4.patch
@@ -1,12 +1,10 @@
 --- a/version.inc
 +++ b/version.inc
-@@ -1,8 +1,8 @@
- # Included by CMakeLists, edited by the build script
+@@ -2,7 +2,7 @@
  # (the version numbers are generated by the build script from the git current label)
 
--set(SLIC3R_APP_NAME "SuperSlicer")
+ set(SLIC3R_APP_NAME "SuperSlicer")
 -set(SLIC3R_APP_KEY "SuperSlicer")
-+set(SLIC3R_APP_NAME "SuperSlicer2.2")
 +set(SLIC3R_APP_KEY "SuperSlicer2.2")
  set(SLIC3R_VERSION "2.2.53")
  set(SLIC3R_BUILD_ID "SuperSlicer_${SLIC3R_VERSION}+UNKNOWN")

diff --git a/media-gfx/superslicer/superslicer-2.2.53.4.ebuild b/media-gfx/superslicer/superslicer-2.2.53.4-r1.ebuild
similarity index 100%
rename from media-gfx/superslicer/superslicer-2.2.53.4.ebuild
rename to media-gfx/superslicer/superslicer-2.2.53.4-r1.ebuild


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: media-gfx/superslicer/, media-gfx/superslicer/files/
@ 2022-02-06 20:14 Yahor Berdnikau
  0 siblings, 0 replies; 7+ messages in thread
From: Yahor Berdnikau @ 2022-02-06 20:14 UTC (permalink / raw
  To: gentoo-commits

commit:     0dde665c76279e34423c63e0920b9a8aac492c91
Author:     Yahor Berdnikau <egorr.berd <AT> gmail <DOT> com>
AuthorDate: Sun Feb  6 20:12:58 2022 +0000
Commit:     Yahor Berdnikau <egorr.berd <AT> gmail <DOT> com>
CommitDate: Sun Feb  6 20:12:58 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=0dde665c

media-gfx/superslicer: Fix app name for 2.3.57.9

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Yahor Berdnikau <egorr.berd <AT> gmail.com>

 .../files/version-suffix-2.3.57.9.patch            | 31 ++++++++++++++++++----
 ....57.9.ebuild => superslicer-2.3.57.9-r1.ebuild} |  6 +----
 2 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/media-gfx/superslicer/files/version-suffix-2.3.57.9.patch b/media-gfx/superslicer/files/version-suffix-2.3.57.9.patch
index 0daae037f..bd41db684 100644
--- a/media-gfx/superslicer/files/version-suffix-2.3.57.9.patch
+++ b/media-gfx/superslicer/files/version-suffix-2.3.57.9.patch
@@ -1,11 +1,8 @@
 --- a/version.inc
 +++ b/version.inc
-@@ -2,11 +2,11 @@
- # (the version numbers are generated by the build script from the git current label)
-
+@@ -4,9 +4,9 @@
  # name of the slicer
--set(SLIC3R_APP_NAME "SuperSlicer")
-+set(SLIC3R_APP_NAME "SuperSlicer2.3")
+ set(SLIC3R_APP_NAME "SuperSlicer")
  # Key fo the slicer, must only contains ascii chars and no spaces (be valid in all filesystems)
 -set(SLIC3R_APP_KEY "SuperSlicer")
 +set(SLIC3R_APP_KEY "SuperSlicer2.3")
@@ -15,3 +12,27 @@
  # versions
  set(SLIC3R_VERSION "2.3.57")
  set(SLIC3R_VERSION_FULL "2.3.57.9")
+--- a/src/platform/unix/Gcodeviewer.desktop.in
++++ b/src/platform/unix/Gcodeviewer.desktop.in
+@@ -1,5 +1,5 @@
+ [Desktop Entry]
+-Name=@GCODEVIEWER_APP_NAME@
++Name=@GCODEVIEWER_APP_KEY@
+ Comment=G-code viewer of Slic3r
+ Exec=@SLIC3R_APP_CMD@ --gcodeviewer %F
+ Icon=@GCODEVIEWER_APP_KEY@
+--- a/src/platform/unix/Slic3r.desktop.in
++++ b/src/platform/unix/Slic3r.desktop.in
+@@ -1,5 +1,5 @@
+ [Desktop Entry]
+-Name=@SLIC3R_APP_NAME@
++Name=@SLIC3R_APP_KEY@
+ GenericName=3D Printing Software
+ Comment=G-code generator for 3D printers
+ Icon=@SLIC3R_APP_KEY@
+@@ -10,4 +10,4 @@ MimeType=model/stl;application/vnd.ms-3mfdocument;application/prs.wavefront-obj;
+ Categories=Graphics;3DGraphics;Engineering;
+ Keywords=3D;Printing;Slicer;slice;3D;printer;convert;gcode;stl;obj;amf;SLA
+ StartupNotify=false
+-StartupWMClass=@SLIC3R_APP_KEY@
++StartupWMClass=@SLIC3R_APP_NAME@

diff --git a/media-gfx/superslicer/superslicer-2.3.57.9.ebuild b/media-gfx/superslicer/superslicer-2.3.57.9-r1.ebuild
similarity index 88%
rename from media-gfx/superslicer/superslicer-2.3.57.9.ebuild
rename to media-gfx/superslicer/superslicer-2.3.57.9-r1.ebuild
index 00ff86a24..c16a1f5c7 100644
--- a/media-gfx/superslicer/superslicer-2.3.57.9.ebuild
+++ b/media-gfx/superslicer/superslicer-2.3.57.9-r1.ebuild
@@ -103,11 +103,7 @@ src_install() {
 	cmake_src_install
 
 	if use gui; then
-		newicon -s 128 resources/icons/Slic3r_128px.png SuperSli3er_2.3.png
+		newicon -s 128 resources/icons/SuperSlicer2.3_128px.png SuperSlicer2.3.png
 		dosym superslicer-2.3 /usr/bin/superslicer-2.3-gcodeviewer
-		make_desktop_entry superslicer "SuperSlicer 2.3" "SuperSli3er_2.3" "Graphics;3DGraphics;Engineering;" \
-			"MimeType=model/stl;application/vnd.ms-3mfdocument;application/prs.wavefront-obj;application/x-amf;" \
-			"GenericName=3D Printing Software" \
-			"Keywords=3D;Printing;Slicer;slice;3D;printer;convert;gcode;stl;obj;amf;SLA"
 	fi
 }


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: media-gfx/superslicer/, media-gfx/superslicer/files/
@ 2022-02-18 19:35 Yahor Berdnikau
  0 siblings, 0 replies; 7+ messages in thread
From: Yahor Berdnikau @ 2022-02-18 19:35 UTC (permalink / raw
  To: gentoo-commits

commit:     5f20c0efa01153b76ed2f28dc3cf10e1a1a1a818
Author:     Yahor Berdnikau <egorr.berd <AT> gmail <DOT> com>
AuthorDate: Fri Feb 18 18:34:07 2022 +0000
Commit:     Yahor Berdnikau <egorr.berd <AT> gmail <DOT> com>
CommitDate: Fri Feb 18 19:35:19 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=5f20c0ef

media-gfx/superslicer: add version 2.3.57.11

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Yahor Berdnikau <egorr.berd <AT> gmail.com>

 media-gfx/superslicer/Manifest                     |   2 +
 .../files/missing-imports-2.3.57.11.patch          |  10 ++
 .../superslicer/files/symlink-fix-2.3.57.11.patch  |   9 ++
 .../files/version-suffix-2.3.57.11.patch           |  42 ++++++++
 media-gfx/superslicer/superslicer-2.3.57.11.ebuild | 108 +++++++++++++++++++++
 5 files changed, 171 insertions(+)

diff --git a/media-gfx/superslicer/Manifest b/media-gfx/superslicer/Manifest
index ae10bbf82..0a6304018 100644
--- a/media-gfx/superslicer/Manifest
+++ b/media-gfx/superslicer/Manifest
@@ -1,6 +1,8 @@
 DIST superslicer-2.2.53.4.tar.gz 33791161 BLAKE2B c8454ac66a5d75f5bbcd1c29f600897c697f03ad581c97539033758942eac1d4ba0d2acbac43e75307a06e565d25a39b192e6cde522cce6b728afc04c42f82bb SHA512 f883cca3eb2575186c5077e2c1f9ca37e497ff6ed9aeae45a58c1db4de1c52db36fc0f14e7fdcd95aaf375b340932674014614cdab8c6995c56b9988fe5baa06
 DIST superslicer-2.3.57.10-profiles.zip 12193950 BLAKE2B c61be0190345bf886cbe60495f95266ec0b07824c803eaca7a29853a3465ab3d631d794899aebb9ef5f7660cb9341c70e9c38d6f8247a58655ed720deebbc584 SHA512 6beab170ae7e50e9880288673fd482f2903d5e9b87a0ddd6549098fa35f9b87e4891f015d0a26aedfac9736c3f55dcd1794d8abb3f9cc072bcdbb7e87f42a9fa
 DIST superslicer-2.3.57.10.tar.gz 32466957 BLAKE2B 7c5fff6ba8139a9bf66d931e6e48e6a9201e7911e90ce2e822ded7ae713f0b8fdf86b9cd317ded4802146c24758148ec989c213b5992c323a2fd442e17a4e228 SHA512 4d20078e11f5f99993220409bee54ca0a3f2a6fff04febfc09b5f1bc445ceaabc3a359f8f7f478127aa1504e8ba8a121a682c991adf2c45cb2ff1598ed2e3445
+DIST superslicer-2.3.57.11-profiles.zip 14382021 BLAKE2B f1908f3bdaebd742dcfa9d2a84dd94502b76261bccd5f924254d3ba10efa32f19923b3861f09c9e346092b77aeb7057830b0428462660967379d74b566744fd0 SHA512 af7c3843bfc1e7962b386ab1c6a20007e692abdb4d70e3129edf00739a082fe92193ab72e7746575b52aff4fd684c9c17b7f7698d7831aad8017310293895371
+DIST superslicer-2.3.57.11.tar.gz 32469197 BLAKE2B 8406717396acfa0c2cfe381587693d3961bdb4933f0d0821ed814e89f7597b4d90a56e877e3dd7e45fe4b14ee13f143e1cff241d59ce1798c39631dd7ffa706f SHA512 978eb5004d788e93ea58b788fbf8fe7a7c1c515b0a138e20662c3c1973b5c72373cd14c76d25ee180095c030416b5b4429b61bb73432910fe9288897a5d7cb4d
 DIST superslicer-2.3.57.7-profiles.zip 12193950 BLAKE2B c61be0190345bf886cbe60495f95266ec0b07824c803eaca7a29853a3465ab3d631d794899aebb9ef5f7660cb9341c70e9c38d6f8247a58655ed720deebbc584 SHA512 6beab170ae7e50e9880288673fd482f2903d5e9b87a0ddd6549098fa35f9b87e4891f015d0a26aedfac9736c3f55dcd1794d8abb3f9cc072bcdbb7e87f42a9fa
 DIST superslicer-2.3.57.7.tar.gz 32400355 BLAKE2B bcacf218ad18146327a9f7005d2c2217cf859d2793e8f74bfd453e2b8b12bf83d224f0325f6908b806735fb94c476b87c5dfe35c16026006bf5bd38de26e5f36 SHA512 d9a92366ed426dab77a5d49cddd7c7f37f2a0e026574bcbff342e579c555aefb19aaea8de7b5180bb87ab2749ba0cef96e870d808914fdbc58f3ddf04e1a4a65
 DIST superslicer-2.3.57.9-profiles.zip 12193950 BLAKE2B c61be0190345bf886cbe60495f95266ec0b07824c803eaca7a29853a3465ab3d631d794899aebb9ef5f7660cb9341c70e9c38d6f8247a58655ed720deebbc584 SHA512 6beab170ae7e50e9880288673fd482f2903d5e9b87a0ddd6549098fa35f9b87e4891f015d0a26aedfac9736c3f55dcd1794d8abb3f9cc072bcdbb7e87f42a9fa

diff --git a/media-gfx/superslicer/files/missing-imports-2.3.57.11.patch b/media-gfx/superslicer/files/missing-imports-2.3.57.11.patch
new file mode 100644
index 000000000..009a4892a
--- /dev/null
+++ b/media-gfx/superslicer/files/missing-imports-2.3.57.11.patch
@@ -0,0 +1,10 @@
+--- a/src/slic3r/Utils/PresetUpdater.cpp
++++ b/src/slic3r/Utils/PresetUpdater.cpp
+@@ -6,6 +6,7 @@
+ #include <ostream>
+ #include <utility>
+ #include <stdexcept>
++#include <regex>
+
+ #include <boost/algorithm/string.hpp>
+ #include <boost/filesystem.hpp>

diff --git a/media-gfx/superslicer/files/symlink-fix-2.3.57.11.patch b/media-gfx/superslicer/files/symlink-fix-2.3.57.11.patch
new file mode 100644
index 000000000..80d9eddfa
--- /dev/null
+++ b/media-gfx/superslicer/files/symlink-fix-2.3.57.11.patch
@@ -0,0 +1,9 @@
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -273,5 +273,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 ()

diff --git a/media-gfx/superslicer/files/version-suffix-2.3.57.11.patch b/media-gfx/superslicer/files/version-suffix-2.3.57.11.patch
new file mode 100644
index 000000000..476509e0a
--- /dev/null
+++ b/media-gfx/superslicer/files/version-suffix-2.3.57.11.patch
@@ -0,0 +1,42 @@
+--- a/src/platform/unix/Gcodeviewer.desktop.in
++++ b/src/platform/unix/Gcodeviewer.desktop.in
+@@ -1,5 +1,5 @@
+ [Desktop Entry]
+-Name=@GCODEVIEWER_APP_NAME@
++Name=@GCODEVIEWER_APP_KEY@
+ Comment=G-code viewer of Slic3r
+ Exec=@SLIC3R_APP_CMD@ --gcodeviewer %F
+ Icon=@GCODEVIEWER_APP_KEY@
+--- a/src/platform/unix/Slic3r.desktop.in
++++ b/src/platform/unix/Slic3r.desktop.in
+@@ -1,5 +1,5 @@
+ [Desktop Entry]
+-Name=@SLIC3R_APP_NAME@
++Name=@SLIC3R_APP_KEY@
+ GenericName=3D Printing Software
+ Comment=G-code generator for 3D printers
+ Icon=@SLIC3R_APP_KEY@
+@@ -10,4 +10,4 @@ MimeType=model/stl;application/vnd.ms-3mfdocument;application/prs.wavefront-obj;
+ Categories=Graphics;3DGraphics;Engineering;
+ Keywords=3D;Printing;Slicer;slice;3D;printer;convert;gcode;stl;obj;amf;SLA
+ StartupNotify=false
+-StartupWMClass=@SLIC3R_APP_KEY@
++StartupWMClass=@SLIC3R_APP_NAME@
+--- a/version.inc
++++ b/version.inc
+@@ -4,13 +4,13 @@
+ # name of the slicer
+ set(SLIC3R_APP_NAME "SuperSlicer")
+ # Key fo the slicer, must only contains ascii chars and no spaces (be valid in all filesystems)
+-set(SLIC3R_APP_KEY "SuperSlicer")
++set(SLIC3R_APP_KEY "SuperSlicer2.3")
+ # exe name of the slicer, should be lowercase and valid in all os
+-set(SLIC3R_APP_CMD "superslicer")
++set(SLIC3R_APP_CMD "superslicer-2.3")
+ # versions
+ set(SLIC3R_VERSION "2.3.57")
+ set(SLIC3R_VERSION_FULL "2.3.57.11")
+-set(SLIC3R_BUILD_ID "${SLIC3R_APP_KEY}_${SLIC3R_VERSION_FULL}+UNKNOWN")
++set(SLIC3R_BUILD_ID "${SLIC3R_APP_KEY}_${SLIC3R_VERSION_FULL}+Gentoo")
+ set(SLIC3R_RC_VERSION "2,3,57,11")
+ set(SLIC3R_RC_VERSION_DOTS "${SLIC3R_VERSION_FULL}")

diff --git a/media-gfx/superslicer/superslicer-2.3.57.11.ebuild b/media-gfx/superslicer/superslicer-2.3.57.11.ebuild
new file mode 100644
index 000000000..a0230fbb7
--- /dev/null
+++ b/media-gfx/superslicer/superslicer-2.3.57.11.ebuild
@@ -0,0 +1,108 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER="3.0-gtk3"
+
+inherit xdg cmake desktop wxwidgets
+
+MY_PN="SuperSlicer"
+DESCRIPTION="A mesh slicer to generated G-Code for fused-filament fabrication"
+HOMEPAGE="https://github.com/supermerill/SuperSlicer"
+SRC_URI="https://github.com/supermerill/SuperSlicer/archive/${PV}.tar.gz -> ${P}.tar.gz
+	profiles? ( https://github.com/slic3r/slic3r-profiles/archive/0b8261ae8bbd7c31d736f371323476d6aff3ef3b.zip -> ${P}-profiles.zip )"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="AGPL-3"
+SLOT="23"
+KEYWORDS="~amd64"
+IUSE="gui test profiles"
+
+# tests fail to link with USE=-gui, bug #760096
+REQUIRED_USE="test? ( gui )"
+RESTRICT="!test? ( test )"
+
+BDEPEND="profiles? ( app-arch/unzip )"
+RDEPEND="
+		dev-cpp/eigen:3
+		dev-cpp/tbb
+		>=dev-libs/boost-1.73.0:=[nls,threads(+)]
+		dev-libs/cereal
+		dev-libs/expat
+		dev-libs/c-blosc
+		dev-libs/gmp:=
+		>=dev-libs/miniz-2.1.0-r2
+		dev-libs/mpfr:=
+		>=media-gfx/openvdb-5.0.0
+		media-libs/ilmbase:=
+		media-libs/libpng:0=
+		media-libs/openexr:0=
+		media-libs/qhull:=
+		sci-libs/libigl
+		sci-libs/nlopt
+		>=sci-mathematics/cgal-5.0:=
+		sys-apps/dbus
+		sys-libs/zlib:=
+		gui? (
+				dev-libs/glib:2
+				media-libs/glew:0=
+				net-misc/curl
+				virtual/glu
+				virtual/opengl
+				x11-libs/gtk+:3
+				>=x11-libs/wxGTK-3.0.5.1:=[X,opengl]
+		)
+"
+DEPEND="${RDEPEND}
+		media-libs/qhull[static-libs]
+		test? ( dev-cpp/gtest )
+"
+
+PATCHES=(
+	"${FILESDIR}/miniz-zip-header-2.2.53.4.patch"
+	"${FILESDIR}/freecad-dialog-2.2.53.4.patch"
+	"${FILESDIR}/missing-imports-${PV}.patch"
+	"${FILESDIR}/version-suffix-${PV}.patch"
+	"${FILESDIR}/symlink-fix-${PV}.patch"
+)
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	mv "${S}/resources/icons/SuperSlicer_192px.png" "${S}/resources/icons/SuperSlicer2.3_192px.png" || die "Failed to rename icons"
+	mv "${S}/resources/icons/SuperSlicer_192px_transparent.png" "${S}/resources/icons/SuperSlicer2.3_192px_transparent.png" || die "Failed to rename icons"
+	mv "${S}/resources/icons/SuperSlicer_128px.png" "${S}/resources/icons/SuperSlicer2.3_128px.png" || die "Failed to rename icons"
+	mv "${S}/resources/icons/SuperSlicer-gcodeviewer_128px.png" "${S}/resources/icons/SuperSlicer2.3-gcodeviewer_128px.png" || die "Failed to rename icons"
+	mv "${S}/resources/icons/SuperSlicer-gcodeviewer_192px.png" "${S}/resources/icons/SuperSlicer2.3-gcodeviewer_192px.png" || die "Failed to rename icons"
+	cp "${S}/resources/icons/SuperSlicer.png" "${S}/resources/icons/SuperSlicer2.3_logo.png" || die "Failed to make logo icon"
+
+	use profiles && unpack ${P}-profiles.zip
+	if use profiles ; then
+		cp -r "${WORKDIR}/slic3r-profiles-0b8261ae8bbd7c31d736f371323476d6aff3ef3b/"* "${S}/resources/profiles" || die "Failed to copy profiles"
+	fi
+}
+
+src_configure() {
+	use gui && setup-wxwidgets
+
+	CMAKE_BUILD_TYPE=Release
+	local mycmakeargs=(
+		-DSLIC3R_BUILD_TESTS=$(usex test)
+		-DSLIC3R_FHS=ON
+		-DSLIC3R_GTK=3
+		-DSLIC3R_GUI=$(usex gui)
+		-DSLIC3R_PCH=OFF
+		-DSLIC3R_WX_STABLE=ON
+		-Wno-dev
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	if use gui; then
+		newicon -s 128 resources/icons/SuperSlicer2.3_128px.png SuperSlicer2.3.png
+	fi
+}


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: media-gfx/superslicer/, media-gfx/superslicer/files/
@ 2022-04-10  8:56 Yahor Berdnikau
  0 siblings, 0 replies; 7+ messages in thread
From: Yahor Berdnikau @ 2022-04-10  8:56 UTC (permalink / raw
  To: gentoo-commits

commit:     42f09435eb4906a1ca35d1ab71d918836b21c3a5
Author:     Yahor Berdnikau <egorr.berd <AT> gmail <DOT> com>
AuthorDate: Sun Apr 10 08:56:04 2022 +0000
Commit:     Yahor Berdnikau <egorr.berd <AT> gmail <DOT> com>
CommitDate: Sun Apr 10 08:56:04 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=42f09435

media-gfx/superslicer: add 2.3.57.12 ebuild

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Yahor Berdnikau <egorr.berd <AT> gmail.com>

 media-gfx/superslicer/Manifest                     |   2 +
 .../files/cereal-new-versions-2.3.57.12.patch      |  46 +++++++++
 .../files/miniz-zip-header-2.3.57.12.patch         |  19 ++++
 .../files/missing-imports-2.3.57.12.patch          |  10 ++
 .../superslicer/files/symlink-fix-2.3.57.12.patch  |   9 ++
 .../files/version-suffix-2.3.57.12.patch           |  42 ++++++++
 media-gfx/superslicer/superslicer-2.3.57.12.ebuild | 109 +++++++++++++++++++++
 7 files changed, 237 insertions(+)

diff --git a/media-gfx/superslicer/Manifest b/media-gfx/superslicer/Manifest
index 0a6304018..d09c41d47 100644
--- a/media-gfx/superslicer/Manifest
+++ b/media-gfx/superslicer/Manifest
@@ -3,6 +3,8 @@ DIST superslicer-2.3.57.10-profiles.zip 12193950 BLAKE2B c61be0190345bf886cbe604
 DIST superslicer-2.3.57.10.tar.gz 32466957 BLAKE2B 7c5fff6ba8139a9bf66d931e6e48e6a9201e7911e90ce2e822ded7ae713f0b8fdf86b9cd317ded4802146c24758148ec989c213b5992c323a2fd442e17a4e228 SHA512 4d20078e11f5f99993220409bee54ca0a3f2a6fff04febfc09b5f1bc445ceaabc3a359f8f7f478127aa1504e8ba8a121a682c991adf2c45cb2ff1598ed2e3445
 DIST superslicer-2.3.57.11-profiles.zip 14382021 BLAKE2B f1908f3bdaebd742dcfa9d2a84dd94502b76261bccd5f924254d3ba10efa32f19923b3861f09c9e346092b77aeb7057830b0428462660967379d74b566744fd0 SHA512 af7c3843bfc1e7962b386ab1c6a20007e692abdb4d70e3129edf00739a082fe92193ab72e7746575b52aff4fd684c9c17b7f7698d7831aad8017310293895371
 DIST superslicer-2.3.57.11.tar.gz 32469197 BLAKE2B 8406717396acfa0c2cfe381587693d3961bdb4933f0d0821ed814e89f7597b4d90a56e877e3dd7e45fe4b14ee13f143e1cff241d59ce1798c39631dd7ffa706f SHA512 978eb5004d788e93ea58b788fbf8fe7a7c1c515b0a138e20662c3c1973b5c72373cd14c76d25ee180095c030416b5b4429b61bb73432910fe9288897a5d7cb4d
+DIST superslicer-2.3.57.12-profiles.zip 14382021 BLAKE2B f1908f3bdaebd742dcfa9d2a84dd94502b76261bccd5f924254d3ba10efa32f19923b3861f09c9e346092b77aeb7057830b0428462660967379d74b566744fd0 SHA512 af7c3843bfc1e7962b386ab1c6a20007e692abdb4d70e3129edf00739a082fe92193ab72e7746575b52aff4fd684c9c17b7f7698d7831aad8017310293895371
+DIST superslicer-2.3.57.12.tar.gz 32472874 BLAKE2B 600ed29724476f2812c7bbea9bc26d1b54f2291d8994b883ad9da64899ad181ca19e3975865f190b1a3125341456fb38f982f5c20a5d4a0c36459de498a6588b SHA512 3830d275ef9dc5a4b1c62451e532012995647ba276a65007ae2160a89f2c044e18bad851dcf225f768a7023d00e92f398013ffdf1e1fd75e137f37e93edc8f59
 DIST superslicer-2.3.57.7-profiles.zip 12193950 BLAKE2B c61be0190345bf886cbe60495f95266ec0b07824c803eaca7a29853a3465ab3d631d794899aebb9ef5f7660cb9341c70e9c38d6f8247a58655ed720deebbc584 SHA512 6beab170ae7e50e9880288673fd482f2903d5e9b87a0ddd6549098fa35f9b87e4891f015d0a26aedfac9736c3f55dcd1794d8abb3f9cc072bcdbb7e87f42a9fa
 DIST superslicer-2.3.57.7.tar.gz 32400355 BLAKE2B bcacf218ad18146327a9f7005d2c2217cf859d2793e8f74bfd453e2b8b12bf83d224f0325f6908b806735fb94c476b87c5dfe35c16026006bf5bd38de26e5f36 SHA512 d9a92366ed426dab77a5d49cddd7c7f37f2a0e026574bcbff342e579c555aefb19aaea8de7b5180bb87ab2749ba0cef96e870d808914fdbc58f3ddf04e1a4a65
 DIST superslicer-2.3.57.9-profiles.zip 12193950 BLAKE2B c61be0190345bf886cbe60495f95266ec0b07824c803eaca7a29853a3465ab3d631d794899aebb9ef5f7660cb9341c70e9c38d6f8247a58655ed720deebbc584 SHA512 6beab170ae7e50e9880288673fd482f2903d5e9b87a0ddd6549098fa35f9b87e4891f015d0a26aedfac9736c3f55dcd1794d8abb3f9cc072bcdbb7e87f42a9fa

diff --git a/media-gfx/superslicer/files/cereal-new-versions-2.3.57.12.patch b/media-gfx/superslicer/files/cereal-new-versions-2.3.57.12.patch
new file mode 100644
index 000000000..7e3b5dfc3
--- /dev/null
+++ b/media-gfx/superslicer/files/cereal-new-versions-2.3.57.12.patch
@@ -0,0 +1,46 @@
+# Backported via https://bugs.gentoo.org/834005
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -436,6 +436,9 @@ endif ()
+
+ # Find the Cereal serialization library
+ find_package(cereal REQUIRED)
++if (NOT TARGET cereal::cereal)
++    add_library(cereal::cereal ALIAS cereal)
++endif ()
+
+ # l10n
+ set(L10N_DIR "${SLIC3R_RESOURCES_DIR}/localization")
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -123,7 +123,7 @@
+     set_target_properties(Slic3r PROPERTIES OUTPUT_NAME "${SLIC3R_APP_CMD}")
+ endif ()
+
+-target_link_libraries(Slic3r libslic3r cereal)
++target_link_libraries(Slic3r libslic3r cereal::cereal)
+ if (APPLE)
+ #    add_compile_options(-stdlib=libc++)
+ #    add_definitions(-DBOOST_THREAD_DONT_USE_CHRONO -DBOOST_NO_CXX11_RVALUE_REFERENCES -DBOOST_THREAD_USES_MOVE)
+--- a/src/libslic3r/CMakeLists.txt
++++ b/src/libslic3r/CMakeLists.txt
+@@ -321,7 +321,7 @@
+ target_link_libraries(libslic3r
+     libnest2d
+     admesh
+-    cereal
++    cereal::cereal
+     libigl
+     miniz
+     boost_libs
+--- a/src/slic3r/CMakeLists.txt
++++ b/src/slic3r/CMakeLists.txt
+@@ -259,6 +259,6 @@
+
+ encoding_check(libslic3r_gui)
+
+-target_link_libraries(libslic3r_gui libslic3r avrdude cereal imgui GLEW::GLEW OpenGL::GL OpenGL::GLU hidapi exif libcurl ${wxWidgets_LIBRARIES})
++target_link_libraries(libslic3r_gui libslic3r avrdude cereal::cereal imgui GLEW::GLEW OpenGL::GL OpenGL::GLU hidapi exif libcurl ${wxWidgets_LIBRARIES})
+
+ if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
+     target_link_libraries(libslic3r_gui ${DBUS_LIBRARIES})

diff --git a/media-gfx/superslicer/files/miniz-zip-header-2.3.57.12.patch b/media-gfx/superslicer/files/miniz-zip-header-2.3.57.12.patch
new file mode 100644
index 000000000..a00aefb9c
--- /dev/null
+++ b/media-gfx/superslicer/files/miniz-zip-header-2.3.57.12.patch
@@ -0,0 +1,19 @@
+--- a/src/libslic3r/Format/3mf.cpp
++++ b/src/libslic3r/Format/3mf.cpp
+@@ -31,6 +31,7 @@ namespace pt = boost::property_tree;
+ #include <expat.h>
+ #include <Eigen/Dense>
+ #include "miniz_extension.hpp"
++#include <miniz_zip.h>
+
+ // VERSION NUMBERS
+ // 0 : .3mf, files saved by older slic3r or other applications. No version definition in them.
+--- a/src/libslic3r/miniz_extension.hpp
++++ b/src/libslic3r/miniz_extension.hpp
+@@ -3,6 +3,7 @@
+
+ #include <string>
+ #include <miniz.h>
++#include <miniz_zip.h>
+
+ namespace Slic3r {

diff --git a/media-gfx/superslicer/files/missing-imports-2.3.57.12.patch b/media-gfx/superslicer/files/missing-imports-2.3.57.12.patch
new file mode 100644
index 000000000..009a4892a
--- /dev/null
+++ b/media-gfx/superslicer/files/missing-imports-2.3.57.12.patch
@@ -0,0 +1,10 @@
+--- a/src/slic3r/Utils/PresetUpdater.cpp
++++ b/src/slic3r/Utils/PresetUpdater.cpp
+@@ -6,6 +6,7 @@
+ #include <ostream>
+ #include <utility>
+ #include <stdexcept>
++#include <regex>
+
+ #include <boost/algorithm/string.hpp>
+ #include <boost/filesystem.hpp>

diff --git a/media-gfx/superslicer/files/symlink-fix-2.3.57.12.patch b/media-gfx/superslicer/files/symlink-fix-2.3.57.12.patch
new file mode 100644
index 000000000..80d9eddfa
--- /dev/null
+++ b/media-gfx/superslicer/files/symlink-fix-2.3.57.12.patch
@@ -0,0 +1,9 @@
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -273,5 +273,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 ()

diff --git a/media-gfx/superslicer/files/version-suffix-2.3.57.12.patch b/media-gfx/superslicer/files/version-suffix-2.3.57.12.patch
new file mode 100644
index 000000000..ed583fcf9
--- /dev/null
+++ b/media-gfx/superslicer/files/version-suffix-2.3.57.12.patch
@@ -0,0 +1,42 @@
+--- a/src/platform/unix/Gcodeviewer.desktop.in
++++ b/src/platform/unix/Gcodeviewer.desktop.in
+@@ -1,5 +1,5 @@
+ [Desktop Entry]
+-Name=@GCODEVIEWER_APP_NAME@
++Name=@GCODEVIEWER_APP_KEY@
+ Comment=G-code viewer of Slic3r
+ Exec=@SLIC3R_APP_CMD@ --gcodeviewer %F
+ Icon=@GCODEVIEWER_APP_KEY@
+--- a/src/platform/unix/Slic3r.desktop.in
++++ b/src/platform/unix/Slic3r.desktop.in
+@@ -1,5 +1,5 @@
+ [Desktop Entry]
+-Name=@SLIC3R_APP_NAME@
++Name=@SLIC3R_APP_KEY@
+ GenericName=3D Printing Software
+ Comment=G-code generator for 3D printers
+ Icon=@SLIC3R_APP_KEY@
+@@ -10,4 +10,4 @@ MimeType=model/stl;application/vnd.ms-3mfdocument;application/prs.wavefront-obj;
+ Categories=Graphics;3DGraphics;Engineering;
+ Keywords=3D;Printing;Slicer;slice;3D;printer;convert;gcode;stl;obj;amf;SLA
+ StartupNotify=false
+-StartupWMClass=@SLIC3R_APP_KEY@
++StartupWMClass=@SLIC3R_APP_NAME@
+--- a/version.inc
++++ b/version.inc
+@@ -4,12 +4,12 @@
+ # name of the slicer
+ set(SLIC3R_APP_NAME "SuperSlicer")
+ # Key fo the slicer, must only contains ascii chars and no spaces (be valid in all filesystems)
+-set(SLIC3R_APP_KEY "SuperSlicer")
++set(SLIC3R_APP_KEY "SuperSlicer2.3")
+ # exe name of the slicer, should be lowercase and valid in all os
+-set(SLIC3R_APP_CMD "superslicer")
++set(SLIC3R_APP_CMD "superslicer-2.3")
+ # versions
+ set(SLIC3R_VERSION "2.3.57")
+ set(SLIC3R_VERSION_FULL "2.3.57.12")
+-set(SLIC3R_BUILD_ID "${SLIC3R_APP_KEY}_${SLIC3R_VERSION_FULL}+UNKNOWN")
++set(SLIC3R_BUILD_ID "${SLIC3R_APP_KEY}_${SLIC3R_VERSION_FULL}+Gentoo")
+ set(SLIC3R_RC_VERSION "2,3,57,12")
+ set(SLIC3R_RC_VERSION_DOTS "${SLIC3R_VERSION_FULL}")

diff --git a/media-gfx/superslicer/superslicer-2.3.57.12.ebuild b/media-gfx/superslicer/superslicer-2.3.57.12.ebuild
new file mode 100644
index 000000000..de043d7de
--- /dev/null
+++ b/media-gfx/superslicer/superslicer-2.3.57.12.ebuild
@@ -0,0 +1,109 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER="3.0-gtk3"
+
+inherit xdg cmake desktop wxwidgets
+
+MY_PN="SuperSlicer"
+DESCRIPTION="A mesh slicer to generated G-Code for fused-filament fabrication"
+HOMEPAGE="https://github.com/supermerill/SuperSlicer"
+SRC_URI="https://github.com/supermerill/SuperSlicer/archive/${PV}.tar.gz -> ${P}.tar.gz
+	profiles? ( https://github.com/slic3r/slic3r-profiles/archive/0b8261ae8bbd7c31d736f371323476d6aff3ef3b.zip -> ${P}-profiles.zip )"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="AGPL-3"
+SLOT="23"
+KEYWORDS="~amd64"
+IUSE="gui test profiles"
+
+# tests fail to link with USE=-gui, bug #760096
+REQUIRED_USE="test? ( gui )"
+RESTRICT="!test? ( test )"
+
+BDEPEND="profiles? ( app-arch/unzip )"
+RDEPEND="
+		dev-cpp/eigen:3
+		dev-cpp/tbb
+		>=dev-libs/boost-1.73.0:=[nls,threads(+)]
+		dev-libs/cereal
+		dev-libs/expat
+		dev-libs/c-blosc
+		dev-libs/gmp:=
+		>=dev-libs/miniz-2.1.0-r2
+		dev-libs/mpfr:=
+		>=media-gfx/openvdb-5.0.0
+		media-libs/ilmbase:=
+		media-libs/libpng:0=
+		media-libs/openexr:0=
+		media-libs/qhull:=
+		sci-libs/libigl
+		sci-libs/nlopt
+		>=sci-mathematics/cgal-5.0:=
+		sys-apps/dbus
+		sys-libs/zlib:=
+		gui? (
+				dev-libs/glib:2
+				media-libs/glew:0=
+				net-misc/curl
+				virtual/glu
+				virtual/opengl
+				x11-libs/gtk+:3
+				>=x11-libs/wxGTK-3.0.5.1:=[X,opengl]
+		)
+"
+DEPEND="${RDEPEND}
+		media-libs/qhull[static-libs]
+		test? ( dev-cpp/gtest )
+"
+
+PATCHES=(
+	"${FILESDIR}/miniz-zip-header-${PV}.patch"
+	"${FILESDIR}/freecad-dialog-2.2.53.4.patch"
+	"${FILESDIR}/missing-imports-${PV}.patch"
+	"${FILESDIR}/cereal-new-versions-${PV}.patch"
+	"${FILESDIR}/version-suffix-${PV}.patch"
+	"${FILESDIR}/symlink-fix-${PV}.patch"
+)
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	mv "${S}/resources/icons/SuperSlicer_192px.png" "${S}/resources/icons/SuperSlicer2.3_192px.png" || die "Failed to rename icons"
+	mv "${S}/resources/icons/SuperSlicer_192px_transparent.png" "${S}/resources/icons/SuperSlicer2.3_192px_transparent.png" || die "Failed to rename icons"
+	mv "${S}/resources/icons/SuperSlicer_128px.png" "${S}/resources/icons/SuperSlicer2.3_128px.png" || die "Failed to rename icons"
+	mv "${S}/resources/icons/SuperSlicer-gcodeviewer_128px.png" "${S}/resources/icons/SuperSlicer2.3-gcodeviewer_128px.png" || die "Failed to rename icons"
+	mv "${S}/resources/icons/SuperSlicer-gcodeviewer_192px.png" "${S}/resources/icons/SuperSlicer2.3-gcodeviewer_192px.png" || die "Failed to rename icons"
+	cp "${S}/resources/icons/SuperSlicer.png" "${S}/resources/icons/SuperSlicer2.3_logo.png" || die "Failed to make logo icon"
+
+	use profiles && unpack ${P}-profiles.zip
+	if use profiles ; then
+		cp -r "${WORKDIR}/slic3r-profiles-0b8261ae8bbd7c31d736f371323476d6aff3ef3b/"* "${S}/resources/profiles" || die "Failed to copy profiles"
+	fi
+}
+
+src_configure() {
+	use gui && setup-wxwidgets
+
+	CMAKE_BUILD_TYPE=Release
+	local mycmakeargs=(
+		-DSLIC3R_BUILD_TESTS=$(usex test)
+		-DSLIC3R_FHS=ON
+		-DSLIC3R_GTK=3
+		-DSLIC3R_GUI=$(usex gui)
+		-DSLIC3R_PCH=OFF
+		-DSLIC3R_WX_STABLE=ON
+		-Wno-dev
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	if use gui; then
+		newicon -s 128 resources/icons/SuperSlicer2.3_128px.png SuperSlicer2.3.png
+	fi
+}


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: media-gfx/superslicer/, media-gfx/superslicer/files/
  2022-07-20  9:35 [gentoo-commits] repo/proj/guru:master commit in: media-gfx/superslicer/files/, media-gfx/superslicer/ Andrew Ammerlaan
@ 2022-07-20  9:28 ` Andrew Ammerlaan
  0 siblings, 0 replies; 7+ messages in thread
From: Andrew Ammerlaan @ 2022-07-20  9:28 UTC (permalink / raw
  To: gentoo-commits

commit:     a3676217af146645999831fc08ff0c97b657898d
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 20 09:25:25 2022 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Wed Jul 20 09:25:25 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=a3676217

media-gfx/superslicer: remove duplicate

Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 media-gfx/superslicer/Manifest                     |   3 -
 ...or-HiDPI-in-OpenGL-on-Linux-GTK3-2.2.53.4.patch |  64 ------------
 .../superslicer/files/boost-endian-2.2.53.4.patch  |  49 ---------
 .../files/boost-mouse-atomic-2.2.53.4.patch        |   9 --
 .../files/cereal-new-versions-2.3.57.12.patch      |  46 ---------
 .../files/freecad-dialog-2.2.53.4.patch            |   9 --
 .../files/miniz-zip-header-2.2.53.4.patch          |  20 ----
 .../files/miniz-zip-header-2.3.57.12.patch         |  19 ----
 .../files/missing-imports-2.3.57.12.patch          |  10 --
 .../superslicer/files/symlink-fix-2.3.57.12.patch  |   9 --
 .../files/version-suffix-2.2.53.4.patch            |  11 ---
 .../files/version-suffix-2.3.57.12.patch           |  42 --------
 media-gfx/superslicer/metadata.xml                 |  11 ---
 .../superslicer/superslicer-2.2.53.4-r1.ebuild     |  88 -----------------
 media-gfx/superslicer/superslicer-2.3.57.12.ebuild | 109 ---------------------
 15 files changed, 499 deletions(-)

diff --git a/media-gfx/superslicer/Manifest b/media-gfx/superslicer/Manifest
deleted file mode 100644
index 1175a6f62..000000000
--- a/media-gfx/superslicer/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST superslicer-2.2.53.4.tar.gz 33791161 BLAKE2B c8454ac66a5d75f5bbcd1c29f600897c697f03ad581c97539033758942eac1d4ba0d2acbac43e75307a06e565d25a39b192e6cde522cce6b728afc04c42f82bb SHA512 f883cca3eb2575186c5077e2c1f9ca37e497ff6ed9aeae45a58c1db4de1c52db36fc0f14e7fdcd95aaf375b340932674014614cdab8c6995c56b9988fe5baa06
-DIST superslicer-2.3.57.12-profiles.zip 14382021 BLAKE2B f1908f3bdaebd742dcfa9d2a84dd94502b76261bccd5f924254d3ba10efa32f19923b3861f09c9e346092b77aeb7057830b0428462660967379d74b566744fd0 SHA512 af7c3843bfc1e7962b386ab1c6a20007e692abdb4d70e3129edf00739a082fe92193ab72e7746575b52aff4fd684c9c17b7f7698d7831aad8017310293895371
-DIST superslicer-2.3.57.12.tar.gz 32472874 BLAKE2B 600ed29724476f2812c7bbea9bc26d1b54f2291d8994b883ad9da64899ad181ca19e3975865f190b1a3125341456fb38f982f5c20a5d4a0c36459de498a6588b SHA512 3830d275ef9dc5a4b1c62451e532012995647ba276a65007ae2160a89f2c044e18bad851dcf225f768a7023d00e92f398013ffdf1e1fd75e137f37e93edc8f59

diff --git a/media-gfx/superslicer/files/Support-for-HiDPI-in-OpenGL-on-Linux-GTK3-2.2.53.4.patch b/media-gfx/superslicer/files/Support-for-HiDPI-in-OpenGL-on-Linux-GTK3-2.2.53.4.patch
deleted file mode 100644
index 214395524..000000000
--- a/media-gfx/superslicer/files/Support-for-HiDPI-in-OpenGL-on-Linux-GTK3-2.2.53.4.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From a13b35ce92efed202ef43f02debb83dfb533d9b0 Mon Sep 17 00:00:00 2001
-From: Vojtech Bubnik <bubnikv@gmail.com>
-Date: Tue, 15 Dec 2020 12:14:30 +0100
-Subject: [PATCH] Support for HiDPI in OpenGL on Linux / GTK3. wxGTK3 HiDPI
- support seems to emulate what OSX does quite closely, thus the changes are
- relatively minimal.
-
-Also fixed an ugly rounding issue when populating the ImGUI font map
-with image thumbnails.
-
-Fixes Gtk3 issue on 4k+ screens #4135
-Fixes HiDPI screens with Wayland on Fedora 30 cause Plater view to be too small. #3245
-
-Signed-off-by: Yahor Berdnikau <egorr.berd@gmail.com>
----
- src/slic3r/GUI/GLCanvas3D.cpp   | 10 +++++++++-
- src/slic3r/GUI/GLCanvas3D.hpp   |  5 +++--
- src/slic3r/GUI/ImGuiWrapper.cpp |  8 ++++++--
- src/slic3r/GUI/MainFrame.cpp    |  3 ++-
- 4 files changed, 20 insertions(+), 6 deletions(-)
-
-diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp
-index e778de879..c2e442431 100644
---- a/src/slic3r/GUI/GLCanvas3D.cpp
-+++ b/src/slic3r/GUI/GLCanvas3D.cpp
-@@ -86,6 +86,13 @@ static const size_t VERTEX_BUFFER_RESERVE_SIZE_SUM_MAX = 1024 * 1024 * 128 / 4;
- namespace Slic3r {
- namespace GUI {
- 
-+#ifdef __WXGTK3__
-+// wxGTK3 seems to simulate OSX behavior in regard to HiDPI scaling support.
-+RetinaHelper::RetinaHelper(wxWindow* window) : m_window(window), m_self(nullptr) {}
-+RetinaHelper::~RetinaHelper() {}
-+float RetinaHelper::get_scale_factor() { return float(m_window->GetContentScaleFactor()); }
-+#endif // __WXGTK3__
-+
- Size::Size()
-     : m_width(0)
-     , m_height(0)
-@@ -3732,7 +3739,8 @@ void GLCanvas3D::update_ui_from_settings()
- {
-     m_dirty = true;
- 
--#if ENABLE_RETINA_GL
-+#if __APPLE__
-+    // Update OpenGL scaling on OSX after the user toggled the "use_retina_opengl" settings in Preferences dialog.
-     const float orig_scaling = m_retina_helper->get_scale_factor();
- 
-     const bool use_retina = wxGetApp().app_config->get("use_retina_opengl") == "1";
-diff --git a/src/slic3r/GUI/GLCanvas3D.hpp b/src/slic3r/GUI/GLCanvas3D.hpp
-index 9c80aa236..e64e65d1b 100644
---- a/src/slic3r/GUI/GLCanvas3D.hpp
-+++ b/src/slic3r/GUI/GLCanvas3D.hpp
-@@ -31,7 +31,8 @@ class wxPaintEvent;
- class wxGLCanvas;
- class wxGLContext;
- 
--// Support for Retina OpenGL on Mac OS
--#define ENABLE_RETINA_GL __APPLE__
-+// Support for Retina OpenGL on Mac OS.
-+// wxGTK3 seems to simulate OSX behavior in regard to HiDPI scaling support, enable it as well.
-+#define ENABLE_RETINA_GL (__APPLE__ || __WXGTK3__)
- 
- namespace Slic3r {

diff --git a/media-gfx/superslicer/files/boost-endian-2.2.53.4.patch b/media-gfx/superslicer/files/boost-endian-2.2.53.4.patch
deleted file mode 100644
index 226ad261a..000000000
--- a/media-gfx/superslicer/files/boost-endian-2.2.53.4.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- 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 @@
-     	// 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 @@
-       		// 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

diff --git a/media-gfx/superslicer/files/boost-mouse-atomic-2.2.53.4.patch b/media-gfx/superslicer/files/boost-mouse-atomic-2.2.53.4.patch
deleted file mode 100644
index e7556e0aa..000000000
--- a/media-gfx/superslicer/files/boost-mouse-atomic-2.2.53.4.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/src/slic3r/GUI/Mouse3DController.hpp
-+++ b/src/slic3r/GUI/Mouse3DController.hpp
-@@ -11,5 +11,6 @@
- #include "hidapi.h"
-
- #include <queue>
-+#include <atomic>
- #include <thread>
- #include <vector>

diff --git a/media-gfx/superslicer/files/cereal-new-versions-2.3.57.12.patch b/media-gfx/superslicer/files/cereal-new-versions-2.3.57.12.patch
deleted file mode 100644
index 7e3b5dfc3..000000000
--- a/media-gfx/superslicer/files/cereal-new-versions-2.3.57.12.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-# Backported via https://bugs.gentoo.org/834005
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -436,6 +436,9 @@ endif ()
-
- # Find the Cereal serialization library
- find_package(cereal REQUIRED)
-+if (NOT TARGET cereal::cereal)
-+    add_library(cereal::cereal ALIAS cereal)
-+endif ()
-
- # l10n
- set(L10N_DIR "${SLIC3R_RESOURCES_DIR}/localization")
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -123,7 +123,7 @@
-     set_target_properties(Slic3r PROPERTIES OUTPUT_NAME "${SLIC3R_APP_CMD}")
- endif ()
-
--target_link_libraries(Slic3r libslic3r cereal)
-+target_link_libraries(Slic3r libslic3r cereal::cereal)
- if (APPLE)
- #    add_compile_options(-stdlib=libc++)
- #    add_definitions(-DBOOST_THREAD_DONT_USE_CHRONO -DBOOST_NO_CXX11_RVALUE_REFERENCES -DBOOST_THREAD_USES_MOVE)
---- a/src/libslic3r/CMakeLists.txt
-+++ b/src/libslic3r/CMakeLists.txt
-@@ -321,7 +321,7 @@
- target_link_libraries(libslic3r
-     libnest2d
-     admesh
--    cereal
-+    cereal::cereal
-     libigl
-     miniz
-     boost_libs
---- a/src/slic3r/CMakeLists.txt
-+++ b/src/slic3r/CMakeLists.txt
-@@ -259,6 +259,6 @@
-
- encoding_check(libslic3r_gui)
-
--target_link_libraries(libslic3r_gui libslic3r avrdude cereal imgui GLEW::GLEW OpenGL::GL OpenGL::GLU hidapi exif libcurl ${wxWidgets_LIBRARIES})
-+target_link_libraries(libslic3r_gui libslic3r avrdude cereal::cereal imgui GLEW::GLEW OpenGL::GL OpenGL::GLU hidapi exif libcurl ${wxWidgets_LIBRARIES})
-
- if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
-     target_link_libraries(libslic3r_gui ${DBUS_LIBRARIES})

diff --git a/media-gfx/superslicer/files/freecad-dialog-2.2.53.4.patch b/media-gfx/superslicer/files/freecad-dialog-2.2.53.4.patch
deleted file mode 100644
index 880ef6b1f..000000000
--- a/media-gfx/superslicer/files/freecad-dialog-2.2.53.4.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/src/slic3r/GUI/FreeCADDialog.cpp
-+++ b/src/slic3r/GUI/FreeCADDialog.cpp
-@@ -706,5 +706,5 @@
-     m_text->Bind(wxEVT_KEY_DOWN, &FreeCADDialog::on_key_type, this);
-     m_text->Bind(wxEVT_CHAR, &FreeCADDialog::on_char_type, this);
--    m_text->Bind(wxEVT_STC_AUTOCOMP_COMPLETED, &FreeCADDialog::on_autocomp_complete, this);
-+   //m_text->Bind(wxEVT_STC_AUTOCOMP_COMPLETED, &FreeCADDialog::on_autocomp_complete, this);
-     m_text->Connect(wxID_ANY,
-            wxEVT_KEY_DOWN,

diff --git a/media-gfx/superslicer/files/miniz-zip-header-2.2.53.4.patch b/media-gfx/superslicer/files/miniz-zip-header-2.2.53.4.patch
deleted file mode 100644
index 2294ba0b5..000000000
--- a/media-gfx/superslicer/files/miniz-zip-header-2.2.53.4.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-https://bugs.gentoo.org/761541
---- a/src/libslic3r/miniz_extension.hpp	2021-01-11 08:01:51.000000000 -0500
-+++ b/src/libslic3r/miniz_extension.hpp	2021-01-12 01:16:10.503404521 -0500
-@@ -4,4 +4,5 @@
- #include <string>
- #include <miniz.h>
-+#include <miniz_zip.h>
- 
- namespace Slic3r {
-
---- a/src/libslic3r/Format/3mf.cpp
-+++ b/src/libslic3r/Format/3mf.cpp
-@@ -30,6 +30,7 @@ namespace pt = boost::property_tree;
- #include <expat.h>
- #include <Eigen/Dense>
- #include "miniz_extension.hpp"
-+#include <miniz_zip.h>
-
- // VERSION NUMBERS
- // 0 : .3mf, files saved by older slic3r or other applications. No version definition in them.

diff --git a/media-gfx/superslicer/files/miniz-zip-header-2.3.57.12.patch b/media-gfx/superslicer/files/miniz-zip-header-2.3.57.12.patch
deleted file mode 100644
index a00aefb9c..000000000
--- a/media-gfx/superslicer/files/miniz-zip-header-2.3.57.12.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/src/libslic3r/Format/3mf.cpp
-+++ b/src/libslic3r/Format/3mf.cpp
-@@ -31,6 +31,7 @@ namespace pt = boost::property_tree;
- #include <expat.h>
- #include <Eigen/Dense>
- #include "miniz_extension.hpp"
-+#include <miniz_zip.h>
-
- // VERSION NUMBERS
- // 0 : .3mf, files saved by older slic3r or other applications. No version definition in them.
---- a/src/libslic3r/miniz_extension.hpp
-+++ b/src/libslic3r/miniz_extension.hpp
-@@ -3,6 +3,7 @@
-
- #include <string>
- #include <miniz.h>
-+#include <miniz_zip.h>
-
- namespace Slic3r {

diff --git a/media-gfx/superslicer/files/missing-imports-2.3.57.12.patch b/media-gfx/superslicer/files/missing-imports-2.3.57.12.patch
deleted file mode 100644
index 009a4892a..000000000
--- a/media-gfx/superslicer/files/missing-imports-2.3.57.12.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/slic3r/Utils/PresetUpdater.cpp
-+++ b/src/slic3r/Utils/PresetUpdater.cpp
-@@ -6,6 +6,7 @@
- #include <ostream>
- #include <utility>
- #include <stdexcept>
-+#include <regex>
-
- #include <boost/algorithm/string.hpp>
- #include <boost/filesystem.hpp>

diff --git a/media-gfx/superslicer/files/symlink-fix-2.3.57.12.patch b/media-gfx/superslicer/files/symlink-fix-2.3.57.12.patch
deleted file mode 100644
index 80d9eddfa..000000000
--- a/media-gfx/superslicer/files/symlink-fix-2.3.57.12.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -273,5 +273,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 ()

diff --git a/media-gfx/superslicer/files/version-suffix-2.2.53.4.patch b/media-gfx/superslicer/files/version-suffix-2.2.53.4.patch
deleted file mode 100644
index e970f2e09..000000000
--- a/media-gfx/superslicer/files/version-suffix-2.2.53.4.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/version.inc
-+++ b/version.inc
-@@ -2,7 +2,7 @@
- # (the version numbers are generated by the build script from the git current label)
-
- set(SLIC3R_APP_NAME "SuperSlicer")
--set(SLIC3R_APP_KEY "SuperSlicer")
-+set(SLIC3R_APP_KEY "SuperSlicer2.2")
- set(SLIC3R_VERSION "2.2.53")
- set(SLIC3R_BUILD_ID "SuperSlicer_${SLIC3R_VERSION}+UNKNOWN")
- set(SLIC3R_RC_VERSION "2,2,53,0")

diff --git a/media-gfx/superslicer/files/version-suffix-2.3.57.12.patch b/media-gfx/superslicer/files/version-suffix-2.3.57.12.patch
deleted file mode 100644
index ed583fcf9..000000000
--- a/media-gfx/superslicer/files/version-suffix-2.3.57.12.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- a/src/platform/unix/Gcodeviewer.desktop.in
-+++ b/src/platform/unix/Gcodeviewer.desktop.in
-@@ -1,5 +1,5 @@
- [Desktop Entry]
--Name=@GCODEVIEWER_APP_NAME@
-+Name=@GCODEVIEWER_APP_KEY@
- Comment=G-code viewer of Slic3r
- Exec=@SLIC3R_APP_CMD@ --gcodeviewer %F
- Icon=@GCODEVIEWER_APP_KEY@
---- a/src/platform/unix/Slic3r.desktop.in
-+++ b/src/platform/unix/Slic3r.desktop.in
-@@ -1,5 +1,5 @@
- [Desktop Entry]
--Name=@SLIC3R_APP_NAME@
-+Name=@SLIC3R_APP_KEY@
- GenericName=3D Printing Software
- Comment=G-code generator for 3D printers
- Icon=@SLIC3R_APP_KEY@
-@@ -10,4 +10,4 @@ MimeType=model/stl;application/vnd.ms-3mfdocument;application/prs.wavefront-obj;
- Categories=Graphics;3DGraphics;Engineering;
- Keywords=3D;Printing;Slicer;slice;3D;printer;convert;gcode;stl;obj;amf;SLA
- StartupNotify=false
--StartupWMClass=@SLIC3R_APP_KEY@
-+StartupWMClass=@SLIC3R_APP_NAME@
---- a/version.inc
-+++ b/version.inc
-@@ -4,12 +4,12 @@
- # name of the slicer
- set(SLIC3R_APP_NAME "SuperSlicer")
- # Key fo the slicer, must only contains ascii chars and no spaces (be valid in all filesystems)
--set(SLIC3R_APP_KEY "SuperSlicer")
-+set(SLIC3R_APP_KEY "SuperSlicer2.3")
- # exe name of the slicer, should be lowercase and valid in all os
--set(SLIC3R_APP_CMD "superslicer")
-+set(SLIC3R_APP_CMD "superslicer-2.3")
- # versions
- set(SLIC3R_VERSION "2.3.57")
- set(SLIC3R_VERSION_FULL "2.3.57.12")
--set(SLIC3R_BUILD_ID "${SLIC3R_APP_KEY}_${SLIC3R_VERSION_FULL}+UNKNOWN")
-+set(SLIC3R_BUILD_ID "${SLIC3R_APP_KEY}_${SLIC3R_VERSION_FULL}+Gentoo")
- set(SLIC3R_RC_VERSION "2,3,57,12")
- set(SLIC3R_RC_VERSION_DOTS "${SLIC3R_VERSION_FULL}")

diff --git a/media-gfx/superslicer/metadata.xml b/media-gfx/superslicer/metadata.xml
deleted file mode 100644
index a9b8c9f13..000000000
--- a/media-gfx/superslicer/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-  <email>egorr.berd@gmail.com</email>
-  <name>Yahor Berdnikau</name>
-</maintainer>
-<use>
-  <flag name="profiles">Install additional 3d printer profiles.</flag>
-</use>
-</pkgmetadata>

diff --git a/media-gfx/superslicer/superslicer-2.2.53.4-r1.ebuild b/media-gfx/superslicer/superslicer-2.2.53.4-r1.ebuild
deleted file mode 100644
index 3e1e71e6b..000000000
--- a/media-gfx/superslicer/superslicer-2.2.53.4-r1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WX_GTK_VER="3.0-gtk3"
-
-inherit xdg cmake desktop wxwidgets
-
-MY_PN="SuperSlicer"
-DESCRIPTION="A mesh slicer to generated G-Code for fused-filament fabrication"
-HOMEPAGE="https://github.com/supermerill/SuperSlicer"
-SRC_URI="https://github.com/supermerill/SuperSlicer/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="AGPL-3"
-SLOT="22"
-KEYWORDS="~amd64"
-IUSE="gui test"
-
-# tests fail to link with USE=-gui, bug #760096
-REQUIRED_USE="test? ( gui )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-		~dev-cpp/tbb-2020.3
-		>=dev-libs/boost-1.73.0:=[nls,threads(+)]
-		dev-libs/c-blosc
-		dev-libs/cereal
-		dev-libs/openssl
-		>=dev-libs/miniz-2.1.0-r2
-		media-gfx/openvdb:0/7
-		media-libs/qhull:=
-		media-libs/openexr:0=
-		sci-libs/libigl
-		sci-libs/nlopt
-		>=sci-mathematics/cgal-5.0:=
-		sys-libs/zlib:=
-		gui? (
-				dev-libs/glib:2
-				media-libs/glew:0=
-				net-misc/curl
-				virtual/glu
-				virtual/opengl
-				x11-libs/gtk+:3
-				x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
-		)
-"
-DEPEND="${RDEPEND}
-		media-libs/qhull[static-libs]
-		test? ( dev-cpp/gtest )
-"
-
-PATCHES=(
-	"${FILESDIR}/boost-endian-${PV}.patch"
-	"${FILESDIR}/miniz-zip-header-${PV}.patch"
-	"${FILESDIR}/freecad-dialog-${PV}.patch"
-	"${FILESDIR}/boost-mouse-atomic-${PV}.patch"
-	"${FILESDIR}/Support-for-HiDPI-in-OpenGL-on-Linux-GTK3-${PV}.patch"
-	"${FILESDIR}/version-suffix-${PV}.patch"
-)
-
-src_configure() {
-	use gui && setup-wxwidgets
-
-	CMAKE_BUILD_TYPE=Release
-	local mycmakeargs=(
-		-DSLIC3R_BUILD_TESTS=$(usex test)
-		-DSLIC3R_FHS=1
-		-DSLIC3R_GUI=$(usex gui)
-		-DSLIC3R_PCH=0
-		-DSLIC3R_WX_STABLE=1
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	if use gui; then
-		newicon -s 128 resources/icons/Slic3r_128px.png SuperSli3er_2.2.png
-		make_desktop_entry superslicer "SuperSlicer 2.2" "SuperSli3er_2.2" "Graphics;3DGraphics;Engineering;" \
-			"MimeType=model/stl;application/vnd.ms-3mfdocument;application/prs.wavefront-obj;application/x-amf;" \
-			"GenericName=3D Printing Software" \
-			"Keywords=3D;Printing;Slicer;slice;3D;printer;convert;gcode;stl;obj;amf;SLA"
-	fi
-}

diff --git a/media-gfx/superslicer/superslicer-2.3.57.12.ebuild b/media-gfx/superslicer/superslicer-2.3.57.12.ebuild
deleted file mode 100644
index de043d7de..000000000
--- a/media-gfx/superslicer/superslicer-2.3.57.12.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-WX_GTK_VER="3.0-gtk3"
-
-inherit xdg cmake desktop wxwidgets
-
-MY_PN="SuperSlicer"
-DESCRIPTION="A mesh slicer to generated G-Code for fused-filament fabrication"
-HOMEPAGE="https://github.com/supermerill/SuperSlicer"
-SRC_URI="https://github.com/supermerill/SuperSlicer/archive/${PV}.tar.gz -> ${P}.tar.gz
-	profiles? ( https://github.com/slic3r/slic3r-profiles/archive/0b8261ae8bbd7c31d736f371323476d6aff3ef3b.zip -> ${P}-profiles.zip )"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="AGPL-3"
-SLOT="23"
-KEYWORDS="~amd64"
-IUSE="gui test profiles"
-
-# tests fail to link with USE=-gui, bug #760096
-REQUIRED_USE="test? ( gui )"
-RESTRICT="!test? ( test )"
-
-BDEPEND="profiles? ( app-arch/unzip )"
-RDEPEND="
-		dev-cpp/eigen:3
-		dev-cpp/tbb
-		>=dev-libs/boost-1.73.0:=[nls,threads(+)]
-		dev-libs/cereal
-		dev-libs/expat
-		dev-libs/c-blosc
-		dev-libs/gmp:=
-		>=dev-libs/miniz-2.1.0-r2
-		dev-libs/mpfr:=
-		>=media-gfx/openvdb-5.0.0
-		media-libs/ilmbase:=
-		media-libs/libpng:0=
-		media-libs/openexr:0=
-		media-libs/qhull:=
-		sci-libs/libigl
-		sci-libs/nlopt
-		>=sci-mathematics/cgal-5.0:=
-		sys-apps/dbus
-		sys-libs/zlib:=
-		gui? (
-				dev-libs/glib:2
-				media-libs/glew:0=
-				net-misc/curl
-				virtual/glu
-				virtual/opengl
-				x11-libs/gtk+:3
-				>=x11-libs/wxGTK-3.0.5.1:=[X,opengl]
-		)
-"
-DEPEND="${RDEPEND}
-		media-libs/qhull[static-libs]
-		test? ( dev-cpp/gtest )
-"
-
-PATCHES=(
-	"${FILESDIR}/miniz-zip-header-${PV}.patch"
-	"${FILESDIR}/freecad-dialog-2.2.53.4.patch"
-	"${FILESDIR}/missing-imports-${PV}.patch"
-	"${FILESDIR}/cereal-new-versions-${PV}.patch"
-	"${FILESDIR}/version-suffix-${PV}.patch"
-	"${FILESDIR}/symlink-fix-${PV}.patch"
-)
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	mv "${S}/resources/icons/SuperSlicer_192px.png" "${S}/resources/icons/SuperSlicer2.3_192px.png" || die "Failed to rename icons"
-	mv "${S}/resources/icons/SuperSlicer_192px_transparent.png" "${S}/resources/icons/SuperSlicer2.3_192px_transparent.png" || die "Failed to rename icons"
-	mv "${S}/resources/icons/SuperSlicer_128px.png" "${S}/resources/icons/SuperSlicer2.3_128px.png" || die "Failed to rename icons"
-	mv "${S}/resources/icons/SuperSlicer-gcodeviewer_128px.png" "${S}/resources/icons/SuperSlicer2.3-gcodeviewer_128px.png" || die "Failed to rename icons"
-	mv "${S}/resources/icons/SuperSlicer-gcodeviewer_192px.png" "${S}/resources/icons/SuperSlicer2.3-gcodeviewer_192px.png" || die "Failed to rename icons"
-	cp "${S}/resources/icons/SuperSlicer.png" "${S}/resources/icons/SuperSlicer2.3_logo.png" || die "Failed to make logo icon"
-
-	use profiles && unpack ${P}-profiles.zip
-	if use profiles ; then
-		cp -r "${WORKDIR}/slic3r-profiles-0b8261ae8bbd7c31d736f371323476d6aff3ef3b/"* "${S}/resources/profiles" || die "Failed to copy profiles"
-	fi
-}
-
-src_configure() {
-	use gui && setup-wxwidgets
-
-	CMAKE_BUILD_TYPE=Release
-	local mycmakeargs=(
-		-DSLIC3R_BUILD_TESTS=$(usex test)
-		-DSLIC3R_FHS=ON
-		-DSLIC3R_GTK=3
-		-DSLIC3R_GUI=$(usex gui)
-		-DSLIC3R_PCH=OFF
-		-DSLIC3R_WX_STABLE=ON
-		-Wno-dev
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	if use gui; then
-		newicon -s 128 resources/icons/SuperSlicer2.3_128px.png SuperSlicer2.3.png
-	fi
-}


^ permalink raw reply related	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2022-07-20  9:28 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-02-06 20:14 [gentoo-commits] repo/proj/guru:dev commit in: media-gfx/superslicer/, media-gfx/superslicer/files/ Yahor Berdnikau
  -- strict thread matches above, loose matches on Subject: below --
2022-07-20  9:35 [gentoo-commits] repo/proj/guru:master commit in: media-gfx/superslicer/files/, media-gfx/superslicer/ Andrew Ammerlaan
2022-07-20  9:28 ` [gentoo-commits] repo/proj/guru:dev commit in: media-gfx/superslicer/, media-gfx/superslicer/files/ Andrew Ammerlaan
2022-04-10  8:56 Yahor Berdnikau
2022-02-18 19:35 Yahor Berdnikau
2022-02-06 20:14 Yahor Berdnikau
2022-01-26  8:47 Yahor Berdnikau
2021-12-04 20:15 Yahor Berdnikau

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox