From nobody Fri Jun 24 19:12:51 2022 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 3B70086076B; Fri, 24 Jun 2022 19:12:52 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LV6Fw1CZwz4VM1; Fri, 24 Jun 2022 19:12:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656097972; 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=sPPqX67CTG0U8o90+Qb/2EjcHX52zRGw50/C2OeK1bg=; b=ApLfpYs+AVIXaT98fdkCTofxzMSmn9fT/f6gVwthKOx1PQo0Vmrx75/FXbczeoYdW39KAF 4d/yVTopLEH/mZHIPGFhcM5CFIvxWAwFfGRwzG1qP0oCytNkersH/zvREYAmMfJ/MxlGkR b/OIiuQ46as5nfF13xWVxOZax95p2zJP18Sk7T8u85cC2erma7UAuIpyakK7YLaSkr/6r9 cMVsRW7fNNPWKtk9f75SwLicO5LZvKRLHdSVFJI8xXTLb7EHsh59MDQ1upyMMoIhz32spg bx5ETx18OFrvqBbRf2EchViXiVffwdXrYknU2s9eoUZBvpBqJm2Bcp4b2t6oWg== 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 0976615CFC; Fri, 24 Jun 2022 19:12:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 25OJCpO6056200; Fri, 24 Jun 2022 19:12:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25OJCpkp056199; Fri, 24 Jun 2022 19:12:51 GMT (envelope-from git) Date: Fri, 24 Jun 2022 19:12:51 GMT Message-Id: <202206241912.25OJCpkp056199@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Ulrich=20Sp=C3=B6rlein?= Subject: git: 1da03e08b522 - main - cad/PrusaSlicer: Fix build and remove BROKEN 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: uqs X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1da03e08b5224d845b8e8f75aac8ae0e0a6946ec Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656097972; 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=sPPqX67CTG0U8o90+Qb/2EjcHX52zRGw50/C2OeK1bg=; b=CG2QGLX8foBhR31s2CyfPsTZ+xUx1FgG6r6axOeUWfB8OO9ZUtQY7WFNC9zZM59eswN4d/ sDpJ0lavmWgKGI+inYSZnrrmVmTjihh9xOYYRTvzLFnYh49aPY2/9uHxei5JKynAamUl23 0CBe+6h+spyb7vp5Kn6vH0Mct3swArSGUEjzm7BO2zg2Yyg92Waw/Nz1BuQwBLbwYXfB3K 9h4q33hoARWTAwcGCl5yF4a0ZfqPHFPWgZ016MNnjTophCttwC7fzpmUtHwe0EO+t2vh+r Xs9gqJgt9cZ+dxXKLxTNhFvhKgdy/lFm3sB3yB6sS3bOkoNtvEjHUMUH/Gj7Rg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656097972; a=rsa-sha256; cv=none; b=jpYxl1B03J9+sGTYS/pyp84rDN1+1Boz3YMB4e3S4sGh4ouJdyGYvWy/2SqACMPPlpEg28 iTsStCVBqTPowVqeJWNF0YiqxL+4N7B1k6PTaWz4Sz5ynn/obvU4uK6hcLMudIUu5m7DOa cRtSBoCAvWbWx3DdfH3osiQ1o3DiURSRl9lO6t9KjziG9qLoHNOtBYw0wq6BmrS6wZyPVU avMLsUQ2KsvIIK9MYEatJGnnHNjRe7JNEWSlVEBWO7N4Nqcfv1aUK8yUDkcLzdD4b0Wlx4 ThvG4qo2DTDIkrByeVJQtAeWFbssTxofXVRac5ygnkp5UQ+hC1BYrLQ6Sm4J0g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by uqs: URL: https://cgit.FreeBSD.org/ports/commit/?id=1da03e08b5224d845b8e8f75aac8ae0e0a6946ec commit 1da03e08b5224d845b8e8f75aac8ae0e0a6946ec Author: Ulrich Spörlein AuthorDate: 2022-06-24 18:47:47 +0000 Commit: Ulrich Spörlein CommitDate: 2022-06-24 19:12:27 +0000 cad/PrusaSlicer: Fix build and remove BROKEN This applies a patch from upstream to fix compilation with recent boost versions. --- cad/PrusaSlicer/Makefile | 2 -- .../files/patch-tests_fff_print_test_data.cpp | 28 ++++++++++++++++++++++ 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/cad/PrusaSlicer/Makefile b/cad/PrusaSlicer/Makefile index d3e015812ddf..14c5daef8b89 100644 --- a/cad/PrusaSlicer/Makefile +++ b/cad/PrusaSlicer/Makefile @@ -24,8 +24,6 @@ LIB_DEPENDS= libtbb.so:devel/onetbb \ BUILD_DEPENDS= cereal>=1.3.0.10:devel/cereal \ cgal>=5.0.2:math/cgal -BROKEN= Fails to compile: implicit instantiation of undefined template 'std::basic_ifstream' - USES= cmake cpe desktop-file-utils eigen:3 gettext gl iconv pkgconfig CPE_VENDOR= prusa3d CMAKE_ARGS+= -DwxWidgets_CONFIG_EXECUTABLE="${WX_CONFIG}" \ diff --git a/cad/PrusaSlicer/files/patch-tests_fff_print_test_data.cpp b/cad/PrusaSlicer/files/patch-tests_fff_print_test_data.cpp new file mode 100644 index 000000000000..ee3f0c0fccd4 --- /dev/null +++ b/cad/PrusaSlicer/files/patch-tests_fff_print_test_data.cpp @@ -0,0 +1,28 @@ +commit 926ae0471800abd1e5335e251a5934570eb8f6ff +Author: Vojtech Bubnik +Date: 2022-04-25 11:32:03 +0200 + + Follow-up to 408e56f0390f20aaf793e0aa0c70c4d9544401d4 + Fixing compilation of tests on latest GCC/boost + +diff --git tests/fff_print/test_data.cpp tests/fff_print/test_data.cpp +index 32e31c264..f7077007d 100644 +--- tests/fff_print/test_data.cpp ++++ tests/fff_print/test_data.cpp +@@ -11,6 +11,7 @@ + #include + + #include ++#include + #include + #include + +@@ -286,7 +287,7 @@ std::string gcode(Print & print) + print.set_status_silent(); + print.process(); + print.export_gcode(temp.string(), nullptr, nullptr); +- std::ifstream t(temp.string()); ++ boost::nowide::ifstream t(temp.string()); + std::string str((std::istreambuf_iterator(t)), std::istreambuf_iterator()); + boost::nowide::remove(temp.string().c_str()); + return str;