From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1C0C41581FB for ; Sat, 23 Nov 2024 21:25:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 44DD3E089C; Sat, 23 Nov 2024 21:25:45 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2BE80E089C for ; Sat, 23 Nov 2024 21:25:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4B9E1335DCD for ; Sat, 23 Nov 2024 21:25:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B3822130F for ; Sat, 23 Nov 2024 21:25:42 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1732397096.7e5dd0f48556372ba10313ffc50ca05f4c072eea.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-util/slade/files/, games-util/slade/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-util/slade/files/slade-3.2.4-compile.patch games-util/slade/slade-3.2.4-r1.ebuild X-VCS-Directories: games-util/slade/files/ games-util/slade/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 7e5dd0f48556372ba10313ffc50ca05f4c072eea X-VCS-Branch: master Date: Sat, 23 Nov 2024 21:25:42 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 9df01a54-cedc-4711-a970-c1a283fea4b3 X-Archives-Hash: 59a933b271d604cabb048dacac899a50 commit: 7e5dd0f48556372ba10313ffc50ca05f4c072eea Author: Sam James gentoo org> AuthorDate: Sat Nov 23 21:20:14 2024 +0000 Commit: Sam James gentoo org> CommitDate: Sat Nov 23 21:24:56 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e5dd0f4 games-util/slade: fix build "Fixes ambiguity of addActionGroup calls. In all addActionGroup calls with ambiguous usage, use a vector of strings to disambiguate." Closes: https://bugs.gentoo.org/938887 Thanks-to: Chase Signed-off-by: Sam James gentoo.org> games-util/slade/files/slade-3.2.4-compile.patch | 64 ++++++++++++++++++++++++ games-util/slade/slade-3.2.4-r1.ebuild | 1 + 2 files changed, 65 insertions(+) diff --git a/games-util/slade/files/slade-3.2.4-compile.patch b/games-util/slade/files/slade-3.2.4-compile.patch new file mode 100644 index 000000000000..3890518b3831 --- /dev/null +++ b/games-util/slade/files/slade-3.2.4-compile.patch @@ -0,0 +1,64 @@ +https://bugs.gentoo.org/938887#c11 + +Fixes ambiguity of addActionGroup calls + +In all addActionGroup calls with ambiguous usage, use a vector of strings to disambiguate. +--- a/src/MainEditor/UI/EntryPanel/TextEntryPanel.cpp ++++ b/src/MainEditor/UI/EntryPanel/TextEntryPanel.cpp +@@ -93,7 +93,7 @@ TextEntryPanel::TextEntryPanel(wxWindow* parent) : EntryPanel(parent, "text") + text_area_->setJumpToControl(choice_jump_to_); + + // Add 'Compile ACS' to end of toolbar +- toolbar_->addActionGroup("Compile", { "arch_scripts_compileacs" }, true); ++ toolbar_->addActionGroup("Compile", vector{ "arch_scripts_compileacs" }, true); + + // Bind events + choice_text_language_->Bind(wxEVT_CHOICE, &TextEntryPanel::onChoiceLanguageChanged, this); +--- a/src/MainEditor/UI/TextureXEditor/PatchTablePanel.cpp ++++ b/src/MainEditor/UI/TextureXEditor/PatchTablePanel.cpp +@@ -205,7 +205,7 @@ PatchTablePanel::PatchTablePanel(wxWindow* parent, PatchTable* patch_table, Text + list_patches_->setSearchColumn(1); // Want to search by patch name not index + toolbar_ = new SToolBar(this, false, wxVERTICAL); + toolbar_->addActionGroup( +- "_New", { "txed_pnames_add", "txed_pnames_addfile", "txed_pnames_delete", "txed_pnames_change" }); ++ "_New", vector{ "txed_pnames_add", "txed_pnames_addfile", "txed_pnames_delete", "txed_pnames_change" }); + label_dimensions_ = new wxStaticText(this, -1, "Size: N/A"); + label_textures_ = new wxStaticText( + this, -1, "In Textures: -", wxDefaultPosition, wxDefaultSize, wxST_ELLIPSIZE_END); +--- a/src/MainEditor/UI/TextureXEditor/TextureEditorPanel.cpp ++++ b/src/MainEditor/UI/TextureXEditor/TextureEditorPanel.cpp +@@ -295,6 +295,7 @@ wxPanel* TextureEditorPanel::createPatchControls(wxWindow* parent) + tb_patches_ = new SToolBar(panel, false, wxVERTICAL); + tb_patches_->addActionGroup( + "_Patch", ++ vector + { "txed_patch_add", + "txed_patch_remove", + "txed_patch_back", +--- a/src/MainEditor/UI/TextureXEditor/TextureXPanel.cpp ++++ b/src/MainEditor/UI/TextureXEditor/TextureXPanel.cpp +@@ -625,10 +625,10 @@ TextureXPanel::TextureXPanel(wxWindow* parent, TextureXEditor& tx_editor) : + + // Toolbar + toolbar_ = new SToolBar(this, false, wxVERTICAL); +- toolbar_->addActionGroup("_Save", { "txed_savelist" }); +- toolbar_->addActionGroup("_New", { "txed_new", "txed_new_file" }); +- toolbar_->addActionGroup("_Texture", { "txed_rename", "txed_rename_each", "txed_delete" }); +- toolbar_->addActionGroup("_Sorting", { "txed_up", "txed_down", "txed_sort" }); ++ toolbar_->addActionGroup("_Save", vector{ "txed_savelist" }); ++ toolbar_->addActionGroup("_New", vector{ "txed_new", "txed_new_file" }); ++ toolbar_->addActionGroup("_Texture", vector{ "txed_rename", "txed_rename_each", "txed_delete" }); ++ toolbar_->addActionGroup("_Sorting", vector{ "txed_up", "txed_down", "txed_sort" }); + toolbar_->group("_Texture")->setAllButtonsEnabled(false); + toolbar_->group("_Sorting")->setAllButtonsEnabled(false); + toolbar_->findActionButton("txed_sort")->Enable(); +--- a/src/MainEditor/UI/TextureXEditor/ZTextureEditorPanel.cpp ++++ b/src/MainEditor/UI/TextureXEditor/ZTextureEditorPanel.cpp +@@ -232,6 +232,7 @@ wxPanel* ZTextureEditorPanel::createPatchControls(wxWindow* parent) + tb_patches_ = new SToolBar(panel, false, wxVERTICAL); + tb_patches_->addActionGroup( + "_Patch", ++ vector + { "txed_patch_add", + "txed_patch_remove", + "txed_patch_back", diff --git a/games-util/slade/slade-3.2.4-r1.ebuild b/games-util/slade/slade-3.2.4-r1.ebuild index 06d0d3eeef76..5e70fd0ab9a4 100644 --- a/games-util/slade/slade-3.2.4-r1.ebuild +++ b/games-util/slade/slade-3.2.4-r1.ebuild @@ -49,6 +49,7 @@ S="${WORKDIR}/${PN^^}-${MY_PV}" PATCHES=( "${FILESDIR}"/${PN}-3.2.0_beta2-fluidsynth-driver.patch "${FILESDIR}"/${PN}-3.2.2-wayland.patch + "${FILESDIR}"/${PN}-3.2.4-compile.patch ) src_prepare() {