commit: e2c805c2acecbae4a7920d6b9b5b9ca2254f3e23
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 28 08:11:09 2022 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Tue Jun 28 08:14:53 2022 +0000
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 <chewi <AT> 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..000000000000
--- 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 <[email protected]>
-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(&fg_r, &fg_g, &fg_b);
-+ wxColour::MakeGrey(&bg_r, &bg_g, &bg_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() {
