commit: 26b20953e829212da8bc21eb5b6f827b830d3725 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> AuthorDate: Sat May 3 16:00:21 2025 +0000 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> CommitDate: Sat May 3 16:37:43 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26b20953
games-util/slade: Drop old 3.2.4-r1 Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> games-util/slade/Manifest | 1 - games-util/slade/files/slade-3.2.4-compile.patch | 64 ------------------- games-util/slade/slade-3.2.4-r1.ebuild | 81 ------------------------ 3 files changed, 146 deletions(-) diff --git a/games-util/slade/Manifest b/games-util/slade/Manifest index 6e3536d91ed6..fb783a0b36fa 100644 --- a/games-util/slade/Manifest +++ b/games-util/slade/Manifest @@ -1,3 +1,2 @@ -DIST slade-3.2.4.tar.gz 7000370 BLAKE2B 251c79b1f90dea7971120a7b55d89d5112857f04a5609a26ce3970116d616c7361b1bea98da05a5e3fde0d433e62a34e9610a1d32ca9e72ee4f140ae7ac22ec6 SHA512 e3dda37aebc9c4bab3fb0d1179cbe726be2cdf55d9d7d95cfa47c8f817a1cf2b01863cce09da17da85af1e4077f1f9b7841abdaa8f114e3a6db1fe2b48292ffd DIST slade-3.2.6.tar.gz 7027328 BLAKE2B ba0db4926f5706166ec2439cbb539a9d5330e2d3ea3dbd8e29b586cf57a23b7b254823d84b7ba79b604a86ed0e5753b4e7c4fcf825ba7d3217c52824f36c5be4 SHA512 d09631b24c83769482480c24dfc1f6992ae293bdfe4c8661d967d6ac0fcbba6f0e1bf58c58afc84a82fb5f900d9e0e99413800a42edc353a4f7f1f52781db54f DIST slade-3.2.7.tar.gz 6419781 BLAKE2B 484e70406a5185166ea6b73d68565d9bb43e7558e6269abe4710e3f1437b8421383a5f40e136dd86ca84f0bb2fa38d61fd6e3e8925db293b436ba044ad88418c SHA512 026bba57a85a64e695d1c96344726f5f82cd89e5e403c686e72a569d9272383347190b6804fa4623b5836967db0541b80e418457df1614c76da466bbc8c61b5e diff --git a/games-util/slade/files/slade-3.2.4-compile.patch b/games-util/slade/files/slade-3.2.4-compile.patch deleted file mode 100644 index 3890518b3831..000000000000 --- a/games-util/slade/files/slade-3.2.4-compile.patch +++ /dev/null @@ -1,64 +0,0 @@ -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<string>{ "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<string>{ "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<string> - { "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<string>{ "txed_savelist" }); -+ toolbar_->addActionGroup("_New", vector<string>{ "txed_new", "txed_new_file" }); -+ toolbar_->addActionGroup("_Texture", vector<string>{ "txed_rename", "txed_rename_each", "txed_delete" }); -+ toolbar_->addActionGroup("_Sorting", vector<string>{ "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<string> - { "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 deleted file mode 100644 index 7ba249ac765a..000000000000 --- a/games-util/slade/slade-3.2.4-r1.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LUA_COMPAT=( lua5-{1..3} ) -WX_GTK_VER="3.2-gtk3" - -inherit cmake lua-single wxwidgets - -MY_PV="${PV/beta/b}" -DESCRIPTION="Modern editor for Doom-engine based games and source ports" -HOMEPAGE="https://slade.mancubus.net/"; -SRC_URI="https://github.com/sirjuddington/${PN^^}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${PN^^}-${MY_PV}" -LICENSE="GPL-2 MIT" -SLOT="0" -KEYWORDS="~amd64" -IUSE="fluidsynth timidity webkit" -REQUIRED_USE="${LUA_REQUIRED_USE}" - -# <libfmt-11 https://github.com/sirjuddington/SLADE/issues/1746 -DEPEND=" - ${LUA_DEPS} - app-arch/bzip2:= - <dev-libs/libfmt-11:= - >=media-libs/dumb-2:= - media-libs/freeimage[jpeg,png,tiff] - media-libs/glew:0= - media-libs/libsfml:= - media-sound/mpg123 - net-misc/curl - sys-libs/zlib - x11-libs/wxGTK:${WX_GTK_VER}[opengl,webkit?,X] - fluidsynth? ( media-sound/fluidsynth:= ) -" - -RDEPEND=" - ${DEPEND} - timidity? ( media-sound/timidity++ ) -" - -BDEPEND=" - app-arch/p7zip - virtual/pkgconfig -" - -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() { - cmake_src_prepare - - # Delete bundled libraries just in case. - rm -r thirdparty/dumb/ thirdparty/fmt/ || die - -} - -src_configure() { - local luav=$(lua_get_version) - - local mycmakeargs=( - -DLua_FIND_VERSION_MAJOR=$(ver_cut 1 "${luav}") - -DLua_FIND_VERSION_MINOR=$(ver_cut 2 "${luav}") - -DLua_FIND_VERSION_COUNT=2 - -DLua_FIND_VERSION_EXACT=ON - -DNO_COTIRE=ON - -DNO_FLUIDSYNTH=$(usex fluidsynth OFF ON) - -DNO_WEBVIEW=$(usex webkit OFF ON) - -DUSE_SFML_RENDERWINDOW=ON - -DUSE_SYSTEM_DUMB=ON - -DUSE_SYSTEM_FMT=ON - -DWX_GTK3=ON - ) - - setup-wxwidgets - cmake_src_configure -}
