gentoo auto-resync : 24:11:2024 - 03:02:54

5 files changed, 166 insertions, 3 deletions

diff --git a/games-util/slade/Manifest b/games-util/slade/Manifest
index 5a0dcf4379d2..a5d007fde088 100644
--- a/games-util/slade/Manifest
+++ b/games-util/slade/Manifest
@@ -1,5 +1,9 @@
 AUX slade-3.2.0_beta2-fluidsynth-driver.patch 790 BLAKE2B ea84ff6515b4b80cbce021624c27dbd4c067758b7e5861402d42628ddee85385a260396163838b1504e2196c3b275977ad5ddde3d684e49de600270d7990a1c0 SHA512 3de05beafc060891d674d388cbb07107ead138ef2a89812dfffabfc8c9de2beb939290b1064b75e14d3cc42621c8ee66ced06eacdcb2afd376a9539fa74c54c8
 AUX slade-3.2.2-wayland.patch 697 BLAKE2B 71c0a42cc831763a6d5aca15601e4503bcc965f2241227742ccc09b7d97fef54242ba65081743d2cc58f43091cb4397915942218c00b8c7cd677f0740643ce0a SHA512 f1c4a73e6edeb3d23e02d4dc81d585fee2be446ded3a05e42e653edd8e83a5c5d6b05e2902fa65caa5c7076fd338f6785ab301c8cc8208a9cab27e70bc04ff59
+AUX slade-3.2.4-compile.patch 3456 BLAKE2B 912dd4f8c5f349f4aad0e976481fe56c7fed1d3a8a3d641432c504650d314c594ee41bd3e668bc65ba2987832de89392ba50a55adaa4ca975d0c1af9a8c05c37 SHA512 6757a39a7183e9d23260e5c8d022cbe93026ac84c3ab9db712208d08c4149971f1da192497124f5e623ba5c2859911f263a51c59d80383f7d7a96dfc9e35d195
+AUX slade-3.2.6-fix-sol.patch 520 BLAKE2B 27ecfb950908c80ed14cef71943c35c6030a87a46f76f27c1315ff3162015a31f4591ac71b7157dba4014b0a3739d14048d5d1ceb6bfc1d3d4ff8f6439e90698 SHA512 f5a756aa7ded5c0c5779eae6fc30669b44c533490b1994886b94ab4f74d4b9e35173af7c6f43bfcd7f0425c6eba18638c49f8a0fbc799227b94ed59d3b9de903
 DIST slade-3.2.4.tar.gz 7000370 BLAKE2B 251c79b1f90dea7971120a7b55d89d5112857f04a5609a26ce3970116d616c7361b1bea98da05a5e3fde0d433e62a34e9610a1d32ca9e72ee4f140ae7ac22ec6 SHA512 e3dda37aebc9c4bab3fb0d1179cbe726be2cdf55d9d7d95cfa47c8f817a1cf2b01863cce09da17da85af1e4077f1f9b7841abdaa8f114e3a6db1fe2b48292ffd
-EBUILD slade-3.2.4-r1.ebuild 1755 BLAKE2B 2791a770714f93e744f7459290bebfa809d5169340779c268d599ea97d595b1a1cb842f8a2fcca93152148a9a4f98e92b8b2f6e882f6de56cc4fda1390801eb2 SHA512 dd5d915e88e0b534fb75461a98a03839dfe6feb498bbf2e8178c6d7718c96d5a97cba4915a9fb48ad9545d3de16a2e91d0b4e01fd69150922e2313e272f5d678
+DIST slade-3.2.6.tar.gz 7027328 BLAKE2B ba0db4926f5706166ec2439cbb539a9d5330e2d3ea3dbd8e29b586cf57a23b7b254823d84b7ba79b604a86ed0e5753b4e7c4fcf825ba7d3217c52824f36c5be4 SHA512 d09631b24c83769482480c24dfc1f6992ae293bdfe4c8661d967d6ac0fcbba6f0e1bf58c58afc84a82fb5f900d9e0e99413800a42edc353a4f7f1f52781db54f
+EBUILD slade-3.2.4-r1.ebuild 1795 BLAKE2B e2391cae62ebce00972ec65491d4f295ee1f6a3a39763962e74141d5f81ae281b1f979387c3747ed3d30b62d731af1d22f4baa0b2bdd28aa683fcae2d671ce37 SHA512 af5b17305f850b276705d651d735bbb80bd111760a7424d799b046e09093c1b030b45a06b3f94c7db189725285f45a784d788dc4602c063ec576af9d96f839f7
+EBUILD slade-3.2.6.ebuild 1807 BLAKE2B 112fa8e14a78125b70c521e36a8d861113dccc0d566cb1fb9f5714473acd890a25641574fed1d57f25c5ca5ad0fd39a1e4d6810e987429a4c979744f9de1f322 SHA512 8b83ee131f049c1fbfc14c5ed0a4a3db52495710d9f2c2a4ae9f621eb8455e84701f46f86c22b910dd975a28773b0ddcf008ae47c780f2488fd909a47f8cfca8
 MISC metadata.xml 457 BLAKE2B 241e53a5b4e6b85472c19b5431bae365eb740632cc71c9c2df1fb1f6c7f4875e8cb6d7ce17cddef12377a306c7abd8787a9f8e4cdd21b2b892d639ef68e8c077 SHA512 ae81e2d7faa90358dfd5f6511650de78fae50b7356609e7c54b635515e2fd9fb1348e9f34931e1cd82a3ad37206e47a64a02969c7762f38e62c32ffb5512b769
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<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/files/slade-3.2.6-fix-sol.patch b/games-util/slade/files/slade-3.2.6-fix-sol.patch
new file mode 100644
index 000000000000..d0aa3b993f7d
--- /dev/null
+++ b/games-util/slade/files/slade-3.2.6-fix-sol.patch
@@ -0,0 +1,14 @@
+diff --git a/thirdparty/sol/sol.hpp b/thirdparty/sol/sol.hpp
+index 3ff9ad1c..eb73973b 100644
+--- a/thirdparty/sol/sol.hpp
++++ b/thirdparty/sol/sol.hpp
+@@ -5968,7 +5968,8 @@ namespace sol {
+ 			static_assert(std::is_constructible<T, Args&&...>::value, "T must be constructible with Args");
+ 
+ 			*this = nullopt;
+-			this->construct(std::forward<Args>(args)...);
++			new (static_cast<void*>(this)) optional(std::in_place, std::forward<Args>(args)...);
++			return **this;
+ 		}
+ 
+ 		/// Swaps this optional with the other.
diff --git a/games-util/slade/slade-3.2.4-r1.ebuild b/games-util/slade/slade-3.2.4-r1.ebuild
index 06d0d3eeef76..7ba249ac765a 100644
--- a/games-util/slade/slade-3.2.4-r1.ebuild
+++ b/games-util/slade/slade-3.2.4-r1.ebuild
@@ -12,6 +12,7 @@ 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"
@@ -44,11 +45,10 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-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() {
diff --git a/games-util/slade/slade-3.2.6.ebuild b/games-util/slade/slade-3.2.6.ebuild
new file mode 100644
index 000000000000..607006a54dce
--- /dev/null
+++ b/games-util/slade/slade-3.2.6.ebuild
@@ -0,0 +1,81 @@
+# 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 xdg
+
+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}[curl(+),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.6-fix-sol.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
+}