pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
prusaslicer: Update to 2.6.1
Module Name: pkgsrc-wip
Committed By: Paul Ripke <stix%stix.id.au@localhost>
Pushed By: stix
Date: Fri Sep 8 09:05:01 2023 +1000
Changeset: abeacefb881f06272705722253776e1f0c914c0d
Modified Files:
prusaslicer/Makefile
prusaslicer/distinfo
prusaslicer/patches/patch-src_CMakeLists_txt
prusaslicer/patches/patch-src_slic3r_GUI_ConfigWizard.cpp
prusaslicer/patches/patch-src_slic3r_GUI_DesktopIntegrationDialog.cpp
prusaslicer/patches/patch-src_slic3r_GUI_DesktopIntegrationDialog.hpp
Log Message:
prusaslicer: Update to 2.6.1
Improvements with respect to 2.6.1-rc2
- The Help menu in PrusaSlicer was extended with "Sample G-codes and Models"
item, which navigates the user to the respective page on our website where
these assets can be downloaded.
- The Help menu was extended with "Quick Start" item, which navigates the user
to the beginner's guide on our website.
Bugs fixed with respect to 2.6.1-rc2
- Two tooltips in the Cut tool dialog were shown with mangled encoding in some
languages (#11236).
Bugs fixed with respect to 2.6.0
- When renaming a preset to a name containing non-ASCII characters, the
encoding was mangled. This is now fixed (#11232).
- Supports are no longer shown when using the clipping plane in SLA supports
tool.
- Fixed a crash when displaying command line help (#11060).
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=abeacefb881f06272705722253776e1f0c914c0d
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
prusaslicer/Makefile | 6 ++++--
prusaslicer/distinfo | 14 +++++++-------
prusaslicer/patches/patch-src_CMakeLists_txt | 21 +++++++--------------
.../patches/patch-src_slic3r_GUI_ConfigWizard.cpp | 14 +++++++-------
...atch-src_slic3r_GUI_DesktopIntegrationDialog.cpp | 7 +++++--
...atch-src_slic3r_GUI_DesktopIntegrationDialog.hpp | 9 ++++++---
6 files changed, 36 insertions(+), 35 deletions(-)
diffs:
diff --git a/prusaslicer/Makefile b/prusaslicer/Makefile
index 189d343cff..689a1986ec 100644
--- a/prusaslicer/Makefile
+++ b/prusaslicer/Makefile
@@ -1,6 +1,6 @@
# $NetBSD$
-PKGVERSION= 2.6.0
+PKGVERSION= 2.6.1
PKGNAME= prusaslicer-${PKGVERSION}
DISTNAME= PrusaSlicer-${PKGVERSION:C/(beta|rc)/-\1/}
CATEGORIES= cad
@@ -29,16 +29,18 @@ BUILDLINK_TRANSFORM.NetBSD+= l:libexpat:expat
.include "../../mk/bsd.prefs.mk"
-CMAKE_ARGS+= -DSLIC3R_WX_STABLE:BOOL=TRUE
CMAKE_ARGS+= -DSLIC3R_FHS:BOOL=TRUE
#CMAKE_ARGS+= -DCMAKE_CXX_FLAGS:STRING=-g
+.include "../../archivers/brotli/buildlink3.mk"
.include "../../comms/libhidapi/buildlink3.mk"
.include "../../databases/shared-mime-info/buildlink3.mk"
.include "../../devel/at-spi2-atk/buildlink3.mk"
.include "../../devel/atk/buildlink3.mk"
.include "../../devel/boost-headers/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/libepoll-shim/buildlink3.mk"
+.include "../../devel/libffi/buildlink3.mk"
.include "../../devel/pango/buildlink3.mk"
.include "../../devel/wayland/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
diff --git a/prusaslicer/distinfo b/prusaslicer/distinfo
index d6be67709b..b2274a04b5 100644
--- a/prusaslicer/distinfo
+++ b/prusaslicer/distinfo
@@ -1,11 +1,11 @@
$NetBSD$
-BLAKE2s (PrusaSlicer-2.6.0.tar.gz) = 050e4c67ff48d29dd3d3e063a01f89ff2a9478a0e99c39646d923a3125b9007c
-SHA512 (PrusaSlicer-2.6.0.tar.gz) = c6133f09ccee5c3c6f1e6e3aebfee749fb0138e830d93ed42b19063b89738162095fa7c017695643b736099750bb56d6bd8174f8bf18a6f0703811703bfb508c
-Size (PrusaSlicer-2.6.0.tar.gz) = 56430180 bytes
+BLAKE2s (PrusaSlicer-2.6.1.tar.gz) = 5c651adf66c360282f18c7483d2ad0fb01ec30d8dae1745090705ef035bac0fb
+SHA512 (PrusaSlicer-2.6.1.tar.gz) = 2b04eeff4feca2afd560b2fb6a5bbdaae6cabed2180d1416f2e4c7c385a50f859ec334c864a737b7c09eb3fd88f80af68655a0ef25ce9216b16549b16b3020b0
+Size (PrusaSlicer-2.6.1.tar.gz) = 58479800 bytes
SHA1 (patch-CMakeLists.txt) = 33eb39d85ba7b33226f2cc022250872c3ffa28d8
SHA1 (patch-cmake_modules_FindOpenVDB.cmake) = 4f2afc423a70fe60617b33ff7f26859b39775faa
-SHA1 (patch-src_CMakeLists_txt) = fe61037cd75fe49f7de593986c864222dac0ca44
+SHA1 (patch-src_CMakeLists_txt) = 24e0b8e6512b2a3f84204b03d8161aca903748a1
SHA1 (patch-src_avrdude_arduino.c) = ff02a4cab1c2d8c82ec7b22c7447ed5ec360ac57
SHA1 (patch-src_avrdude_libavrdude.h) = 62d48054b147985249664f257dbd8bbd670df233
SHA1 (patch-src_libslic3r_GCodeSender.cpp) = bd69c52e92ff85dba7f357eab62788a8e67a440e
@@ -18,10 +18,10 @@ SHA1 (patch-src_libslic3r_Thread.cpp) = 8aa488b933baa97132058f88a82eef8db73ab2f5
SHA1 (patch-src_occt__wrapper_CMakeLists.txt) = 2e11271757bcc76f3832c8fd27943f3ef97136f1
SHA1 (patch-src_slic3r_CMakeLists.txt) = 443efdac84f6b60f6016abaf034d40b80f5c1560
SHA1 (patch-src_slic3r_GUI_BitmapCache.cpp) = 9a464bcb09589e12de70ce57cda17f526df33b9b
-SHA1 (patch-src_slic3r_GUI_ConfigWizard.cpp) = 01e405fe0f743d3f8e2d76b987b51ff862ae6f97
+SHA1 (patch-src_slic3r_GUI_ConfigWizard.cpp) = 33b8539987e93d2392daca51729dc6f56d43b82f
SHA1 (patch-src_slic3r_GUI_ConfigWizard.hpp) = 6eed54e08497ec1dc6fea33263ab65d2d7e0dc0d
-SHA1 (patch-src_slic3r_GUI_DesktopIntegrationDialog.cpp) = ca51a9afbe5300dfdc6f7277c9c10081eb72e82f
-SHA1 (patch-src_slic3r_GUI_DesktopIntegrationDialog.hpp) = a124f3be0d0f0ca3ef58d92d96e6670580e9115c
+SHA1 (patch-src_slic3r_GUI_DesktopIntegrationDialog.cpp) = 35ccd8882313eb3270e88c47d496d62db96f4d36
+SHA1 (patch-src_slic3r_GUI_DesktopIntegrationDialog.hpp) = c8760f69fac22d1a4cf8c7843fb96b12fdb69def
SHA1 (patch-src_slic3r_GUI_ExtraRenderers.cpp) = ac803510123ff016b8fa6f22d491c898166e0929
SHA1 (patch-src_slic3r_GUI_Field.cpp) = a0901064c68aa5e6c2396ccec36018e45f92fbcb
SHA1 (patch-src_slic3r_GUI_GLCanvas3D.cpp) = c6ba7c5418cbe0cd09310ed0c0f724de027ee2b6
diff --git a/prusaslicer/patches/patch-src_CMakeLists_txt b/prusaslicer/patches/patch-src_CMakeLists_txt
index 949824ec96..db0075a27b 100644
--- a/prusaslicer/patches/patch-src_CMakeLists_txt
+++ b/prusaslicer/patches/patch-src_CMakeLists_txt
@@ -1,11 +1,9 @@
$NetBSD$
Use libhidapi from pkgsrc.
-Allow use of stable track wxWidgets on NetBSD.
-Use namespaces to link against libcereal >= 1.3.1 from:
-https://github.com/prusa3d/PrusaSlicer/commit/0ffcfd8393457fd035576436752267c9a1e6bbcc
+Treat the BSDs like Linux for wxWidgets.
---- src/CMakeLists.txt.orig 2023-06-02 13:41:15.000000000 +0000
+--- src/CMakeLists.txt.orig 2023-09-06 06:42:26.000000000 +0000
+++ src/CMakeLists.txt
@@ -33,8 +33,6 @@ endif ()
@@ -16,17 +14,12 @@ https://github.com/prusa3d/PrusaSlicer/commit/0ffcfd8393457fd035576436752267c9a1
if(WIN32)
message(STATUS "WXWIN environment set to: $ENV{WXWIN}")
-@@ -47,10 +45,10 @@ if (SLIC3R_GUI)
+@@ -47,7 +45,7 @@ if (SLIC3R_GUI)
endif()
endif()
- if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
-- set (wxWidgets_CONFIG_OPTIONS "--toolkit=gtk${SLIC3R_GTK}")
-+ if (CMAKE_SYSTEM_NAME STREQUAL "Linux" OR CMAKE_SYSTEM_NAME STREQUAL "NetBSD")
-+ # set (wxWidgets_CONFIG_OPTIONS "--toolkit=gtk${SLIC3R_GTK}")
- if (SLIC3R_WX_STABLE)
-- find_package(wxWidgets 3.0 REQUIRED COMPONENTS base core adv html gl)
-+ find_package(wxWidgets 3.0 QUIET COMPONENTS base core adv html gl)
- else ()
- find_package(wxWidgets 3.1 QUIET COMPONENTS base core adv html gl)
-
++ if (CMAKE_HOST_LINUX OR CMAKE_HOST_BSD)
+ set (wxWidgets_CONFIG_OPTIONS "--toolkit=gtk${SLIC3R_GTK}")
+ endif ()
+ find_package(wxWidgets 3.2 MODULE REQUIRED COMPONENTS base core adv html gl)
diff --git a/prusaslicer/patches/patch-src_slic3r_GUI_ConfigWizard.cpp b/prusaslicer/patches/patch-src_slic3r_GUI_ConfigWizard.cpp
index 93bee475a1..2768b604fd 100644
--- a/prusaslicer/patches/patch-src_slic3r_GUI_ConfigWizard.cpp
+++ b/prusaslicer/patches/patch-src_slic3r_GUI_ConfigWizard.cpp
@@ -2,9 +2,9 @@ $NetBSD$
Treat NetBSD like Linux.
---- src/slic3r/GUI/ConfigWizard.cpp.orig 2023-06-02 13:41:15.000000000 +0000
+--- src/slic3r/GUI/ConfigWizard.cpp.orig 2023-09-06 06:42:26.000000000 +0000
+++ src/slic3r/GUI/ConfigWizard.cpp
-@@ -60,7 +60,7 @@
+@@ -69,7 +69,7 @@
#include "slic3r/GUI/I18N.hpp"
#include "slic3r/Config/Version.hpp"
@@ -13,7 +13,7 @@ Treat NetBSD like Linux.
#define wxLinux_gtk3 true
#else
#define wxLinux_gtk3 false
-@@ -583,7 +583,7 @@ void PageWelcome::set_run_reason(ConfigW
+@@ -592,7 +592,7 @@ void PageWelcome::set_run_reason(ConfigW
const bool data_empty = run_reason == ConfigWizard::RR_DATA_EMPTY;
welcome_text->Show(data_empty);
cbox_reset->Show(!data_empty);
@@ -22,16 +22,16 @@ Treat NetBSD like Linux.
if (!DesktopIntegrationDialog::is_integrated())
cbox_integrate->Show(true);
else
-@@ -1474,7 +1474,7 @@ PageDownloader::PageDownloader(ConfigWiz
- " The model will be downloaded into folder you choose bellow."
- ), SLIC3R_APP_NAME));
+@@ -1509,7 +1509,7 @@ PageDownloader::PageDownloader(ConfigWiz
+ ));
+ }
-#ifdef __linux__
+#if defined(__linux__) || defined(__NetBSD__)
append_text(wxString::Format(_L(
"On Linux systems the process of registration also creates desktop integration files for this version of application."
)));
-@@ -3106,7 +3106,7 @@ bool ConfigWizard::priv::apply_config(Ap
+@@ -3141,7 +3141,7 @@ bool ConfigWizard::priv::apply_config(Ap
if ((check_unsaved_preset_changes = install_bundles.size() > 0))
header = _L_PLURAL("A new vendor was installed and one of its printers will be activated", "New vendors were installed and one of theirs printers will be activated", install_bundles.size());
diff --git a/prusaslicer/patches/patch-src_slic3r_GUI_DesktopIntegrationDialog.cpp b/prusaslicer/patches/patch-src_slic3r_GUI_DesktopIntegrationDialog.cpp
index a90533678f..63e9a67811 100644
--- a/prusaslicer/patches/patch-src_slic3r_GUI_DesktopIntegrationDialog.cpp
+++ b/prusaslicer/patches/patch-src_slic3r_GUI_DesktopIntegrationDialog.cpp
@@ -2,9 +2,12 @@ $NetBSD$
Treat NetBSD like Linux.
---- src/slic3r/GUI/DesktopIntegrationDialog.cpp.orig 2023-06-02 13:41:15.000000000 +0000
+--- src/slic3r/GUI/DesktopIntegrationDialog.cpp.orig 2023-09-06 06:42:26.000000000 +0000
+++ src/slic3r/GUI/DesktopIntegrationDialog.cpp
-@@ -1,4 +1,4 @@
+@@ -3,7 +3,7 @@
+ ///|/
+ ///|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
+ ///|/
-#ifdef __linux__
+#if defined(__linux__) || defined(__NetBSD__)
#include "DesktopIntegrationDialog.hpp"
diff --git a/prusaslicer/patches/patch-src_slic3r_GUI_DesktopIntegrationDialog.hpp b/prusaslicer/patches/patch-src_slic3r_GUI_DesktopIntegrationDialog.hpp
index b48b84110e..594138e4fd 100644
--- a/prusaslicer/patches/patch-src_slic3r_GUI_DesktopIntegrationDialog.hpp
+++ b/prusaslicer/patches/patch-src_slic3r_GUI_DesktopIntegrationDialog.hpp
@@ -2,15 +2,18 @@ $NetBSD$
Treat NetBSD like Linux.
---- src/slic3r/GUI/DesktopIntegrationDialog.hpp.orig 2023-06-02 13:41:15.000000000 +0000
+--- src/slic3r/GUI/DesktopIntegrationDialog.hpp.orig 2023-09-06 06:42:26.000000000 +0000
+++ src/slic3r/GUI/DesktopIntegrationDialog.hpp
-@@ -1,4 +1,4 @@
+@@ -2,7 +2,7 @@
+ ///|/
+ ///|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
+ ///|/
-#ifdef __linux__
+#if defined(__linux__) || defined(__NetBSD__)
#ifndef slic3r_DesktopIntegrationDialog_hpp_
#define slic3r_DesktopIntegrationDialog_hpp_
-@@ -42,4 +42,4 @@ private:
+@@ -46,4 +46,4 @@ private:
} // namespace Slic3r
#endif // slic3r_DesktopIntegrationDialog_hpp_
Home |
Main Index |
Thread Index |
Old Index