commit: 8b5db6b04abe3a2561932cd23652cb0179a38332 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> AuthorDate: Wed Jul 12 20:49:44 2023 +0000 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> CommitDate: Wed Jul 12 20:49:44 2023 +0000 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 <chewi <AT> 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..000000000000 --- 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 <dumb.h> - #include <filesystem> - - 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 <dumb.h> - - 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 <fmt/format.h> - - 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 <fmt/chrono.h> -+#include <fmt/format.h> - #include <fstream> - - 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 <fmt/format.h> - - 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<TextBox>( -- 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 -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()); -+ auto name = fmt::format("[{}]", name_.mb_str()); - if (hide) - tb_hidden += name; - else -diff --git a/src/common.h b/src/common.h -index 8c3c4b3b..d66cbc04 100644 ---- a/src/common.h -+++ b/src/common.h -@@ -129,7 +129,7 @@ - #endif - - // fmt --#include "thirdparty/fmt/include/fmt/core.h" -+#include <fmt/core.h> - - // Sigslot - #include "thirdparty/sigslot/signal.hpp" -diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt -index f84cfc8a..6cb9e0af 100644 ---- a/thirdparty/CMakeLists.txt -+++ b/thirdparty/CMakeLists.txt -@@ -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) -+else() -+ file(GLOB_RECURSE DUMB_SOURCES dumb/*.c) -+endif() -+ - # Roll the rest up into a big ball and compile it by itself - set(EXTERNAL_SOURCES - ) - file(GLOB_RECURSE EXTERNAL_SOURCES -- dumb/*.c - lzma/C/LzmaDec.c - mus2mid/mus2mid.cpp - zreaders/*.cpp - glad/src/*.c -+ ${DUMB_SOURCES} - ${SLADE_HEADERS} - ) - - # Add fmt --add_subdirectory(fmt) -+option(USE_SYSTEM_FMT "Use system fmt library" OFF) -+if(USE_SYSTEM_FMT) -+ find_package(fmt REQUIRED) -+else() -+ 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}) - set(EXTERNAL_LIBRARIES external PARENT_SCOPE) -+ -+if(USE_SYSTEM_DUMB) -+ target_link_libraries(external PkgConfig::DUMB) -+else() -+ target_include_directories(external PUBLIC ${CMAKE_CURRENT_LIST_DIR}/dumb) -+endif() diff --git a/games-util/slade/slade-3.2.1-r1.ebuild b/games-util/slade/slade-3.2.1-r1.ebuild deleted file mode 100644 index 75ed0c04389d..000000000000 --- a/games-util/slade/slade-3.2.1-r1.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2022 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" - -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-bundled-libs.patch - "${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 -} diff --git a/games-util/slade/slade-3.2.2.ebuild b/games-util/slade/slade-3.2.2.ebuild deleted file mode 100644 index 48395e6d88fa..000000000000 --- a/games-util/slade/slade-3.2.2.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# 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 -}
