Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 3 Nov 2024 19:47:25 GMT
From:      Michael Zhilin <mizhka@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 778f3f32a33d - main - cad/PrusaSlicer: make build happy with clang 19+
Message-ID:  <202411031947.4A3JlPs6027579@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by mizhka:

URL: https://cgit.FreeBSD.org/ports/commit/?id=778f3f32a33da38f6b526acdddfd6d805a9d0535

commit 778f3f32a33da38f6b526acdddfd6d805a9d0535
Author:     Michael Zhilin <mizhka@FreeBSD.org>
AuthorDate: 2024-11-03 17:53:02 +0000
Commit:     Michael Zhilin <mizhka@FreeBSD.org>
CommitDate: 2024-11-03 19:46:36 +0000

    cad/PrusaSlicer: make build happy with clang 19+
    
    Fix simple warning about template usage & few errors from poudriere QA
    checks
    
    Reported by:    pkg-fallout, Teodor Sigaev (maintainer)
    Sponsored by:   Postgres Professional
---
 cad/PrusaSlicer/Makefile                                      |  8 ++++++--
 .../patch-src_libslic3r_Arrange_Core_DataStoreTraits.hpp      | 11 +++++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/cad/PrusaSlicer/Makefile b/cad/PrusaSlicer/Makefile
index d770864caeb9..1b7995371f82 100644
--- a/cad/PrusaSlicer/Makefile
+++ b/cad/PrusaSlicer/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	PrusaSlicer
 DISTVERSIONPREFIX=version_
 DISTVERSION=	2.8.1
+PORTREVISION=	1
 CATEGORIES=	cad
 DIST_SUBDIR=	PrusaSlicer
 
@@ -39,10 +40,13 @@ LIB_DEPENDS+=	libbgcode_convert.so:cad/libbgcode \
 		libfreetype.so:print/freetype2 \
 		libavcodec.so:multimedia/ffmpeg4 \
 		libharfbuzz.so:print/harfbuzz \
-		libwayland-egl.so:graphics/wayland
+		libwayland-egl.so:graphics/wayland \
+		libwebkit2gtk-4.0.so:www/webkit2-gtk3 \
+		libsoup-2.4.so:devel/libsoup \
+		libjavascriptcoregtk-4.0.so:www/webkit2-gtk3
 
 USES=		cmake cpe desktop-file-utils eigen:3 gettext gl gnome iconv \
-		jpeg pkgconfig xorg
+		jpeg pkgconfig xorg ssl tcl tk
 CPE_VENDOR=	prusa3d
 USE_GITHUB=	yes
 GH_ACCOUNT=	prusa3d
diff --git a/cad/PrusaSlicer/files/patch-src_libslic3r_Arrange_Core_DataStoreTraits.hpp b/cad/PrusaSlicer/files/patch-src_libslic3r_Arrange_Core_DataStoreTraits.hpp
new file mode 100644
index 000000000000..0208ba7d3b33
--- /dev/null
+++ b/cad/PrusaSlicer/files/patch-src_libslic3r_Arrange_Core_DataStoreTraits.hpp
@@ -0,0 +1,11 @@
+--- src/libslic3r/Arrange/Core/DataStoreTraits.hpp.orig	2024-11-03 17:50:46 UTC
++++ src/libslic3r/Arrange/Core/DataStoreTraits.hpp
+@@ -71,7 +71,7 @@ void set_data(ArrItem &itm, const std::string &key, T 
+ template<class T, class ArrItem>
+ void set_data(ArrItem &itm, const std::string &key, T &&data)
+ {
+-    WritableDataStoreTraits<ArrItem>::template set(itm, key, std::forward<T>(data));
++    WritableDataStoreTraits<ArrItem>::template set<T>(itm, key, std::forward<T>(data));
+ }
+ 
+ template<class T> constexpr bool IsReadWritableDataStore = IsDataStore<T> && IsWritableDataStore<T>;



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202411031947.4A3JlPs6027579>