From nobody Wed Nov 22 12:00:16 2023 X-Original-To: dev-commits-ports-all@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 4Sb0Dd1Gqyz51Sjq; Wed, 22 Nov 2023 12:00:17 +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 4Sb0Dd0c40z4D3Q; Wed, 22 Nov 2023 12:00:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700654417; 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=+p0cCCZmBF173z8J4sMqS1jikXXuDafRcnCk1TgHaQ8=; b=mbq8Edzc1DD6PPw6+ePrQmhnTjNO4eSGio0CLGcsUF6eh56dxFp4Ala0Iomf+6gbgT//OZ bPG5IBMpgucNVqQfNhWdtsQyRgcjkiWkAL0V7lzIqucXr1wY49mBOXUEdq6yW0sd2YysPa Dp7tpBLgxgmasii560yMftFuea8DhawzkDT/tmVSxEZEl/R2Gd2Ful4zUD0J981COjilFc 7LTbtBdo2qlJbb9VvqfAEir8WviucJocWQsLynwqU4Rnj1Q3GKrL08ygwoBuTsXDHmGTLo nwPEWVbDKZg+Is5lOqNd/gbJ6GLL60tFQR1llXzhZObULx+6fHwAgDwrr/EFIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700654417; 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=+p0cCCZmBF173z8J4sMqS1jikXXuDafRcnCk1TgHaQ8=; b=xhLaFUZwcoUeqx6E46ClFvgfy6LY0QwAHCMKxQuEaW8Jpqms8e6HVHt/zag7yD2nlThrYy twKhfNGZB+zf8IYbBOuBPc8dzUjyZYtK+rHl3d5q4T7TVGMlu9bn6YXpJupcD2KNBW47zA CS0SOzyh0lkIjH6ajJjVlbm/1TNynEWzr3f/VZm5NGp7Sj7dqAdCzSYF21eEvTJwpP1iPW LzLc9FKW6+ojIjgB8LY7V57g5foTkQUbQWOa3jvrs4aaPMif78VtVcLhJdrJNabltqAYJt FqFtRd1I7xws0qHTCdtexVSDavuSxina/OYm1xH3UQA8zXqprDqHtqOMEyRX+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700654417; a=rsa-sha256; cv=none; b=QU1uPwETgqoKtrkOTir4qS7tk3iaNSJGX70EIG+6ROY0Clte61ZKk0lyH8gvJo6fIUUKol 075FGpDprhhJnLsaJBQi/Bccwd3jT3ZFQOJKO91Dvium/d3dLdepbdDZXQJ6y9bSAAECta KIosj73YFhi1dC27KqrR/W6fqWHS4cDkFZX94M16RMfy44Nvt4cOFmiiiN4lfyR3RBJl6a TP7dljoTjf7GtwiSPX1XcUebH7dVm3/Q6vJgnpLWFmeiXGPWy6ngcbNQGG7zp99IZu47SV Ix7lc7IYYzT1mBN4AQqLHRFV0FN0733x5SP7ozsjtLlPPNAZN3nHQayFbzEwKQ== 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 4Sb0Dc6VYYz2vQ; Wed, 22 Nov 2023 12:00:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AMC0GWq093498; Wed, 22 Nov 2023 12:00:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AMC0GsV093490; Wed, 22 Nov 2023 12:00:16 GMT (envelope-from git) Date: Wed, 22 Nov 2023 12:00:16 GMT Message-Id: <202311221200.3AMC0GsV093490@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Nuno Teixeira Subject: git: 8d2fe51b145a - 2023Q4 - cad/PrusaSlicer: Fix build with wxWidgets 3.2.4 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eduardo X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q4 X-Git-Reftype: branch X-Git-Commit: 8d2fe51b145a2d8117b7a3b8baf0b2b76d01d27d Auto-Submitted: auto-generated The branch 2023Q4 has been updated by eduardo: URL: https://cgit.FreeBSD.org/ports/commit/?id=8d2fe51b145a2d8117b7a3b8baf0b2b76d01d27d commit 8d2fe51b145a2d8117b7a3b8baf0b2b76d01d27d Author: Nuno Teixeira AuthorDate: 2023-11-22 10:38:56 +0000 Commit: Nuno Teixeira CommitDate: 2023-11-22 11:15:15 +0000 cad/PrusaSlicer: Fix build with wxWidgets 3.2.4 - Patches taken from OpenBSD port PR: 274367, 275082 Approved by: portmgr (build fix blanket) MFH: 2023Q4 (cherry picked from commit 818c20c1aa833f8f648f80c77f4eb3aafdb00299) --- .../files/patch-src_slic3r_GUI_PhysicalPrinterDialog.cpp | 11 +++++++++++ cad/PrusaSlicer/files/patch-src_slic3r_GUI_Plater.cpp | 11 ++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/cad/PrusaSlicer/files/patch-src_slic3r_GUI_PhysicalPrinterDialog.cpp b/cad/PrusaSlicer/files/patch-src_slic3r_GUI_PhysicalPrinterDialog.cpp new file mode 100644 index 000000000000..c8ba4b736e20 --- /dev/null +++ b/cad/PrusaSlicer/files/patch-src_slic3r_GUI_PhysicalPrinterDialog.cpp @@ -0,0 +1,11 @@ +--- src/slic3r/GUI/PhysicalPrinterDialog.cpp.orig 2023-06-19 12:07:14 UTC ++++ src/slic3r/GUI/PhysicalPrinterDialog.cpp +@@ -458,7 +458,7 @@ void PhysicalPrinterDialog::build_printhost_settings(C + // Always fill in the "printhost_port" combo box from the config and select it. + { + Choice* choice = dynamic_cast(m_optgroup->get_field("printhost_port")); +- choice->set_values({ m_config->opt_string("printhost_port") }); ++ choice->set_values((const std::vector){ m_config->opt_string("printhost_port") }); + choice->set_selection(); + } + diff --git a/cad/PrusaSlicer/files/patch-src_slic3r_GUI_Plater.cpp b/cad/PrusaSlicer/files/patch-src_slic3r_GUI_Plater.cpp index e302f0946508..8144dab1bbfb 100644 --- a/cad/PrusaSlicer/files/patch-src_slic3r_GUI_Plater.cpp +++ b/cad/PrusaSlicer/files/patch-src_slic3r_GUI_Plater.cpp @@ -1,4 +1,4 @@ ---- src/slic3r/GUI/Plater.cpp.orig 2023-07-25 12:32:07 UTC +--- src/slic3r/GUI/Plater.cpp.orig 2023-06-19 12:07:14 UTC +++ src/slic3r/GUI/Plater.cpp @@ -2452,7 +2452,7 @@ std::vector Plater::priv::load_files(const std // when loading a project file. However, creating the dialog on heap causes issues on macOS, where it does not @@ -27,3 +27,12 @@ // For some reason on Linux the menu isn't displayed if position is // specified (even though the position is sane). position = wxDefaultPosition; +@@ -5281,7 +5281,7 @@ void Plater::load_project(const wxString& filename) + + p->reset(); + +- if (! load_files({ into_path(filename) }).empty()) { ++ if (! load_files((const std::vector){ into_path(filename) }).empty()) { + // At least one file was loaded. + p->set_project_filename(filename); + // Save the names of active presets and project specific config into ProjectDirtyStateManager.