summaryrefslogtreecommitdiff
path: root/games-util/slade
diff options
context:
space:
mode:
Diffstat (limited to 'games-util/slade')
-rw-r--r--games-util/slade/Manifest7
-rw-r--r--games-util/slade/files/slade-3.2.4-compile.patch64
-rw-r--r--games-util/slade/files/slade-3.2.7-pkg-config.patch25
-rw-r--r--games-util/slade/files/slade-3.2.7-wayland.patch41
-rw-r--r--games-util/slade/slade-3.2.7.ebuild (renamed from games-util/slade/slade-3.2.4-r1.ebuild)27
5 files changed, 85 insertions, 79 deletions
diff --git a/games-util/slade/Manifest b/games-util/slade/Manifest
index a5d007fde088..fb15cea92be9 100644
--- a/games-util/slade/Manifest
+++ b/games-util/slade/Manifest
@@ -1,9 +1,10 @@
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
+AUX slade-3.2.7-pkg-config.patch 808 BLAKE2B e15bc30616a79b5a0c53134ce929e647a7135d597c3d4491bf752163c2c55ef59526b3e3b1db0edc5abbc9bb687eef1fd3d57d460d0bca666d9e062f110ae6a5 SHA512 0897abe9de3b079183e219c572cc0a8031319d15fe4ce36cf05f8153eaf0a90032e95181aaf5bb004dd4d18b80ae9738a31bbf68b059ebc6a0e4e70fb55e4b79
+AUX slade-3.2.7-wayland.patch 1112 BLAKE2B 152323b4a80016ffef43d9ccea6c9ab7fe9dd1a137afb2bad02e85ccad9574bfb5cdf267469da5ca3ec88c60857b8df30b1b1a0ed87b875e87d8b6085bf75f2f SHA512 17fed7d939ae0b687d7b46fa9fb466dc62dc8265a893d4aab9c863fbc36011e6556391dd5a6e0b467ced220ea5d336704d1eadd88de35e05a6d17c83e2554206
DIST slade-3.2.6.tar.gz 7027328 BLAKE2B ba0db4926f5706166ec2439cbb539a9d5330e2d3ea3dbd8e29b586cf57a23b7b254823d84b7ba79b604a86ed0e5753b4e7c4fcf825ba7d3217c52824f36c5be4 SHA512 d09631b24c83769482480c24dfc1f6992ae293bdfe4c8661d967d6ac0fcbba6f0e1bf58c58afc84a82fb5f900d9e0e99413800a42edc353a4f7f1f52781db54f
-EBUILD slade-3.2.4-r1.ebuild 1795 BLAKE2B e2391cae62ebce00972ec65491d4f295ee1f6a3a39763962e74141d5f81ae281b1f979387c3747ed3d30b62d731af1d22f4baa0b2bdd28aa683fcae2d671ce37 SHA512 af5b17305f850b276705d651d735bbb80bd111760a7424d799b046e09093c1b030b45a06b3f94c7db189725285f45a784d788dc4602c063ec576af9d96f839f7
+DIST slade-3.2.7.tar.gz 6419781 BLAKE2B 484e70406a5185166ea6b73d68565d9bb43e7558e6269abe4710e3f1437b8421383a5f40e136dd86ca84f0bb2fa38d61fd6e3e8925db293b436ba044ad88418c SHA512 026bba57a85a64e695d1c96344726f5f82cd89e5e403c686e72a569d9272383347190b6804fa4623b5836967db0541b80e418457df1614c76da466bbc8c61b5e
EBUILD slade-3.2.6.ebuild 1807 BLAKE2B 112fa8e14a78125b70c521e36a8d861113dccc0d566cb1fb9f5714473acd890a25641574fed1d57f25c5ca5ad0fd39a1e4d6810e987429a4c979744f9de1f322 SHA512 8b83ee131f049c1fbfc14c5ed0a4a3db52495710d9f2c2a4ae9f621eb8455e84701f46f86c22b910dd975a28773b0ddcf008ae47c780f2488fd909a47f8cfca8
+EBUILD slade-3.2.7.ebuild 1810 BLAKE2B 7e238fee0fb9674d40a08a2ecb7fd389bf4d7bd5a2979506e6c41da44a171807b57b37df6c1beeb8887715ae0c03dcc5a48649dd629eac541fbbdfd8d74c6488 SHA512 396607616f8727753c653f83b18c4d493c8f775b00d4002d6f2f1337a9100ad64af3070b16e20cc94290ebad40e091a41cbc561f6f308592259fa7e0941c8d9b
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
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/files/slade-3.2.7-pkg-config.patch b/games-util/slade/files/slade-3.2.7-pkg-config.patch
new file mode 100644
index 000000000000..b421c3c68028
--- /dev/null
+++ b/games-util/slade/files/slade-3.2.7-pkg-config.patch
@@ -0,0 +1,25 @@
+From 49e5aa0b0a4481a335936b623b7725a1bc8863d1 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Wed, 30 Apr 2025 23:28:59 +0100
+Subject: [PATCH] Fix CMake USE_SYSTEM_DUMB option
+
+This stopped working since pkg-config stopped being used elsewhere.
+---
+ thirdparty/CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt
+index 56506035..67c3dab5 100644
+--- a/thirdparty/CMakeLists.txt
++++ b/thirdparty/CMakeLists.txt
+@@ -8,6 +8,7 @@ set(BZIP2_LIBRARIES ${BZIP2_LIBRARIES} PARENT_SCOPE)
+
+ option(USE_SYSTEM_DUMB "Use system DUMB library" OFF)
+ if(USE_SYSTEM_DUMB)
++ find_package(PkgConfig REQUIRED)
+ pkg_check_modules(DUMB REQUIRED IMPORTED_TARGET dumb>=1.0)
+ else()
+ file(GLOB_RECURSE DUMB_SOURCES dumb/*.c)
+--
+2.49.0
+
diff --git a/games-util/slade/files/slade-3.2.7-wayland.patch b/games-util/slade/files/slade-3.2.7-wayland.patch
new file mode 100644
index 000000000000..2fc47e414fb7
--- /dev/null
+++ b/games-util/slade/files/slade-3.2.7-wayland.patch
@@ -0,0 +1,41 @@
+SFML's render window only supports X11 under Linux, so SLADE crashes if GDK
+chooses the Wayland backend. This patch tells GDK to prefer the X11 backend.
+SLADE 3.3.0 will apparently not use the render window.
+
+diff --git a/src/Application/SLADEWxApp.cpp b/src/Application/SLADEWxApp.cpp
+index 3dadf241..de01e340 100644
+--- a/src/Application/SLADEWxApp.cpp
++++ b/src/Application/SLADEWxApp.cpp
+@@ -52,6 +52,16 @@
+ using namespace slade;
+
+
++#ifdef __WXGTK__
++#include <gdk/gdk.h>
++
++struct PreferX11 {
++ PreferX11() { gdk_set_allowed_backends("x11,*"); }
++};
++static PreferX11 preferx11;
++#endif
++
++
+ // -----------------------------------------------------------------------------
+ //
+ // Variables
+diff --git a/cmake/unix.cmake b/cmake/unix.cmake
+index a5d62c0d..18059156 100644
+--- a/cmake/unix.cmake
++++ b/cmake/unix.cmake
+@@ -158,7 +158,11 @@ add_executable(slade WIN32 MACOSX_BUNDLE
+ ${SLADE_HEADERS}
+ )
+
++find_package(PkgConfig REQUIRED)
++pkg_check_modules(GDK REQUIRED IMPORTED_TARGET gdk-3.0)
++
+ target_link_libraries(slade
++ PkgConfig::GDK
+ ${ZLIB_LIBRARY}
+ ${BZIP2_LIBRARIES}
+ ${EXTERNAL_LIBRARIES}
diff --git a/games-util/slade/slade-3.2.4-r1.ebuild b/games-util/slade/slade-3.2.7.ebuild
index 7ba249ac765a..92cbd7d1ad02 100644
--- a/games-util/slade/slade-3.2.4-r1.ebuild
+++ b/games-util/slade/slade-3.2.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -6,7 +6,7 @@ EAPI=8
LUA_COMPAT=( lua5-{1..3} )
WX_GTK_VER="3.2-gtk3"
-inherit cmake lua-single wxwidgets
+inherit cmake lua-single wxwidgets xdg
MY_PV="${PV/beta/b}"
DESCRIPTION="Modern editor for Doom-engine based games and source ports"
@@ -19,19 +19,19 @@ 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:=
+ dev-libs/libfmt:=
>=media-libs/dumb-2:=
media-libs/freeimage[jpeg,png,tiff]
- media-libs/glew:0=
+ media-libs/freetype:2
+ media-libs/ftgl
media-libs/libsfml:=
media-sound/mpg123
- net-misc/curl
sys-libs/zlib
- x11-libs/wxGTK:${WX_GTK_VER}[opengl,webkit?,X]
+ x11-libs/wxGTK:${WX_GTK_VER}[curl(+),opengl,webkit?,X]
+ virtual/glu
fluidsynth? ( media-sound/fluidsynth:= )
"
@@ -41,14 +41,18 @@ RDEPEND="
"
BDEPEND="
- app-arch/p7zip
virtual/pkgconfig
+ || (
+ app-arch/zip
+ app-arch/p7zip
+ app-arch/7zip
+ )
"
PATCHES=(
"${FILESDIR}"/${PN}-3.2.0_beta2-fluidsynth-driver.patch
- "${FILESDIR}"/${PN}-3.2.2-wayland.patch
- "${FILESDIR}"/${PN}-3.2.4-compile.patch
+ "${FILESDIR}"/${PN}-3.2.7-wayland.patch
+ "${FILESDIR}"/${PN}-3.2.7-pkg-config.patch
)
src_prepare() {
@@ -67,13 +71,12 @@ src_configure() {
-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
+ -DZIPTOOL_7Z_EXECUTABLE=$(type -P 7z 7zz | head -n1)
)
setup-wxwidgets
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-21 14:21:09 +0000