[gentoo-commits] repo/gentoo:master commit in: games-util/slade/files/, games-util/slade/
commit: 8b5db6b04abe3a2561932cd23652cb0179a38332
Author: James Le Cuirot gentoo org>
AuthorDate: Wed Jul 12 20:49:44 2023 +
Commit: James Le Cuirot gentoo org>
CommitDate: Wed Jul 12 20:49:44 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b5db6b0
games-util/slade: Drop old 3.2.1 and 3.2.2
Signed-off-by: James Le Cuirot gentoo.org>
games-util/slade/Manifest | 2 -
.../slade/files/slade-3.2.0-bundled-libs.patch | 182 -
games-util/slade/slade-3.2.1-r1.ebuild | 81 -
games-util/slade/slade-3.2.2.ebuild| 80 -
4 files changed, 345 deletions(-)
diff --git a/games-util/slade/Manifest b/games-util/slade/Manifest
index e05f21844609..22d22f12f254 100644
--- a/games-util/slade/Manifest
+++ b/games-util/slade/Manifest
@@ -1,3 +1 @@
-DIST slade-3.2.1.tar.gz 6471666 BLAKE2B
17a4f2ec23699a56d4fd970605d7141d3f4593f7ced6fff205c87d9ecddc7b90e6da2991aeea32bd008e24cdfee95b7c16946f78b2701c94e51266afd78863d6
SHA512
b7d5a91c759c5a68af63aa9a8412452a5b2986e70f7189ca92ee99ce4953ef47381be907c8ce1166e479f24679904bf5f0e0b1a5da846fe7873c5b97f4315449
-DIST slade-3.2.2.tar.gz 6479812 BLAKE2B
2394f8f1e858a2f96e625cbf68a983d235e96a055c2fba7b99e79475e84bc43a9fce49bac1fadd6d5a5cfcf68f59f92ee61272def54962ec251a9441ca03c357
SHA512
4fd73f36df4800873154329222a382f9051f0d61aba1d7061e48b0350b5ab68066e5c484dd3200a118f254be5cb7b86dad7fa3a757556243bd5c8af5ea89d638
DIST slade-3.2.4.tar.gz 7000370 BLAKE2B
251c79b1f90dea7971120a7b55d89d5112857f04a5609a26ce3970116d616c7361b1bea98da05a5e3fde0d433e62a34e9610a1d32ca9e72ee4f140ae7ac22ec6
SHA512
e3dda37aebc9c4bab3fb0d1179cbe726be2cdf55d9d7d95cfa47c8f817a1cf2b01863cce09da17da85af1e4077f1f9b7841abdaa8f114e3a6db1fe2b48292ffd
diff --git a/games-util/slade/files/slade-3.2.0-bundled-libs.patch
b/games-util/slade/files/slade-3.2.0-bundled-libs.patch
deleted file mode 100644
index c2efc8ca3496..
--- a/games-util/slade/files/slade-3.2.0-bundled-libs.patch
+++ /dev/null
@@ -1,182 +0,0 @@
-https://github.com/sirjuddington/SLADE/pull/1413
-
-diff --git a/src/Application/App.cpp b/src/Application/App.cpp
-index dddaf875..ede8d73c 100644
a/src/Application/App.cpp
-+++ b/src/Application/App.cpp
-@@ -60,7 +60,7 @@
- #include "UI/WxUtils.h"
- #include "Utility/StringUtils.h"
- #include "Utility/Tokenizer.h"
--#include "thirdparty/dumb/dumb.h"
-+#include
- #include
-
- using namespace slade;
-diff --git a/src/Audio/ModMusic.cpp b/src/Audio/ModMusic.cpp
-index cc4b60cf..6d54516d 100644
a/src/Audio/ModMusic.cpp
-+++ b/src/Audio/ModMusic.cpp
-@@ -32,7 +32,7 @@
- //
-
- #include "Main.h"
- #include "ModMusic.h"
--#include "thirdparty/dumb/dumb.h"
-+#include
-
- using namespace slade;
- using namespace audio;
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index fef3d009..00dbb018 100644
a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -116,7 +116,6 @@ include_directories(
- ${MPG123_INCLUDE_DIR}
- .
- ..
-- ../thirdparty/dumb
- ../thirdparty/glad/include
- ./Application
- )
-@@ -235,7 +234,7 @@ else(APPLE)
- install(FILES "${SLADE_OUTPUT_DIR}/slade.pk3"
- DESTINATION share/slade3
- )
--
-+
- install(FILES "${PROJECT_SOURCE_DIR}/dist/res/logo_icon.png"
- DESTINATION share/icons/
- RENAME net.mancubus.SLADE.png
-diff --git a/src/General/CVar.cpp b/src/General/CVar.cpp
-index 460a7852..5e171446 100644
a/src/General/CVar.cpp
-+++ b/src/General/CVar.cpp
-@@ -32,7 +32,7 @@
- //
-
- #include "Main.h"
- #include "Utility/StringUtils.h"
--#include "thirdparty/fmt/include/fmt/format.h"
-+#include
-
- using namespace slade;
-
-diff --git a/src/General/Log.cpp b/src/General/Log.cpp
-index 9ad0718f..8d39f644 100644
a/src/General/Log.cpp
-+++ b/src/General/Log.cpp
-@@ -31,8 +31,8 @@
- //
-
- #include "Main.h"
- #include "App.h"
--#include "thirdparty/fmt/include/fmt/chrono.h"
--#include "thirdparty/fmt/include/fmt/format.h"
-+#include
-+#include
- #include
-
- using namespace slade;
-diff --git a/src/TextEditor/TextStyle.cpp b/src/TextEditor/TextStyle.cpp
-index 09f4e405..ad51ec0a 100644
a/src/TextEditor/TextStyle.cpp
-+++ b/src/TextEditor/TextStyle.cpp
-@@ -43,7 +43,7 @@
- #include "Utility/Parser.h"
- #include "Utility/StringUtils.h"
- #include "Utility/Tokenizer.h"
--#include "thirdparty/fmt/include/fmt/format.h"
-+#include
-
- using namespace slade;
-
-diff --git a/src/UI/Browser/BrowserItem.cpp b/src/UI/Browser/BrowserItem.cpp
-index 89c0f39c..3f056f71 100644
a/src/UI/Browser/BrowserItem.cpp
-+++
[gentoo-commits] repo/gentoo:master commit in: games-util/slade/
commit: b59a4c160da533bc6333024032c21541be03d3db
Author: James Le Cuirot gentoo org>
AuthorDate: Wed Jul 12 20:48:16 2023 +
Commit: James Le Cuirot gentoo org>
CommitDate: Wed Jul 12 20:49:21 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b59a4c16
games-util/slade: Bump to 3.2.4, fixes build with GCC 13
Closes: https://bugs.gentoo.org/899040
Signed-off-by: James Le Cuirot gentoo.org>
games-util/slade/Manifest | 1 +
games-util/slade/slade-3.2.4.ebuild | 80 +
2 files changed, 81 insertions(+)
diff --git a/games-util/slade/Manifest b/games-util/slade/Manifest
index 71d47f925a43..e05f21844609 100644
--- a/games-util/slade/Manifest
+++ b/games-util/slade/Manifest
@@ -1,2 +1,3 @@
DIST slade-3.2.1.tar.gz 6471666 BLAKE2B
17a4f2ec23699a56d4fd970605d7141d3f4593f7ced6fff205c87d9ecddc7b90e6da2991aeea32bd008e24cdfee95b7c16946f78b2701c94e51266afd78863d6
SHA512
b7d5a91c759c5a68af63aa9a8412452a5b2986e70f7189ca92ee99ce4953ef47381be907c8ce1166e479f24679904bf5f0e0b1a5da846fe7873c5b97f4315449
DIST slade-3.2.2.tar.gz 6479812 BLAKE2B
2394f8f1e858a2f96e625cbf68a983d235e96a055c2fba7b99e79475e84bc43a9fce49bac1fadd6d5a5cfcf68f59f92ee61272def54962ec251a9441ca03c357
SHA512
4fd73f36df4800873154329222a382f9051f0d61aba1d7061e48b0350b5ab68066e5c484dd3200a118f254be5cb7b86dad7fa3a757556243bd5c8af5ea89d638
+DIST slade-3.2.4.tar.gz 7000370 BLAKE2B
251c79b1f90dea7971120a7b55d89d5112857f04a5609a26ce3970116d616c7361b1bea98da05a5e3fde0d433e62a34e9610a1d32ca9e72ee4f140ae7ac22ec6
SHA512
e3dda37aebc9c4bab3fb0d1179cbe726be2cdf55d9d7d95cfa47c8f817a1cf2b01863cce09da17da85af1e4077f1f9b7841abdaa8f114e3a6db1fe2b48292ffd
diff --git a/games-util/slade/slade-3.2.4.ebuild
b/games-util/slade/slade-3.2.4.ebuild
new file mode 100644
index ..48395e6d88fa
--- /dev/null
+++ b/games-util/slade/slade-3.2.4.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2023 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"
+LICENSE="GPL-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="fluidsynth timidity webkit"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+DEPEND="
+ ${LUA_DEPS}
+ app-arch/bzip2:=
+ dev-libs/libfmt:=
+ >=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
+"
+
+S="${WORKDIR}/${PN^^}-${MY_PV}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.2.0_beta2-fluidsynth-driver.patch
+ "${FILESDIR}"/${PN}-3.2.2-wayland.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
+}
[gentoo-commits] repo/gentoo:master commit in: games-util/slade/files/, games-util/slade/
commit: 1669592bf97679ca6a94f4bc466b3e8acd540a5d
Author: James Le Cuirot gentoo org>
AuthorDate: Sat Apr 8 22:08:40 2023 +
Commit: James Le Cuirot gentoo org>
CommitDate: Sat Apr 8 22:08:40 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1669592b
games-util/slade: Bump to 3.2.2, fix Wayland
Keeping the old version because the map editor doesn't render properly for me
under the new version.
Signed-off-by: James Le Cuirot gentoo.org>
games-util/slade/Manifest | 1 +
games-util/slade/files/slade-3.2.2-wayland.patch | 25 ++
games-util/slade/slade-3.2.1-r1.ebuild | 1 +
.../{slade-3.2.1-r1.ebuild => slade-3.2.2.ebuild} | 6 +++---
4 files changed, 30 insertions(+), 3 deletions(-)
diff --git a/games-util/slade/Manifest b/games-util/slade/Manifest
index bb06ceb8def6..71d47f925a43 100644
--- a/games-util/slade/Manifest
+++ b/games-util/slade/Manifest
@@ -1 +1,2 @@
DIST slade-3.2.1.tar.gz 6471666 BLAKE2B
17a4f2ec23699a56d4fd970605d7141d3f4593f7ced6fff205c87d9ecddc7b90e6da2991aeea32bd008e24cdfee95b7c16946f78b2701c94e51266afd78863d6
SHA512
b7d5a91c759c5a68af63aa9a8412452a5b2986e70f7189ca92ee99ce4953ef47381be907c8ce1166e479f24679904bf5f0e0b1a5da846fe7873c5b97f4315449
+DIST slade-3.2.2.tar.gz 6479812 BLAKE2B
2394f8f1e858a2f96e625cbf68a983d235e96a055c2fba7b99e79475e84bc43a9fce49bac1fadd6d5a5cfcf68f59f92ee61272def54962ec251a9441ca03c357
SHA512
4fd73f36df4800873154329222a382f9051f0d61aba1d7061e48b0350b5ab68066e5c484dd3200a118f254be5cb7b86dad7fa3a757556243bd5c8af5ea89d638
diff --git a/games-util/slade/files/slade-3.2.2-wayland.patch
b/games-util/slade/files/slade-3.2.2-wayland.patch
new file mode 100644
index ..4207ceb2076d
--- /dev/null
+++ b/games-util/slade/files/slade-3.2.2-wayland.patch
@@ -0,0 +1,25 @@
+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
++
++struct PreferX11 {
++ PreferX11() { gdk_set_allowed_backends("x11,*"); }
++};
++static PreferX11 preferx11;
++#endif
++
++
+ //
-
+ //
+ // Variables
diff --git a/games-util/slade/slade-3.2.1-r1.ebuild
b/games-util/slade/slade-3.2.1-r1.ebuild
index 285ef98db6f9..75ed0c04389d 100644
--- a/games-util/slade/slade-3.2.1-r1.ebuild
+++ b/games-util/slade/slade-3.2.1-r1.ebuild
@@ -48,6 +48,7 @@ S="${WORKDIR}/${PN^^}-${MY_PV}"
PATCHES=(
"${FILESDIR}"/${PN}-3.2.0-bundled-libs.patch
"${FILESDIR}"/${PN}-3.2.0_beta2-fluidsynth-driver.patch
+ "${FILESDIR}"/${PN}-3.2.2-wayland.patch
)
src_prepare() {
diff --git a/games-util/slade/slade-3.2.1-r1.ebuild
b/games-util/slade/slade-3.2.2.ebuild
similarity index 93%
copy from games-util/slade/slade-3.2.1-r1.ebuild
copy to games-util/slade/slade-3.2.2.ebuild
index 285ef98db6f9..48395e6d88fa 100644
--- a/games-util/slade/slade-3.2.1-r1.ebuild
+++ b/games-util/slade/slade-3.2.2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
LUA_COMPAT=( lua5-{1..3} )
-WX_GTK_VER="3.0-gtk3"
+WX_GTK_VER="3.2-gtk3"
inherit cmake lua-single wxwidgets
@@ -46,8 +46,8 @@ BDEPEND="
S="${WORKDIR}/${PN^^}-${MY_PV}"
PATCHES=(
- "${FILESDIR}"/${PN}-3.2.0-bundled-libs.patch
"${FILESDIR}"/${PN}-3.2.0_beta2-fluidsynth-driver.patch
+ "${FILESDIR}"/${PN}-3.2.2-wayland.patch
)
src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: games-util/slade/files/
commit: 9f6a86c9725b2208639287f4422001f85359aebe
Author: James Le Cuirot gentoo org>
AuthorDate: Sat Oct 8 20:30:51 2022 +
Commit: James Le Cuirot gentoo org>
CommitDate: Sat Oct 8 20:30:51 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f6a86c9
games-util/slade: Fix patch with broken whitespace
Sorry, my editor must have mangled it.
Closes: https://bugs.gentoo.org/865871
Signed-off-by: James Le Cuirot gentoo.org>
.../slade/files/slade-3.2.0-bundled-libs.patch | 32 +++---
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/games-util/slade/files/slade-3.2.0-bundled-libs.patch
b/games-util/slade/files/slade-3.2.0-bundled-libs.patch
index c543f09e3fae..c2efc8ca3496 100644
--- a/games-util/slade/files/slade-3.2.0-bundled-libs.patch
+++ b/games-util/slade/files/slade-3.2.0-bundled-libs.patch
@@ -11,7 +11,7 @@ index dddaf875..ede8d73c 100644
-#include "thirdparty/dumb/dumb.h"
+#include
#include
-
+
using namespace slade;
diff --git a/src/Audio/ModMusic.cpp b/src/Audio/ModMusic.cpp
index cc4b60cf..6d54516d 100644
@@ -23,7 +23,7 @@ index cc4b60cf..6d54516d 100644
#include "ModMusic.h"
-#include "thirdparty/dumb/dumb.h"
+#include
-
+
using namespace slade;
using namespace audio;
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -42,7 +42,7 @@ index fef3d009..00dbb018 100644
install(FILES "${SLADE_OUTPUT_DIR}/slade.pk3"
DESTINATION share/slade3
)
--
+-
+
install(FILES "${PROJECT_SOURCE_DIR}/dist/res/logo_icon.png"
DESTINATION share/icons/
@@ -57,9 +57,9 @@ index 460a7852..5e171446 100644
#include "Utility/StringUtils.h"
-#include "thirdparty/fmt/include/fmt/format.h"
+#include
-
+
using namespace slade;
-
+
diff --git a/src/General/Log.cpp b/src/General/Log.cpp
index 9ad0718f..8d39f644 100644
--- a/src/General/Log.cpp
@@ -73,7 +73,7 @@ index 9ad0718f..8d39f644 100644
+#include
+#include
#include
-
+
using namespace slade;
diff --git a/src/TextEditor/TextStyle.cpp b/src/TextEditor/TextStyle.cpp
index 09f4e405..ad51ec0a 100644
@@ -85,9 +85,9 @@ index 09f4e405..ad51ec0a 100644
#include "Utility/Tokenizer.h"
-#include "thirdparty/fmt/include/fmt/format.h"
+#include
-
+
using namespace slade;
-
+
diff --git a/src/UI/Browser/BrowserItem.cpp b/src/UI/Browser/BrowserItem.cpp
index 89c0f39c..3f056f71 100644
--- a/src/UI/Browser/BrowserItem.cpp
@@ -98,7 +98,7 @@ index 89c0f39c..3f056f71 100644
text_box_ = std::make_unique(
- fmt::format("{}\n{}", index_, name_.c_str()),
font, ui::scalePx(144), ui::scalePx(16));
+ fmt::format("{}\n{}", index_, name_.mb_str()),
font, ui::scalePx(144), ui::scalePx(16));
-
+
int top = y;
top += ((size - text_box_->height()) * 0.5);
diff --git a/src/UI/SToolBar/SToolBar.cpp b/src/UI/SToolBar/SToolBar.cpp
@@ -106,7 +106,7 @@ index f38710ad..c002bf97 100644
--- a/src/UI/SToolBar/SToolBar.cpp
+++ b/src/UI/SToolBar/SToolBar.cpp
@@ -219,7 +219,7 @@ void SToolBarGroup::hide(bool hide)
-
+
// Update 'hidden toolbars' cvar
string tb_hidden = toolbars_hidden;
- auto name = fmt::format("[{}]", name_.c_str());
@@ -120,11 +120,11 @@ index 8c3c4b3b..d66cbc04 100644
+++ b/src/common.h
@@ -129,7 +129,7 @@
#endif
-
+
// fmt
-#include "thirdparty/fmt/include/fmt/core.h"
+#include
-
+
// Sigslot
#include "thirdparty/sigslot/signal.hpp"
diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt
@@ -134,7 +134,7 @@ index f84cfc8a..6cb9e0af 100644
@@ -6,20 +6,33 @@ find_package(BZip2 REQUIRED)
set(ZLIB_LIBRARY ${ZLIB_LIBRARY} PARENT_SCOPE)
set(BZIP2_LIBRARIES ${BZIP2_LIBRARIES} PARENT_SCOPE)
-
+
+option(USE_SYSTEM_DUMB "Use system DUMB library" OFF)
+if(USE_SYSTEM_DUMB)
+ pkg_check_modules(DUMB REQUIRED IMPORTED_TARGET dumb>=1.0)
@@ -154,7 +154,7 @@ index f84cfc8a..6cb9e0af 100644
+ ${DUMB_SOURCES}
${SLADE_HEADERS}
)
-
+
# Add fmt
-add_subdirectory(fmt)
+option(USE_SYSTEM_FMT "Use system fmt library" OFF)
@@ -164,12 +164,12 @@ index f84cfc8a..6cb9e0af 100644
+ add_subdirectory(fmt)
+ target_include_directories(fmt INTERFACE
${CMAKE_CURRENT_LIST_DIR}/fmt/include)
+endif()
-
+
# Add lunasvg
add_library(lunasvg STATIC)
@@ -29,5 +42,11 @@ add_subdirectory(lunasvg/3rdparty/software)
add_subdirectory(lunasvg/3rdparty/plutovg)
-
+
add_library(external STATIC ${EXTERNAL_SOURCES})
-target_link_libraries(external ${ZLIB_LIBRARY} lunasvg fmt ${CMAKE_DL_LIBS})
+target_link_libraries(external ${ZLIB_LIBRARY} lunasvg fmt::fmt
${CMAKE_DL_LIBS})
[gentoo-commits] repo/gentoo:master commit in: games-util/slade/, games-util/slade/files/
commit: 1a1fe067379a48c4b329c99db390f75f154a788c
Author: James Le Cuirot gentoo org>
AuthorDate: Tue Aug 16 12:18:08 2022 +
Commit: James Le Cuirot gentoo org>
CommitDate: Tue Aug 16 12:18:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a1fe067
games-util/slade: Unbundle fmt library, fixing broken SONAME
Closes: https://bugs.gentoo.org/859322
Signed-off-by: James Le Cuirot gentoo.org>
.../slade/files/slade-3.2.0-bundled-libs.patch | 176 -
.../{slade-3.2.1.ebuild => slade-3.2.1-r1.ebuild} | 5 +-
2 files changed, 141 insertions(+), 40 deletions(-)
diff --git a/games-util/slade/files/slade-3.2.0-bundled-libs.patch
b/games-util/slade/files/slade-3.2.0-bundled-libs.patch
index c4eae37f945f..c543f09e3fae 100644
--- a/games-util/slade/files/slade-3.2.0-bundled-libs.patch
+++ b/games-util/slade/files/slade-3.2.0-bundled-libs.patch
@@ -1,17 +1,7 @@
-From 5ecc80d27276ba978b8c0268aab722fe8f09b394 Mon Sep 17 00:00:00 2001
-From: James Le Cuirot
-Date: Sat, 20 Feb 2021 12:22:24 +
-Subject: [PATCH] Unbundle the DUMB library
-
- src/Application/App.cpp | 2 +-
- src/Audio/ModMusic.cpp| 2 +-
- src/CMakeLists.txt| 4 +++-
- thirdparty/CMakeLists.txt | 1 -
- 4 files changed, 5 insertions(+), 4 deletions(-)
+https://github.com/sirjuddington/SLADE/pull/1413
diff --git a/src/Application/App.cpp b/src/Application/App.cpp
-index 936a8212..2960ca1d 100644
+index dddaf875..ede8d73c 100644
--- a/src/Application/App.cpp
+++ b/src/Application/App.cpp
@@ -60,7 +60,7 @@
@@ -21,7 +11,7 @@ index 936a8212..2960ca1d 100644
-#include "thirdparty/dumb/dumb.h"
+#include
#include
-
+
using namespace slade;
diff --git a/src/Audio/ModMusic.cpp b/src/Audio/ModMusic.cpp
index cc4b60cf..6d54516d 100644
@@ -33,45 +23,126 @@ index cc4b60cf..6d54516d 100644
#include "ModMusic.h"
-#include "thirdparty/dumb/dumb.h"
+#include
-
+
using namespace slade;
using namespace audio;
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index fef3d009..5363802c 100644
+index fef3d009..00dbb018 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
-@@ -107,6 +107,7 @@ if (NOT NO_LUA)
- find_package(Lua REQUIRED)
- endif()
- find_package(MPG123 REQUIRED)
-+pkg_check_modules(DUMB REQUIRED dumb>=1.0)
- include_directories(
- ${FREEIMAGE_INCLUDE_DIR}
- ${SFML_INCLUDE_DIR}
-@@ -114,9 +115,9 @@ include_directories(
- ${FTGL_INCLUDE_DIR}
- ${LUA_INCLUDE_DIR}
+@@ -116,7 +116,6 @@ include_directories(
${MPG123_INCLUDE_DIR}
-+ ${DUMB_INCLUDE_DIRS}
.
..
- ../thirdparty/dumb
../thirdparty/glad/include
./Application
)
-@@ -201,6 +202,7 @@ target_link_libraries(slade
- ${OPENGL_LIBRARIES}
- ${LUA_LIBRARIES}
- ${MPG123_LIBRARIES}
-+ ${DUMB_LIBRARIES}
- )
-
- if(LINUX)
+@@ -235,7 +234,7 @@ else(APPLE)
+ install(FILES "${SLADE_OUTPUT_DIR}/slade.pk3"
+ DESTINATION share/slade3
+ )
+-
++
+ install(FILES "${PROJECT_SOURCE_DIR}/dist/res/logo_icon.png"
+ DESTINATION share/icons/
+ RENAME net.mancubus.SLADE.png
+diff --git a/src/General/CVar.cpp b/src/General/CVar.cpp
+index 460a7852..5e171446 100644
+--- a/src/General/CVar.cpp
b/src/General/CVar.cpp
+@@ -32,7 +32,7 @@
+ //
-
+ #include "Main.h"
+ #include "Utility/StringUtils.h"
+-#include "thirdparty/fmt/include/fmt/format.h"
++#include
+
+ using namespace slade;
+
+diff --git a/src/General/Log.cpp b/src/General/Log.cpp
+index 9ad0718f..8d39f644 100644
+--- a/src/General/Log.cpp
b/src/General/Log.cpp
+@@ -31,8 +31,8 @@
+ //
-
+ #include "Main.h"
+ #include "App.h"
+-#include "thirdparty/fmt/include/fmt/chrono.h"
+-#include "thirdparty/fmt/include/fmt/format.h"
++#include
++#include
+ #include
+
+ using namespace slade;
+diff --git a/src/TextEditor/TextStyle.cpp b/src/TextEditor/TextStyle.cpp
+index 09f4e405..ad51ec0a 100644
+--- a/src/TextEditor/TextStyle.cpp
b/src/TextEditor/TextStyle.cpp
+@@ -43,7 +43,7 @@
+ #include "Utility/Parser.h"
+ #include "Utility/StringUtils.h"
+ #include "Utility/Tokenizer.h"
+-#include "thirdparty/fmt/include/fmt/format.h"
++#include
+
+ using namespace slade;
+
+diff --git a/src/UI/Browser/BrowserItem.cpp b/src/UI/Browser/BrowserItem.cpp
+index 89c0f39c..3f056f71 100644
+--- a/src/UI/Browser/BrowserItem.cpp
b/src/UI/Browser/BrowserItem.cpp
+@@ -126,7 +126,7 @@ void BrowserItem::draw(
+ // Create text box if needed
+ if (!text_box_)
+ text_box_ = std::make_unique(
+- fmt::format("{}\n{}", index_, name_.c_str()),
font, ui::scalePx(144), ui::scalePx(16));
++
[gentoo-commits] repo/gentoo:master commit in: games-util/slade/, games-util/slade/files/
commit: e2c805c2acecbae4a7920d6b9b5b9ca2254f3e23
Author: James Le Cuirot gentoo org>
AuthorDate: Tue Jun 28 08:11:09 2022 +
Commit: James Le Cuirot gentoo org>
CommitDate: Tue Jun 28 08:14:53 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2c805c2
games-util/slade: Bump to 3.2.1, drop old 3.2.0
Signed-off-by: James Le Cuirot gentoo.org>
games-util/slade/Manifest | 2 +-
games-util/slade/files/slade-3.2.0-wx3.0.patch | 66 --
.../{slade-3.2.0.ebuild => slade-3.2.1.ebuild} | 1 -
3 files changed, 1 insertion(+), 68 deletions(-)
diff --git a/games-util/slade/Manifest b/games-util/slade/Manifest
index 893f5cf476e8..bb06ceb8def6 100644
--- a/games-util/slade/Manifest
+++ b/games-util/slade/Manifest
@@ -1 +1 @@
-DIST slade-3.2.0.tar.gz 6464839 BLAKE2B
8e13f153c64526784bd5fa3d03520942d9dbc1b0b0d1e4d0650fb91ed63a7f860655f5d580b4c0a04a52aa98f617b1f4448f47cd1e55c1b3f78fc552b8101654
SHA512
916be3b9556e76ca815514bb472335af80a72bfb8ecd0ae4287db2c0d6ad092a8ada1b335762f8589d300b1fd81adbdede3e6c315cfdc1d49b1624294b405b92
+DIST slade-3.2.1.tar.gz 6471666 BLAKE2B
17a4f2ec23699a56d4fd970605d7141d3f4593f7ced6fff205c87d9ecddc7b90e6da2991aeea32bd008e24cdfee95b7c16946f78b2701c94e51266afd78863d6
SHA512
b7d5a91c759c5a68af63aa9a8412452a5b2986e70f7189ca92ee99ce4953ef47381be907c8ce1166e479f24679904bf5f0e0b1a5da846fe7873c5b97f4315449
diff --git a/games-util/slade/files/slade-3.2.0-wx3.0.patch
b/games-util/slade/files/slade-3.2.0-wx3.0.patch
deleted file mode 100644
index 2e519b45181b..
--- a/games-util/slade/files/slade-3.2.0-wx3.0.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 45537095187cb5b985713e7558a230651b599589 Mon Sep 17 00:00:00 2001
-From: Simon Judd
-Date: Thu, 14 Apr 2022 21:52:16 -0700
-Subject: [PATCH] Keep up wx3.0 compatibility
-
-I'd like to drop it ideally, but for now it'll stay
-
-Fix #1336
- src/Graphics/Icons.cpp | 15 +++
- src/UI/SAuiTabArt.cpp | 5 -
- 2 files changed, 19 insertions(+), 1 deletion(-)
-
-diff --git a/src/Graphics/Icons.cpp b/src/Graphics/Icons.cpp
-index 61d5475c..67147f7e 100644
a/src/Graphics/Icons.cpp
-+++ b/src/Graphics/Icons.cpp
-@@ -373,7 +373,22 @@ wxBitmap loadPNGIcon(const IconDef& icon, int size,
Point2i padding)
- bool icons::loadIcons()
- {
- // Check for dark mode
-+#if wxMAJOR_VERSION >= 3 && wxMINOR_VERSION >= 1
- ui_icons_dark = wxSystemSettings::GetAppearance().IsDark();
-+#else
-+ auto fg = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT);
-+ auto fg_r = fg.Red();
-+ auto fg_g = fg.Green();
-+ auto fg_b = fg.Blue();
-+ auto bg = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
-+ auto bg_r = bg.Red();
-+ auto bg_g = bg.Green();
-+ auto bg_b = bg.Blue();
-+ wxColour::MakeGrey(_r, _g, _b);
-+ wxColour::MakeGrey(_r, _g, _b);
-+ log::info("DARK MODE CHECK: FG {} BG {}", fg_r, bg_r);
-+ ui_icons_dark = fg_r > bg_r;
-+#endif
-
- // Get slade.pk3
- auto* res_archive = app::archiveManager().programResourceArchive();
-diff --git a/src/UI/SAuiTabArt.cpp b/src/UI/SAuiTabArt.cpp
-index 15aad09e..240de8b9 100644
a/src/UI/SAuiTabArt.cpp
-+++ b/src/UI/SAuiTabArt.cpp
-@@ -542,6 +542,7 @@ void SAuiDockArt::DrawCaption(wxDC& dc, wxWindow* window,
const wxString& text,
- int caption_offset = 0;
- if (pane.icon.IsOk())
- {
-+#if wxMAJOR_VERSION >= 3 && wxMINOR_VERSION >= 1
- // Ensure the icon fits into the title bar.
- wxSize iconSize = pane.icon.GetSize();
- if (iconSize.y > rect.height)
-@@ -554,7 +555,9 @@ void SAuiDockArt::DrawCaption(wxDC& dc, wxWindow* window,
const wxString& text,
- dc.DrawBitmap(pane.icon,
- rect.x+xOffset,
rect.y+(rect.height-pane.icon.GetHeight())/2,
- true);
--
-+#else
-+ DrawIcon(dc, rect, pane);
-+#endif
- caption_offset += pane.icon.GetWidth() + px3;
- }
-
---
-2.34.1
-
diff --git a/games-util/slade/slade-3.2.0.ebuild
b/games-util/slade/slade-3.2.1.ebuild
similarity index 97%
rename from games-util/slade/slade-3.2.0.ebuild
rename to games-util/slade/slade-3.2.1.ebuild
index 76979d24ed46..e68c8e1e1a4e 100644
--- a/games-util/slade/slade-3.2.0.ebuild
+++ b/games-util/slade/slade-3.2.1.ebuild
@@ -48,7 +48,6 @@ S="${WORKDIR}/${PN^^}-${MY_PV}"
PATCHES=(
"${FILESDIR}"/${PN}-3.2.0-bundled-libs.patch
"${FILESDIR}"/${PN}-3.2.0_beta2-fluidsynth-driver.patch
- "${FILESDIR}"/${PN}-3.2.0-wx3.0.patch
)
src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: games-util/slade/, games-util/slade/files/
commit: da2f9eba4f975c62d061491987f6616e24b53ac5
Author: James Le Cuirot gentoo org>
AuthorDate: Sat Apr 16 08:08:33 2022 +
Commit: James Le Cuirot gentoo org>
CommitDate: Sat Apr 16 08:08:33 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da2f9eba
games-util/slade: Version bump to 3.2.0, EAPI 8
Closes: https://bugs.gentoo.org/838124
Signed-off-by: James Le Cuirot gentoo.org>
games-util/slade/Manifest | 1 +
.../slade/files/slade-3.2.0-bundled-libs.patch | 84 ++
games-util/slade/files/slade-3.2.0-wx3.0.patch | 66 +
games-util/slade/slade-3.2.0.ebuild| 78
4 files changed, 229 insertions(+)
diff --git a/games-util/slade/Manifest b/games-util/slade/Manifest
index 2ca180f19853..2349b328e65a 100644
--- a/games-util/slade/Manifest
+++ b/games-util/slade/Manifest
@@ -1 +1,2 @@
+DIST slade-3.2.0.tar.gz 6464839 BLAKE2B
8e13f153c64526784bd5fa3d03520942d9dbc1b0b0d1e4d0650fb91ed63a7f860655f5d580b4c0a04a52aa98f617b1f4448f47cd1e55c1b3f78fc552b8101654
SHA512
916be3b9556e76ca815514bb472335af80a72bfb8ecd0ae4287db2c0d6ad092a8ada1b335762f8589d300b1fd81adbdede3e6c315cfdc1d49b1624294b405b92
DIST slade-3.2.0_beta2.tar.gz 5999580 BLAKE2B
29cd515e4553fa1d74a43dc982b376b10d95ebbe2da4a25bc39329c15967466142c73ec134ada371b9aa65d8fc8d9f4a1820cece7fe8dca59fec039aaad32331
SHA512
e46d9664348233c7ee7fa8ed748d7e23914bb1bb6dd65d40aff7603b386e032e988e0990d4a435f597ba8a6416c7ec377c8334a66efacd55ebdd994d3fd11073
diff --git a/games-util/slade/files/slade-3.2.0-bundled-libs.patch
b/games-util/slade/files/slade-3.2.0-bundled-libs.patch
new file mode 100644
index ..c4eae37f945f
--- /dev/null
+++ b/games-util/slade/files/slade-3.2.0-bundled-libs.patch
@@ -0,0 +1,84 @@
+From 5ecc80d27276ba978b8c0268aab722fe8f09b394 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot
+Date: Sat, 20 Feb 2021 12:22:24 +
+Subject: [PATCH] Unbundle the DUMB library
+
+---
+ src/Application/App.cpp | 2 +-
+ src/Audio/ModMusic.cpp| 2 +-
+ src/CMakeLists.txt| 4 +++-
+ thirdparty/CMakeLists.txt | 1 -
+ 4 files changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/src/Application/App.cpp b/src/Application/App.cpp
+index 936a8212..2960ca1d 100644
+--- a/src/Application/App.cpp
b/src/Application/App.cpp
+@@ -60,7 +60,7 @@
+ #include "UI/WxUtils.h"
+ #include "Utility/StringUtils.h"
+ #include "Utility/Tokenizer.h"
+-#include "thirdparty/dumb/dumb.h"
++#include
+ #include
+
+ using namespace slade;
+diff --git a/src/Audio/ModMusic.cpp b/src/Audio/ModMusic.cpp
+index cc4b60cf..6d54516d 100644
+--- a/src/Audio/ModMusic.cpp
b/src/Audio/ModMusic.cpp
+@@ -32,7 +32,7 @@
+ //
-
+ #include "Main.h"
+ #include "ModMusic.h"
+-#include "thirdparty/dumb/dumb.h"
++#include
+
+ using namespace slade;
+ using namespace audio;
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index fef3d009..5363802c 100644
+--- a/src/CMakeLists.txt
b/src/CMakeLists.txt
+@@ -107,6 +107,7 @@ if (NOT NO_LUA)
+ find_package(Lua REQUIRED)
+ endif()
+ find_package(MPG123 REQUIRED)
++pkg_check_modules(DUMB REQUIRED dumb>=1.0)
+ include_directories(
+ ${FREEIMAGE_INCLUDE_DIR}
+ ${SFML_INCLUDE_DIR}
+@@ -114,9 +115,9 @@ include_directories(
+ ${FTGL_INCLUDE_DIR}
+ ${LUA_INCLUDE_DIR}
+ ${MPG123_INCLUDE_DIR}
++ ${DUMB_INCLUDE_DIRS}
+ .
+ ..
+- ../thirdparty/dumb
+ ../thirdparty/glad/include
+ ./Application
+ )
+@@ -201,6 +202,7 @@ target_link_libraries(slade
+ ${OPENGL_LIBRARIES}
+ ${LUA_LIBRARIES}
+ ${MPG123_LIBRARIES}
++ ${DUMB_LIBRARIES}
+ )
+
+ if(LINUX)
+diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt
+index f84cfc8a..2622852b 100644
+--- a/thirdparty/CMakeLists.txt
b/thirdparty/CMakeLists.txt
+@@ -10,7 +10,6 @@ set(BZIP2_LIBRARIES ${BZIP2_LIBRARIES} PARENT_SCOPE)
+ set(EXTERNAL_SOURCES
+ )
+ file(GLOB_RECURSE EXTERNAL_SOURCES
+- dumb/*.c
+ lzma/C/LzmaDec.c
+ mus2mid/mus2mid.cpp
+ zreaders/*.cpp
+--
+2.34.1
+
diff --git a/games-util/slade/files/slade-3.2.0-wx3.0.patch
b/games-util/slade/files/slade-3.2.0-wx3.0.patch
new file mode 100644
index ..2e519b45181b
--- /dev/null
+++ b/games-util/slade/files/slade-3.2.0-wx3.0.patch
@@ -0,0 +1,66 @@
+From 45537095187cb5b985713e7558a230651b599589 Mon Sep 17 00:00:00 2001
+From: Simon Judd
+Date: Thu, 14 Apr 2022 21:52:16 -0700
+Subject: [PATCH] Keep up wx3.0 compatibility
+
+I'd like to drop it ideally, but for now it'll stay
+
+Fix #1336
+---
+ src/Graphics/Icons.cpp | 15 +++
+ src/UI/SAuiTabArt.cpp | 5 -
+ 2 files changed, 19 insertions(+), 1 deletion(-)
+
+diff --git a/src/Graphics/Icons.cpp b/src/Graphics/Icons.cpp
+index 61d5475c..67147f7e 100644
+--- a/src/Graphics/Icons.cpp
[gentoo-commits] repo/gentoo:master commit in: games-util/slade/files/, games-util/slade/
commit: 41b41a1cfc25f76cb30819ea4a470ba74818e216
Author: James Le Cuirot gentoo org>
AuthorDate: Sat Apr 16 08:09:14 2022 +
Commit: James Le Cuirot gentoo org>
CommitDate: Sat Apr 16 08:09:14 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41b41a1c
games-util/slade: Drop old 3.2.0_beta2
Signed-off-by: James Le Cuirot gentoo.org>
games-util/slade/Manifest | 1 -
.../files/slade-3.2.0_beta2-bundled-libs.patch | 85 --
games-util/slade/slade-3.2.0_beta2.ebuild | 77
3 files changed, 163 deletions(-)
diff --git a/games-util/slade/Manifest b/games-util/slade/Manifest
index 2349b328e65a..893f5cf476e8 100644
--- a/games-util/slade/Manifest
+++ b/games-util/slade/Manifest
@@ -1,2 +1 @@
DIST slade-3.2.0.tar.gz 6464839 BLAKE2B
8e13f153c64526784bd5fa3d03520942d9dbc1b0b0d1e4d0650fb91ed63a7f860655f5d580b4c0a04a52aa98f617b1f4448f47cd1e55c1b3f78fc552b8101654
SHA512
916be3b9556e76ca815514bb472335af80a72bfb8ecd0ae4287db2c0d6ad092a8ada1b335762f8589d300b1fd81adbdede3e6c315cfdc1d49b1624294b405b92
-DIST slade-3.2.0_beta2.tar.gz 5999580 BLAKE2B
29cd515e4553fa1d74a43dc982b376b10d95ebbe2da4a25bc39329c15967466142c73ec134ada371b9aa65d8fc8d9f4a1820cece7fe8dca59fec039aaad32331
SHA512
e46d9664348233c7ee7fa8ed748d7e23914bb1bb6dd65d40aff7603b386e032e988e0990d4a435f597ba8a6416c7ec377c8334a66efacd55ebdd994d3fd11073
diff --git a/games-util/slade/files/slade-3.2.0_beta2-bundled-libs.patch
b/games-util/slade/files/slade-3.2.0_beta2-bundled-libs.patch
deleted file mode 100644
index 4474ab783d47..
--- a/games-util/slade/files/slade-3.2.0_beta2-bundled-libs.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From a22553a612ade8a5e3f90c84166e9fdda16635c9 Mon Sep 17 00:00:00 2001
-From: James Le Cuirot
-Date: Sat, 20 Feb 2021 12:22:24 +
-Subject: [PATCH] Unbundle the DUMB library
-
- src/Application/App.cpp | 2 +-
- src/Audio/ModMusic.cpp| 2 +-
- src/CMakeLists.txt| 4 +++-
- thirdparty/CMakeLists.txt | 2 --
- 4 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/Application/App.cpp b/src/Application/App.cpp
-index 3d4dcc1d..d2c3e583 100644
a/src/Application/App.cpp
-+++ b/src/Application/App.cpp
-@@ -60,7 +60,7 @@
- #include "UI/WxUtils.h"
- #include "Utility/StringUtils.h"
- #include "Utility/Tokenizer.h"
--#include "thirdparty/dumb/dumb.h"
-+#include
- #include
-
- using namespace slade;
-diff --git a/src/Audio/ModMusic.cpp b/src/Audio/ModMusic.cpp
-index cb8eef8c..2d368fdb 100644
a/src/Audio/ModMusic.cpp
-+++ b/src/Audio/ModMusic.cpp
-@@ -32,7 +32,7 @@
- //
-
- #include "Main.h"
- #include "ModMusic.h"
--#include "thirdparty/dumb/dumb.h"
-+#include
-
- using namespace slade;
- using namespace audio;
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 802598f6..222e6040 100644
a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -110,6 +110,7 @@ endif()
- pkg_check_modules(fmt REQUIRED fmt>=6)
- include_directories(${fmt_INCLUDE_DIRS})
- find_package(MPG123 REQUIRED)
-+pkg_check_modules(DUMB REQUIRED dumb>=1.0)
- include_directories(
- ${FREEIMAGE_INCLUDE_DIR}
- ${SFML_INCLUDE_DIR}
-@@ -118,9 +119,9 @@ include_directories(
- ${CURL_INCLUDE_DIR}
- ${LUA_INCLUDE_DIR}
- ${MPG123_INCLUDE_DIR}
-+ ${DUMB_INCLUDE_DIRS}
- .
- ..
-- ../thirdparty/dumb
- ./Application
- )
-
-@@ -200,6 +201,7 @@ target_link_libraries(slade
- ${CURL_LIBRARIES}
- ${LUA_LIBRARIES}
- ${MPG123_LIBRARIES}
-+ ${DUMB_LIBRARIES}
- ${fmt_LIBRARIES}
- -lstdc++fs
- )
-diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt
-index 6b0eb504..a3757c91 100644
a/thirdparty/CMakeLists.txt
-+++ b/thirdparty/CMakeLists.txt
-@@ -12,8 +12,6 @@ set(EXTERNAL_SOURCES
- file(GLOB_RECURSE EXTERNAL_SOURCES
- *.cpp
- *.cxx
-- dumb/*.c
-- lua/*.c
- lzma/C/LzmaDec.c
- fmt/*.cc
- ${SLADE_HEADERS}
---
-2.30.0
-
diff --git a/games-util/slade/slade-3.2.0_beta2.ebuild
b/games-util/slade/slade-3.2.0_beta2.ebuild
deleted file mode 100644
index c11364215f02..
--- a/games-util/slade/slade-3.2.0_beta2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..3} )
-WX_GTK_VER="3.0-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"
-LICENSE="GPL-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="fluidsynth timidity webkit"
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-
-DEPEND="
- ${LUA_DEPS}
- app-arch/bzip2:=
-
[gentoo-commits] repo/gentoo:master commit in: games-util/slade/, games-util/slade/files/
commit: 3ffd5d80b86cd45c8ff06d57ea233262819be3db
Author: James Le Cuirot gentoo org>
AuthorDate: Wed Feb 24 20:29:08 2021 +
Commit: James Le Cuirot gentoo org>
CommitDate: Wed Feb 24 20:47:17 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ffd5d80
games-util/slade: Drop old 3.1.12a as it is broken with newer GCC
Package-Manager: Portage-3.0.15, Repoman-3.0.2
Signed-off-by: James Le Cuirot gentoo.org>
games-util/slade/Manifest | 1 -
.../slade/files/slade-3.1.12a-bundled-libs.patch | 80 ---
.../files/slade-3.1.12a-cmake-lua-version.patch| 11 --
.../files/slade-3.1.12a-fluidsynth-driver.patch| 14 ---
.../slade/files/slade-3.1.12a-freetype-deps.patch | 74 --
.../slade/files/slade-3.1.12a-sfml-gtk3.patch | 88
.../slade/files/slade-3.1.12a-wxGLCanvas.patch | 112 -
games-util/slade/slade-3.1.12a-r100.ebuild | 72 -
games-util/slade/slade-3.1.12a.ebuild | 67
9 files changed, 519 deletions(-)
diff --git a/games-util/slade/Manifest b/games-util/slade/Manifest
index ae854cd594a..2ca180f1985 100644
--- a/games-util/slade/Manifest
+++ b/games-util/slade/Manifest
@@ -1,2 +1 @@
-DIST slade-3.1.12a.tar.gz 5883702 BLAKE2B
400cf032bf0b60555b45b450c524d85f145d593d74601461f33fa571360a0c66a1d5933a7d48e8cfad98981bcf446df213240f53da237be6d9a1ce09517c4566
SHA512
ecedec880b8ebed921e152d016a451164efd4de90ae69963be077d1ef39326670254ca8eb03e1045ca7ae5b02f7512dbbe712f83c845cbbd4ed787a90899ad13
DIST slade-3.2.0_beta2.tar.gz 5999580 BLAKE2B
29cd515e4553fa1d74a43dc982b376b10d95ebbe2da4a25bc39329c15967466142c73ec134ada371b9aa65d8fc8d9f4a1820cece7fe8dca59fec039aaad32331
SHA512
e46d9664348233c7ee7fa8ed748d7e23914bb1bb6dd65d40aff7603b386e032e988e0990d4a435f597ba8a6416c7ec377c8334a66efacd55ebdd994d3fd11073
diff --git a/games-util/slade/files/slade-3.1.12a-bundled-libs.patch
b/games-util/slade/files/slade-3.1.12a-bundled-libs.patch
deleted file mode 100644
index 6e8285d8105..000
--- a/games-util/slade/files/slade-3.1.12a-bundled-libs.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-diff -Naur a/src/Application/App.cpp b/src/Application/App.cpp
a/src/Application/App.cpp 2020-05-26 00:34:50.0 +0100
-+++ b/src/Application/App.cpp 2020-05-31 17:11:08.365000293 +0100
-@@ -34,7 +34,7 @@
- #include "App.h"
- #include "Archive/ArchiveManager.h"
- #include "Dialogs/SetupWizard/SetupWizardDialog.h"
--#include "External/dumb/dumb.h"
-+#include
- #include "Game/Configuration.h"
- #include "General/ColourConfiguration.h"
- #include "General/Console/Console.h"
-diff -Naur a/src/Audio/ModMusic.cpp b/src/Audio/ModMusic.cpp
a/src/Audio/ModMusic.cpp 2020-05-26 00:34:50.0 +0100
-+++ b/src/Audio/ModMusic.cpp 2020-05-31 17:11:08.365000293 +0100
-@@ -30,7 +30,7 @@
- ***/
- #include "Main.h"
- #include "ModMusic.h"
--#include "External/dumb/dumb.h"
-+#include
-
-
- /***
-diff -Naur a/src/CMakeLists.txt b/src/CMakeLists.txt
a/src/CMakeLists.txt 2020-05-26 00:34:50.0 +0100
-+++ b/src/CMakeLists.txt 2020-05-31 17:11:08.365000293 +0100
-@@ -105,6 +105,8 @@
- find_package(GLEW REQUIRED)
- find_package(Freetype REQUIRED)
- find_package(CURL REQUIRED)
-+find_package(Lua REQUIRED)
-+pkg_check_modules(DUMB REQUIRED dumb>=1.0)
- include_directories(
- ${FREEIMAGE_INCLUDE_DIR}
- ${SFML_INCLUDE_DIR}
-@@ -112,8 +114,9 @@
- ${FREETYPE_INCLUDE_DIRS}
- ${GLEW_INCLUDE_PATH}
- ${CURL_INCLUDE_DIR}
-+ ${LUA_INCLUDE_DIR}
-+ ${DUMB_INCLUDE_DIRS}
- .
-- ./External/dumb
- ./Application
- )
-
-@@ -182,6 +185,8 @@
- ${FREETYPE_LIBRARIES}
- ${GLEW_LIBRARY}
- ${CURL_LIBRARIES}
-+ ${LUA_LIBRARIES}
-+ ${DUMB_LIBRARIES}
- )
-
- if (WX_GTK3)
-diff -Naur a/src/External/CMakeLists.txt b/src/External/CMakeLists.txt
a/src/External/CMakeLists.txt 2020-05-26 00:34:50.0 +0100
-+++ b/src/External/CMakeLists.txt 2020-05-31 17:12:09.614333605 +0100
-@@ -24,8 +24,6 @@
- file(GLOB_RECURSE EXTERNAL_SOURCES
- *.cpp
- *.cxx
-- dumb/*.c
-- lua/*.c
- lzma/C/LzmaDec.c
- ${SLADE_HEADERS}
- )
-diff -Naur a/src/External/sol/sol.hpp b/src/External/sol/sol.hpp
a/src/External/sol/sol.hpp 2020-05-26 00:34:50.0 +0100
-+++ b/src/External/sol/sol.hpp 2020-05-31 17:11:08.367000336 +0100
-@@ -798,7 +798,7 @@
- #include
- #include
- #else
--#include "External/lua/lua.hpp"
-+#include
- #endif // C++ Mangling for Lua
-
- #if defined(_WIN32) || defined(_MSC_VER)
diff --git a/games-util/slade/files/slade-3.1.12a-cmake-lua-version.patch
b/games-util/slade/files/slade-3.1.12a-cmake-lua-version.patch
deleted file mode 100644
index
[gentoo-commits] repo/gentoo:master commit in: games-util/slade/files/, games-util/slade/
commit: 9fe53fad1c74aa0b531e1fb9d9cb34be420500ad
Author: James Le Cuirot gentoo org>
AuthorDate: Wed Feb 24 20:28:17 2021 +
Commit: James Le Cuirot gentoo org>
CommitDate: Wed Feb 24 20:47:14 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fe53fad
games-util/slade: Bump to 3.2.0_beta2 that fixes build with newer GCC
Also enforce the Lua version without a patch.
Package-Manager: Portage-3.0.15, Repoman-3.0.2
Signed-off-by: James Le Cuirot gentoo.org>
games-util/slade/Manifest | 1 +
.../files/slade-3.2.0_beta2-bundled-libs.patch | 85 ++
.../slade-3.2.0_beta2-fluidsynth-driver.patch | 27 +++
games-util/slade/slade-3.2.0_beta2.ebuild | 77
4 files changed, 190 insertions(+)
diff --git a/games-util/slade/Manifest b/games-util/slade/Manifest
index be9e5aaa542..ae854cd594a 100644
--- a/games-util/slade/Manifest
+++ b/games-util/slade/Manifest
@@ -1 +1,2 @@
DIST slade-3.1.12a.tar.gz 5883702 BLAKE2B
400cf032bf0b60555b45b450c524d85f145d593d74601461f33fa571360a0c66a1d5933a7d48e8cfad98981bcf446df213240f53da237be6d9a1ce09517c4566
SHA512
ecedec880b8ebed921e152d016a451164efd4de90ae69963be077d1ef39326670254ca8eb03e1045ca7ae5b02f7512dbbe712f83c845cbbd4ed787a90899ad13
+DIST slade-3.2.0_beta2.tar.gz 5999580 BLAKE2B
29cd515e4553fa1d74a43dc982b376b10d95ebbe2da4a25bc39329c15967466142c73ec134ada371b9aa65d8fc8d9f4a1820cece7fe8dca59fec039aaad32331
SHA512
e46d9664348233c7ee7fa8ed748d7e23914bb1bb6dd65d40aff7603b386e032e988e0990d4a435f597ba8a6416c7ec377c8334a66efacd55ebdd994d3fd11073
diff --git a/games-util/slade/files/slade-3.2.0_beta2-bundled-libs.patch
b/games-util/slade/files/slade-3.2.0_beta2-bundled-libs.patch
new file mode 100644
index 000..4474ab783d4
--- /dev/null
+++ b/games-util/slade/files/slade-3.2.0_beta2-bundled-libs.patch
@@ -0,0 +1,85 @@
+From a22553a612ade8a5e3f90c84166e9fdda16635c9 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot
+Date: Sat, 20 Feb 2021 12:22:24 +
+Subject: [PATCH] Unbundle the DUMB library
+
+---
+ src/Application/App.cpp | 2 +-
+ src/Audio/ModMusic.cpp| 2 +-
+ src/CMakeLists.txt| 4 +++-
+ thirdparty/CMakeLists.txt | 2 --
+ 4 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/Application/App.cpp b/src/Application/App.cpp
+index 3d4dcc1d..d2c3e583 100644
+--- a/src/Application/App.cpp
b/src/Application/App.cpp
+@@ -60,7 +60,7 @@
+ #include "UI/WxUtils.h"
+ #include "Utility/StringUtils.h"
+ #include "Utility/Tokenizer.h"
+-#include "thirdparty/dumb/dumb.h"
++#include
+ #include
+
+ using namespace slade;
+diff --git a/src/Audio/ModMusic.cpp b/src/Audio/ModMusic.cpp
+index cb8eef8c..2d368fdb 100644
+--- a/src/Audio/ModMusic.cpp
b/src/Audio/ModMusic.cpp
+@@ -32,7 +32,7 @@
+ //
-
+ #include "Main.h"
+ #include "ModMusic.h"
+-#include "thirdparty/dumb/dumb.h"
++#include
+
+ using namespace slade;
+ using namespace audio;
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 802598f6..222e6040 100644
+--- a/src/CMakeLists.txt
b/src/CMakeLists.txt
+@@ -110,6 +110,7 @@ endif()
+ pkg_check_modules(fmt REQUIRED fmt>=6)
+ include_directories(${fmt_INCLUDE_DIRS})
+ find_package(MPG123 REQUIRED)
++pkg_check_modules(DUMB REQUIRED dumb>=1.0)
+ include_directories(
+ ${FREEIMAGE_INCLUDE_DIR}
+ ${SFML_INCLUDE_DIR}
+@@ -118,9 +119,9 @@ include_directories(
+ ${CURL_INCLUDE_DIR}
+ ${LUA_INCLUDE_DIR}
+ ${MPG123_INCLUDE_DIR}
++ ${DUMB_INCLUDE_DIRS}
+ .
+ ..
+- ../thirdparty/dumb
+ ./Application
+ )
+
+@@ -200,6 +201,7 @@ target_link_libraries(slade
+ ${CURL_LIBRARIES}
+ ${LUA_LIBRARIES}
+ ${MPG123_LIBRARIES}
++ ${DUMB_LIBRARIES}
+ ${fmt_LIBRARIES}
+ -lstdc++fs
+ )
+diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt
+index 6b0eb504..a3757c91 100644
+--- a/thirdparty/CMakeLists.txt
b/thirdparty/CMakeLists.txt
+@@ -12,8 +12,6 @@ set(EXTERNAL_SOURCES
+ file(GLOB_RECURSE EXTERNAL_SOURCES
+ *.cpp
+ *.cxx
+- dumb/*.c
+- lua/*.c
+ lzma/C/LzmaDec.c
+ fmt/*.cc
+ ${SLADE_HEADERS}
+--
+2.30.0
+
diff --git a/games-util/slade/files/slade-3.2.0_beta2-fluidsynth-driver.patch
b/games-util/slade/files/slade-3.2.0_beta2-fluidsynth-driver.patch
new file mode 100644
index 000..bd828d81b39
--- /dev/null
+++ b/games-util/slade/files/slade-3.2.0_beta2-fluidsynth-driver.patch
@@ -0,0 +1,27 @@
+From dc0057d1200f9bb6b67f1b1a2094b7e402d1d370 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot
+Date: Sat, 20 Feb 2021 12:28:48 +
+Subject: [PATCH] Don't force FluidSynth to use ALSA on Linux
+
+---
+ src/Audio/MIDIPlayer.cpp | 4
+ 1 file changed, 4 deletions(-)
+
+diff --git a/src/Audio/MIDIPlayer.cpp b/src/Audio/MIDIPlayer.cpp
+index bb001339..f33ffe67 100644
+---
[gentoo-commits] repo/gentoo:master commit in: games-util/slade/
commit: 02cb1f049e6b4d6f8aa720945a3bb98353769663
Author: James Le Cuirot gentoo org>
AuthorDate: Thu Jul 2 22:49:18 2020 +
Commit: James Le Cuirot gentoo org>
CommitDate: Thu Jul 2 22:50:13 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02cb1f04
games-util/slade: Add missing gstreamer flag on wxGTK dep
It's not obvious but this flag enables wxMediaCtrl, which is
referenced in the SLADE code.
Closes: https://bugs.gentoo.org/730174
Package-Manager: Portage-2.3.103, Repoman-2.3.22
Signed-off-by: James Le Cuirot gentoo.org>
games-util/slade/slade-3.1.12a.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/games-util/slade/slade-3.1.12a.ebuild
b/games-util/slade/slade-3.1.12a.ebuild
index 641a17fb010..3ddd53ebe75 100644
--- a/games-util/slade/slade-3.1.12a.ebuild
+++ b/games-util/slade/slade-3.1.12a.ebuild
@@ -23,7 +23,7 @@ DEPEND="
media-libs/libsfml:=
net-misc/curl
sys-libs/zlib
- x11-libs/wxGTK:${WX_GTK_VER}[opengl,webkit?,X]
+ x11-libs/wxGTK:${WX_GTK_VER}[gstreamer,opengl,webkit?,X]
fluidsynth? ( media-sound/fluidsynth:= )
"
[gentoo-commits] repo/gentoo:master commit in: games-util/slade/
commit: 86a295beeb833b54036e213b2f50c982e33a20d0
Author: James Le Cuirot gentoo org>
AuthorDate: Mon Jun 1 20:49:20 2020 +
Commit: James Le Cuirot gentoo org>
CommitDate: Mon Jun 1 20:49:20 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86a295be
games-util/slade: Fix missing USE flags on wxGTK dependency
Closes: https://bugs.gentoo.org/726694
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: James Le Cuirot gentoo.org>
games-util/slade/slade-3.1.12a.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/games-util/slade/slade-3.1.12a.ebuild
b/games-util/slade/slade-3.1.12a.ebuild
index b204c6c7870..641a17fb010 100644
--- a/games-util/slade/slade-3.1.12a.ebuild
+++ b/games-util/slade/slade-3.1.12a.ebuild
@@ -23,7 +23,7 @@ DEPEND="
media-libs/libsfml:=
net-misc/curl
sys-libs/zlib
- x11-libs/wxGTK:${WX_GTK_VER}[webkit?]
+ x11-libs/wxGTK:${WX_GTK_VER}[opengl,webkit?,X]
fluidsynth? ( media-sound/fluidsynth:= )
"
[gentoo-commits] repo/gentoo:master commit in: games-util/slade/, games-util/slade/files/
commit: 0a09ba651e97e88364fc3d9c098af10635c99101
Author: James Le Cuirot gentoo org>
AuthorDate: Sun May 31 21:12:08 2020 +
Commit: James Le Cuirot gentoo org>
CommitDate: Sun May 31 21:12:08 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a09ba65
games-util/slade: New package
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: James Le Cuirot gentoo.org>
games-util/slade/Manifest | 1 +
.../slade/files/slade-3.1.12a-bundled-libs.patch | 80 +++
.../files/slade-3.1.12a-fluidsynth-driver.patch| 14 +++
.../slade/files/slade-3.1.12a-freetype-deps.patch | 74 ++
.../slade/files/slade-3.1.12a-sfml-gtk3.patch | 88
.../slade/files/slade-3.1.12a-wxGLCanvas.patch | 112 +
games-util/slade/metadata.xml | 14 +++
games-util/slade/slade-3.1.12a.ebuild | 67
8 files changed, 450 insertions(+)
diff --git a/games-util/slade/Manifest b/games-util/slade/Manifest
new file mode 100644
index 000..be9e5aaa542
--- /dev/null
+++ b/games-util/slade/Manifest
@@ -0,0 +1 @@
+DIST slade-3.1.12a.tar.gz 5883702 BLAKE2B
400cf032bf0b60555b45b450c524d85f145d593d74601461f33fa571360a0c66a1d5933a7d48e8cfad98981bcf446df213240f53da237be6d9a1ce09517c4566
SHA512
ecedec880b8ebed921e152d016a451164efd4de90ae69963be077d1ef39326670254ca8eb03e1045ca7ae5b02f7512dbbe712f83c845cbbd4ed787a90899ad13
diff --git a/games-util/slade/files/slade-3.1.12a-bundled-libs.patch
b/games-util/slade/files/slade-3.1.12a-bundled-libs.patch
new file mode 100644
index 000..6e8285d8105
--- /dev/null
+++ b/games-util/slade/files/slade-3.1.12a-bundled-libs.patch
@@ -0,0 +1,80 @@
+diff -Naur a/src/Application/App.cpp b/src/Application/App.cpp
+--- a/src/Application/App.cpp 2020-05-26 00:34:50.0 +0100
b/src/Application/App.cpp 2020-05-31 17:11:08.365000293 +0100
+@@ -34,7 +34,7 @@
+ #include "App.h"
+ #include "Archive/ArchiveManager.h"
+ #include "Dialogs/SetupWizard/SetupWizardDialog.h"
+-#include "External/dumb/dumb.h"
++#include
+ #include "Game/Configuration.h"
+ #include "General/ColourConfiguration.h"
+ #include "General/Console/Console.h"
+diff -Naur a/src/Audio/ModMusic.cpp b/src/Audio/ModMusic.cpp
+--- a/src/Audio/ModMusic.cpp 2020-05-26 00:34:50.0 +0100
b/src/Audio/ModMusic.cpp 2020-05-31 17:11:08.365000293 +0100
+@@ -30,7 +30,7 @@
+ ***/
+ #include "Main.h"
+ #include "ModMusic.h"
+-#include "External/dumb/dumb.h"
++#include
+
+
+ /***
+diff -Naur a/src/CMakeLists.txt b/src/CMakeLists.txt
+--- a/src/CMakeLists.txt 2020-05-26 00:34:50.0 +0100
b/src/CMakeLists.txt 2020-05-31 17:11:08.365000293 +0100
+@@ -105,6 +105,8 @@
+ find_package(GLEW REQUIRED)
+ find_package(Freetype REQUIRED)
+ find_package(CURL REQUIRED)
++find_package(Lua REQUIRED)
++pkg_check_modules(DUMB REQUIRED dumb>=1.0)
+ include_directories(
+ ${FREEIMAGE_INCLUDE_DIR}
+ ${SFML_INCLUDE_DIR}
+@@ -112,8 +114,9 @@
+ ${FREETYPE_INCLUDE_DIRS}
+ ${GLEW_INCLUDE_PATH}
+ ${CURL_INCLUDE_DIR}
++ ${LUA_INCLUDE_DIR}
++ ${DUMB_INCLUDE_DIRS}
+ .
+- ./External/dumb
+ ./Application
+ )
+
+@@ -182,6 +185,8 @@
+ ${FREETYPE_LIBRARIES}
+ ${GLEW_LIBRARY}
+ ${CURL_LIBRARIES}
++ ${LUA_LIBRARIES}
++ ${DUMB_LIBRARIES}
+ )
+
+ if (WX_GTK3)
+diff -Naur a/src/External/CMakeLists.txt b/src/External/CMakeLists.txt
+--- a/src/External/CMakeLists.txt 2020-05-26 00:34:50.0 +0100
b/src/External/CMakeLists.txt 2020-05-31 17:12:09.614333605 +0100
+@@ -24,8 +24,6 @@
+ file(GLOB_RECURSE EXTERNAL_SOURCES
+ *.cpp
+ *.cxx
+- dumb/*.c
+- lua/*.c
+ lzma/C/LzmaDec.c
+ ${SLADE_HEADERS}
+ )
+diff -Naur a/src/External/sol/sol.hpp b/src/External/sol/sol.hpp
+--- a/src/External/sol/sol.hpp 2020-05-26 00:34:50.0 +0100
b/src/External/sol/sol.hpp 2020-05-31 17:11:08.367000336 +0100
+@@ -798,7 +798,7 @@
+ #include
+ #include
+ #else
+-#include "External/lua/lua.hpp"
++#include
+ #endif // C++ Mangling for Lua
+
+ #if defined(_WIN32) || defined(_MSC_VER)
diff --git a/games-util/slade/files/slade-3.1.12a-fluidsynth-driver.patch
b/games-util/slade/files/slade-3.1.12a-fluidsynth-driver.patch
new file mode 100644
index 000..c0ef70d6dfc
--- /dev/null
+++ b/games-util/slade/files/slade-3.1.12a-fluidsynth-driver.patch
@@ -0,0 +1,14 @@
+https://github.com/sirjuddington/SLADE/issues/1147
+
+diff -Naur a/src/Audio/MIDIPlayer.cpp b/src/Audio/MIDIPlayer.cpp
+--- a/src/Audio/MIDIPlayer.cpp 2020-05-28 00:08:34.0 +0100
b/src/Audio/MIDIPlayer.cpp 2020-05-31 21:40:03.480211253 +0100
+@@ -74,8 +74,6 @@
+ #ifndef NO_FLUIDSYNTH
+ // Set fluidsynth
