* [gentoo-commits] repo/gentoo:master commit in: games-util/slade/files/, games-util/slade/
@ 2021-02-24 20:47 James Le Cuirot
0 siblings, 0 replies; 6+ messages in thread
From: James Le Cuirot @ 2021-02-24 20:47 UTC (permalink / raw
To: gentoo-commits
commit: 9fe53fad1c74aa0b531e1fb9d9cb34be420500ad
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 24 20:28:17 2021 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Wed Feb 24 20:47:14 2021 +0000
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 <chewi <AT> 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 00000000000..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 <chewi@gentoo.org>
+Date: Sat, 20 Feb 2021 12:22:24 +0000
+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 <dumb.h>
+ #include <filesystem>
+
+ 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 <dumb.h>
+
+ 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 00000000000..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 <chewi@gentoo.org>
+Date: Sat, 20 Feb 2021 12:28:48 +0000
+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
+--- a/src/Audio/MIDIPlayer.cpp
++++ b/src/Audio/MIDIPlayer.cpp
+@@ -344,10 +344,6 @@ public:
+ fs_initialised_ = false;
+ file_ = "";
+
+- // Set fluidsynth driver to alsa in linux (no idea why it defaults to jack)
+- if (app::platform() == app::Platform::Linux && fs_driver.value.empty())
+- fs_driver = "alsa";
+-
+ // Init soundfont path
+ if (fs_soundfont_path.value.empty())
+ {
+--
+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
new file mode 100644
index 00000000000..c11364215f0
--- /dev/null
+++ b/games-util/slade/slade-3.2.0_beta2.ebuild
@@ -0,0 +1,77 @@
+# 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:=
+ 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}"/${P}-bundled-libs.patch
+ "${FILESDIR}"/${P}-fluidsynth-driver.patch
+)
+
+src_prepare() {
+ cmake_src_prepare
+
+ # Delete bundled libraries just in case.
+ rm -r thirdparty/dumb/ || 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_FLUIDSYNTH=$(usex fluidsynth OFF ON)
+ -DNO_WEBVIEW=$(usex webkit OFF ON)
+ -DUSE_SFML_RENDERWINDOW=ON
+ -DWX_GTK3=ON
+ )
+
+ setup-wxwidgets
+ cmake_src_configure
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: games-util/slade/files/, games-util/slade/
@ 2022-04-16 8:09 James Le Cuirot
0 siblings, 0 replies; 6+ messages in thread
From: James Le Cuirot @ 2022-04-16 8:09 UTC (permalink / raw
To: gentoo-commits
commit: 41b41a1cfc25f76cb30819ea4a470ba74818e216
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 16 08:09:14 2022 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Apr 16 08:09:14 2022 +0000
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 <chewi <AT> 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..000000000000
--- 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 <chewi@gentoo.org>
-Date: Sat, 20 Feb 2021 12:22:24 +0000
-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 <dumb.h>
- #include <filesystem>
-
- 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 <dumb.h>
-
- 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..000000000000
--- 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:=
- 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}"/${P}-bundled-libs.patch
- "${FILESDIR}"/${P}-fluidsynth-driver.patch
-)
-
-src_prepare() {
- cmake_src_prepare
-
- # Delete bundled libraries just in case.
- rm -r thirdparty/dumb/ || 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_FLUIDSYNTH=$(usex fluidsynth OFF ON)
- -DNO_WEBVIEW=$(usex webkit OFF ON)
- -DUSE_SFML_RENDERWINDOW=ON
- -DWX_GTK3=ON
- )
-
- setup-wxwidgets
- cmake_src_configure
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: games-util/slade/files/, games-util/slade/
@ 2023-04-08 22:08 James Le Cuirot
0 siblings, 0 replies; 6+ messages in thread
From: James Le Cuirot @ 2023-04-08 22:08 UTC (permalink / raw
To: gentoo-commits
commit: 1669592bf97679ca6a94f4bc466b3e8acd540a5d
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 8 22:08:40 2023 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Apr 8 22:08:40 2023 +0000
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 <chewi <AT> 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 000000000000..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 <gdk/gdk.h>
++
++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() {
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: games-util/slade/files/, games-util/slade/
@ 2023-07-12 20:50 James Le Cuirot
0 siblings, 0 replies; 6+ messages in thread
From: James Le Cuirot @ 2023-07-12 20:50 UTC (permalink / raw
To: gentoo-commits
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
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: games-util/slade/files/, games-util/slade/
@ 2024-11-23 21:25 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2024-11-23 21:25 UTC (permalink / raw
To: gentoo-commits
commit: 7e5dd0f48556372ba10313ffc50ca05f4c072eea
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 23 21:20:14 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Nov 23 21:24:56 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e5dd0f4
games-util/slade: fix build
"Fixes ambiguity of addActionGroup calls.
In all addActionGroup calls with ambiguous usage, use a vector of strings
to disambiguate."
Closes: https://bugs.gentoo.org/938887
Thanks-to: Chase
Signed-off-by: Sam James <sam <AT> gentoo.org>
games-util/slade/files/slade-3.2.4-compile.patch | 64 ++++++++++++++++++++++++
games-util/slade/slade-3.2.4-r1.ebuild | 1 +
2 files changed, 65 insertions(+)
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/slade-3.2.4-r1.ebuild b/games-util/slade/slade-3.2.4-r1.ebuild
index 06d0d3eeef76..5e70fd0ab9a4 100644
--- a/games-util/slade/slade-3.2.4-r1.ebuild
+++ b/games-util/slade/slade-3.2.4-r1.ebuild
@@ -49,6 +49,7 @@ 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() {
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: games-util/slade/files/, games-util/slade/
@ 2024-11-23 22:23 James Le Cuirot
0 siblings, 0 replies; 6+ messages in thread
From: James Le Cuirot @ 2024-11-23 22:23 UTC (permalink / raw
To: gentoo-commits
commit: 99d6e1f030642c03a3d25603c0edd4dff2abc26c
Author: Kacper Słomiński <kacper.slominski72 <AT> gmail <DOT> com>
AuthorDate: Sat Nov 23 21:44:09 2024 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Nov 23 22:23:00 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99d6e1f0
games-util/slade: add 3.2.6
Fixes build issues caused by newer wxGTK.
Also add wxGTK[curl(+)] USE dependency since that's needed for
>=3.2.2.1-r5. Also inherit from xdg eclass for pkg_postinst and
pkg_postrm since the .desktop file registers handling for .wad
(application/x-doom-wad) files. Also add a patch to fix a build issue in
the bundled sol2 with newer GCC/Clang.
Bug: https://github.com/sirjuddington/SLADE/issues/1750
Bug: https://bugs.gentoo.org/938887
Signed-off-by: Kacper Słomiński <kacper.slominski72 <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/39438
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
games-util/slade/Manifest | 1 +
games-util/slade/files/slade-3.2.6-fix-sol.patch | 14 ++++
games-util/slade/slade-3.2.6.ebuild | 82 ++++++++++++++++++++++++
3 files changed, 97 insertions(+)
diff --git a/games-util/slade/Manifest b/games-util/slade/Manifest
index 22d22f12f254..244f6242c017 100644
--- a/games-util/slade/Manifest
+++ b/games-util/slade/Manifest
@@ -1 +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
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.6.ebuild b/games-util/slade/slade-3.2.6.ebuild
new file mode 100644
index 000000000000..22f6c0975984
--- /dev/null
+++ b/games-util/slade/slade-3.2.6.ebuild
@@ -0,0 +1,82 @@
+# 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"
+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
+"
+
+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.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
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-11-23 22:23 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-02-24 20:47 [gentoo-commits] repo/gentoo:master commit in: games-util/slade/files/, games-util/slade/ James Le Cuirot
-- strict thread matches above, loose matches on Subject: below --
2022-04-16 8:09 James Le Cuirot
2023-04-08 22:08 James Le Cuirot
2023-07-12 20:50 James Le Cuirot
2024-11-23 21:25 Sam James
2024-11-23 22:23 James Le Cuirot
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox