From nobody Thu Oct 03 10:27:20 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XK7CY0mP5z5Y6X4; Thu, 03 Oct 2024 10:27:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XK7CX50Lqz4CXK; Thu, 3 Oct 2024 10:27:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727951240; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uwiTEY6WtH4Sa4HsxrYz9ztu8IpDX8YDSGGsIH7AflU=; b=kdUwaO6zrOpx5nGqK40idVVD0Tqk9+QoTKGx8QQ7RG4q71F54Ok3HKoCuMPSCH+xK7frIc T5FgZwejZtaHyJfz3lAASlFVVw/E0vs3x1oZ2aohfpu19K4UQjnhmXbzxHvWto+gSWnB+h ofc2XgvcUfJacTXRZo+AShapi/g3whY195sXGbVbHBawAUeUbJlHk6DqYT4A/MKXOdj+9K hq/UZ/UyDpb8U6BsAy22K5TT5U9C+KC2TCngJPbk0WQYRuf1tGt+javyTXVWpVWqZbX/wW 6SRzGBiAit5GE7qm5N4sj51mZ9hrGL0dvOrz7t/vVvTw8fHZk8xW7/cXXVVQzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727951240; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uwiTEY6WtH4Sa4HsxrYz9ztu8IpDX8YDSGGsIH7AflU=; b=edIXroRTQD7H7upJsCS6xqdAP4ClR9dT5uw8EXbWY+YdIHw8PDY7JRYJ4zuOMZkjT1/B/q 9ge6oxwKU/ltq0W73W7cZwv8OgTFn8q5IPJZB3EULuLqKLeXUn1BOuOe7smMF5twc16Fxl D/lH620sA9t/YyuF3nykQ3TY3xBfMq2+uX3lSPNXeRSXDzh9l5gj4sx190jslqzVqL9JDG 1eF+A84Cd/fwz6VYG9YBu8o3W4AbhanSA5tIFrsCQ3KjfjOJIh6akviF7OOVFIQ5NgsRFy xai+MWJ/RAcYRA6D4ZQPdVrLPexxLDTvKG4K4IdJW55Tcfzza1I6CTwA2rF8IA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727951240; a=rsa-sha256; cv=none; b=YSj9vrW9IySP5juPY0UOBQihgkaHIyJv1gYyKA64ZV/ck/qVXS0PzKs8DSQPOCQhXVE6bc iXKkzyx/tX/E8tt4Rgn3mkJDRmCtSmvct3oXiVUK/wexpuKw7rfwwSpgeDMOf4S+LSMkpp /qR2/NV3mkGsTw2O9VgMQsBKkqYxrXAYbinZHT1VPxPQtyOUStZfstfXbwh5t7JV8DwYys ilu89i6NqKJjmqim/zTVABWcmKWv7znRL/jDtnHpA9sMktJfhbNXEV1uLttx9RD0ge2yi/ M4hAC62k564WOuHMLJKsNf5rsktI18paxKBUmgAih8JkTRzdk1OMm6knma9CCA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XK7CX4X2mzmlS; Thu, 3 Oct 2024 10:27:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 493ARKIt041740; Thu, 3 Oct 2024 10:27:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 493ARKBQ041737; Thu, 3 Oct 2024 10:27:20 GMT (envelope-from git) Date: Thu, 3 Oct 2024 10:27:20 GMT Message-Id: <202410031027.493ARKBQ041737@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dima Panov Subject: git: d62e2fd749c4 - main - cad/PrusaSlicer: unbreak build with boost-1.85 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d62e2fd749c41c26c5b88b822cab14545ee17639 Auto-Submitted: auto-generated The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=d62e2fd749c41c26c5b88b822cab14545ee17639 commit d62e2fd749c41c26c5b88b822cab14545ee17639 Author: Dima Panov AuthorDate: 2024-10-02 23:18:26 +0000 Commit: Dima Panov CommitDate: 2024-10-03 10:24:50 +0000 cad/PrusaSlicer: unbreak build with boost-1.85 With hat: office Sponsored by: Future Crew, LLC --- cad/PrusaSlicer/Makefile | 2 +- cad/PrusaSlicer/files/patch-src_slic3r_CMakeLists.txt | 7 ++++--- cad/PrusaSlicer/files/patch-src_slic3r_Config_Snapshot.cpp | 10 ++++++++++ cad/PrusaSlicer/files/patch-src_slic3r_Config_Version.cpp | 10 ++++++++++ 4 files changed, 25 insertions(+), 4 deletions(-) diff --git a/cad/PrusaSlicer/Makefile b/cad/PrusaSlicer/Makefile index 782f9e0ecb52..1a91b82b1bc4 100644 --- a/cad/PrusaSlicer/Makefile +++ b/cad/PrusaSlicer/Makefile @@ -1,7 +1,7 @@ PORTNAME= PrusaSlicer DISTVERSIONPREFIX=version_ DISTVERSION= 2.8.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= cad DIST_SUBDIR= PrusaSlicer diff --git a/cad/PrusaSlicer/files/patch-src_slic3r_CMakeLists.txt b/cad/PrusaSlicer/files/patch-src_slic3r_CMakeLists.txt index 5f0492369639..4d1d84d171cd 100644 --- a/cad/PrusaSlicer/files/patch-src_slic3r_CMakeLists.txt +++ b/cad/PrusaSlicer/files/patch-src_slic3r_CMakeLists.txt @@ -1,20 +1,21 @@ --- src/slic3r/CMakeLists.txt.orig 2024-06-27 09:25:47 UTC +++ src/slic3r/CMakeLists.txt -@@ -375,7 +375,7 @@ set(SLIC3R_GUI_SOURCES +@@ -375,7 +375,8 @@ set(SLIC3R_GUI_SOURCES Utils/PrusaConnect.cpp ) -find_package(NanoSVG REQUIRED) +# find_package(NanoSVG REQUIRED) ++find_package(OpenSSL REQUIRED) if (APPLE) list(APPEND SLIC3R_GUI_SOURCES -@@ -404,11 +404,11 @@ encoding_check(libslic3r_gui) +@@ -404,11 +405,11 @@ encoding_check(libslic3r_gui) encoding_check(libslic3r_gui) -target_link_libraries(libslic3r_gui libslic3r avrdude libcereal imgui libvgcode GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES} NanoSVG::nanosvg NanoSVG::nanosvgrast) -+target_link_libraries(libslic3r_gui libslic3r avrdude imgui libvgcode GLEW::GLEW OpenGL::GL hidapi libcurl crypto ${wxWidgets_LIBRARIES}) ++target_link_libraries(libslic3r_gui libslic3r avrdude imgui libvgcode GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES} OpenSSL::SSL OpenSSL::Crypto) if (MSVC) target_link_libraries(libslic3r_gui Setupapi.lib) diff --git a/cad/PrusaSlicer/files/patch-src_slic3r_Config_Snapshot.cpp b/cad/PrusaSlicer/files/patch-src_slic3r_Config_Snapshot.cpp new file mode 100644 index 000000000000..9f340e31fbf0 --- /dev/null +++ b/cad/PrusaSlicer/files/patch-src_slic3r_Config_Snapshot.cpp @@ -0,0 +1,10 @@ +--- src/slic3r/Config/Snapshot.cpp.orig 2024-04-05 09:25:31 UTC ++++ src/slic3r/Config/Snapshot.cpp +@@ -12,6 +12,7 @@ + #include + #include + #include ++#include + #include + + #include "libslic3r/PresetBundle.hpp" diff --git a/cad/PrusaSlicer/files/patch-src_slic3r_Config_Version.cpp b/cad/PrusaSlicer/files/patch-src_slic3r_Config_Version.cpp new file mode 100644 index 000000000000..2481d172a47e --- /dev/null +++ b/cad/PrusaSlicer/files/patch-src_slic3r_Config_Version.cpp @@ -0,0 +1,10 @@ +--- src/slic3r/Config/Version.cpp.orig 2024-04-05 09:25:31 UTC ++++ src/slic3r/Config/Version.cpp +@@ -7,6 +7,7 @@ + #include + + #include ++#include + #include + + #include "libslic3r/libslic3r.h"