From nobody Wed Nov 22 11:13:54 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 4SZzC65vRGz51P3k; Wed, 22 Nov 2023 11:13:54 +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 4SZzC65Gzbz3b04; Wed, 22 Nov 2023 11:13:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700651634; 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=kkQbMKEOovGLghhUgoYg6CL7g4Ew1EMQ1mcxmZyWqvg=; b=p/cx2vLnh4RPGlRkz1F1AlIZntf+4EaKADc90Odzpb49po5goWG6VLLbOW57TlOewSd3y6 2EYPW3ge6BGJyDPKhMGaTlHg33RMpAQ/Ua9WEt2NqLw6WCAGU7DMtU5SbgeSZoTduPp782 1VKLDMQpLBmR5f4DT+NQPJbVIrElaJK+Dyq7TPb+/RVqnBo1o1M+yl05BUvPd5lh8G+s/p rq8rvo2xS4xPwsCHvIr2qPYBMzP5LccPDeO3Y36fzKMXS5wU7JaCGbB1eeuwThWZ3Omv48 B41p0GE8dVyllJ9yV2A0d9u+ViWuspzNnws1X4I7mllm7DCJsTQtwNe85bTmuw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700651634; 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=kkQbMKEOovGLghhUgoYg6CL7g4Ew1EMQ1mcxmZyWqvg=; b=cX8oo+kddI5+7DUXIvfdFF6egKddTIl+7mmrEwcTJE4fFWyrbKtC7ASAulXDyDzPbkwi8B oXytX2iROMEbbaas9WmuDc6h1E9vPoVQhE5w5yCOS9k6oz/AWl9B9A97MzzS2KC6SCaT8Y YEgPNiOZ2Ya3Xwwk6zYP28qvuQFu91rWH+iTbOsI3lCVgKojxVP3xETZrHQ7MAiomqqArA Ap0p8v+WLi3svUINKwoFie03efaJOpyFXYCbY6q+93Ab9ZpWCwVms5LaobAzp3RF8WZQZo 6noyoXKDsyiwvpez5Uy8HfWKQ3GpjdmBJwhXnK/xS5BAfHnDBMGocW/hdF2FKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700651634; a=rsa-sha256; cv=none; b=aFd5z93oNYra4CSRReRhemUiuLnzVaca43GAdwV853nKgAU/AX3pNAj1MIYpYF17fbfJdb xu454KSyTSuGb6vRGNaRXnwIFPfX3Wa7yiOSOtREbFpKufFA9qCEYxrf+KZyX3INVwurUZ yniNUHZ1aKIjbYeRK7MyHypkG+nfMGmlkmJumxRu1tt0tDMFptFFvGRiwAl2lJ1aa7BBgB 5S/bmmP+eW6QXeAFfgqHhWyTo1Z3WMXoshl0OVo3/rW6IT9Iy6zdnRUettca6mmjNxxNvO igUhVo8PM99sP0IwpynvHU2tXpRI/x5wG5krMm6uzELRqxOKyOt65qEOUSyBUg== 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 4SZzC64LV0z1qK; Wed, 22 Nov 2023 11:13:54 +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 3AMBDsvS017509; Wed, 22 Nov 2023 11:13:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AMBDssu017506; Wed, 22 Nov 2023 11:13:54 GMT (envelope-from git) Date: Wed, 22 Nov 2023 11:13:54 GMT Message-Id: <202311221113.3AMBDssu017506@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Nuno Teixeira Subject: git: 818c20c1aa83 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 818c20c1aa833f8f648f80c77f4eb3aafdb00299 Auto-Submitted: auto-generated The branch main has been updated by eduardo: URL: https://cgit.FreeBSD.org/ports/commit/?id=818c20c1aa833f8f648f80c77f4eb3aafdb00299 commit 818c20c1aa833f8f648f80c77f4eb3aafdb00299 Author: Nuno Teixeira AuthorDate: 2023-11-22 10:38:56 +0000 Commit: Nuno Teixeira CommitDate: 2023-11-22 11:13:41 +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 --- .../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.