gentoo resync : 16.04.2022

4 files changed, 98 insertions, 31 deletions

diff --git a/games-util/slade/Manifest b/games-util/slade/Manifest
index af4347688ee7..2a03d834aa1e 100644
--- a/games-util/slade/Manifest
+++ b/games-util/slade/Manifest
@@ -1,5 +1,6 @@
-AUX slade-3.2.0_beta2-bundled-libs.patch 2225 BLAKE2B 047d402c6f8488f15e535712cdbcedb0c48304569b14b103ffcc71a5af8de1d2572491074ddfa1510d1a1db65ef4fa26e48e2c07872d6367bc640eeb1fdaf1f7 SHA512 527cc51b1f4046825d1e9eff54d8729016886c5f3e8f2f158ed53b66ae5e036878513e593797c0ac672ef5caa9d090f8ebc8aa7d7c8f4ea5f6d3c79b59f02697
+AUX slade-3.2.0-bundled-libs.patch 2238 BLAKE2B 06395fcbe6dbcd7e3e2e8651fa4386e9b244c2a8b1501195692e0f1f8c7fb5ab6ab1cf9487536599ccc5f1af0d396f2d7bd3ccee13fc7b5bdfe9c86d407629c6 SHA512 a905785b11686a54ec89ad3b2be8911fba6b8a52e2f1fee6ae21651e6f822ce3fc8d2615a55c339c2d7f2feb521bf2f8ff38e07330d8520e4319b0d1828f7b52
+AUX slade-3.2.0-wx3.0.patch 2195 BLAKE2B deda8df72b59972edf7faa8a6eff7932060daa9049d95d29caca9a07c84c6bf3103da1be0af89dbd02a1da709d8cf5f7529b10da0ca39c4d7924dfe0c5968d8e SHA512 30c016d285b08b604538979656c12bc25fc1d3de02f9b6f876fddc0ddd3ae315094973d5d642e35f9eead5afe3df67355240fb2e13e2ba1c395e85c003dc2fe6
 AUX slade-3.2.0_beta2-fluidsynth-driver.patch 790 BLAKE2B ea84ff6515b4b80cbce021624c27dbd4c067758b7e5861402d42628ddee85385a260396163838b1504e2196c3b275977ad5ddde3d684e49de600270d7990a1c0 SHA512 3de05beafc060891d674d388cbb07107ead138ef2a89812dfffabfc8c9de2beb939290b1064b75e14d3cc42621c8ee66ced06eacdcb2afd376a9539fa74c54c8
-DIST slade-3.2.0_beta2.tar.gz 5999580 BLAKE2B 29cd515e4553fa1d74a43dc982b376b10d95ebbe2da4a25bc39329c15967466142c73ec134ada371b9aa65d8fc8d9f4a1820cece7fe8dca59fec039aaad32331 SHA512 e46d9664348233c7ee7fa8ed748d7e23914bb1bb6dd65d40aff7603b386e032e988e0990d4a435f597ba8a6416c7ec377c8334a66efacd55ebdd994d3fd11073
-EBUILD slade-3.2.0_beta2.ebuild 1594 BLAKE2B c2e9c510d025c6004a449100176756df0cc2b43d9abae30f7996787a4f3daec9f22da2b6bd213346cdd2532bdc0a4f365e4ec5f18873965c5b76b4e8f32dbd67 SHA512 b633fc21b4787057b85cc6a3882221c4bc4bdb09cd98a080403f83b6e0e3bc5155b58b516c471153317db4546ab8dcd5e95324b04ba59339e3fa054b7d6df51d
+DIST slade-3.2.0.tar.gz 6464839 BLAKE2B 8e13f153c64526784bd5fa3d03520942d9dbc1b0b0d1e4d0650fb91ed63a7f860655f5d580b4c0a04a52aa98f617b1f4448f47cd1e55c1b3f78fc552b8101654 SHA512 916be3b9556e76ca815514bb472335af80a72bfb8ecd0ae4287db2c0d6ad092a8ada1b335762f8589d300b1fd81adbdede3e6c315cfdc1d49b1624294b405b92
+EBUILD slade-3.2.0.ebuild 1653 BLAKE2B 98be9416dd2f9a256b606defec8a11acaf8ca3f4f51cbd6cd129420cfeabcbcacf89d300307df091a3aefb2b6fcf45163068171171e64a5649c8276c6adc3526 SHA512 bbc8495ffbd1aaf525b2160640f45150a8ee3accd00a8eb7a340394d686d2e911c43a5d89a212356fc450eb905b2346f87ae329ebe9370f503af123253cdbf25
 MISC metadata.xml 457 BLAKE2B 241e53a5b4e6b85472c19b5431bae365eb740632cc71c9c2df1fb1f6c7f4875e8cb6d7ce17cddef12377a306c7abd8787a9f8e4cdd21b2b892d639ef68e8c077 SHA512 ae81e2d7faa90358dfd5f6511650de78fae50b7356609e7c54b635515e2fd9fb1348e9f34931e1cd82a3ad37206e47a64a02969c7762f38e62c32ffb5512b769
diff --git a/games-util/slade/files/slade-3.2.0_beta2-bundled-libs.patch b/games-util/slade/files/slade-3.2.0-bundled-libs.patch
index 4474ab783d47..c4eae37f945f 100644
--- a/games-util/slade/files/slade-3.2.0_beta2-bundled-libs.patch
+++ b/games-util/slade/files/slade-3.2.0-bundled-libs.patch
@@ -1,4 +1,4 @@
-From a22553a612ade8a5e3f90c84166e9fdda16635c9 Mon Sep 17 00:00:00 2001
+From 5ecc80d27276ba978b8c0268aab722fe8f09b394 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
@@ -7,11 +7,11 @@ 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(-)
+ thirdparty/CMakeLists.txt | 1 -
+ 4 files changed, 5 insertions(+), 4 deletions(-)
 
 diff --git a/src/Application/App.cpp b/src/Application/App.cpp
-index 3d4dcc1d..d2c3e583 100644
+index 936a8212..2960ca1d 100644
 --- a/src/Application/App.cpp
 +++ b/src/Application/App.cpp
 @@ -60,7 +60,7 @@
@@ -24,7 +24,7 @@ index 3d4dcc1d..d2c3e583 100644
  
  using namespace slade;
 diff --git a/src/Audio/ModMusic.cpp b/src/Audio/ModMusic.cpp
-index cb8eef8c..2d368fdb 100644
+index cc4b60cf..6d54516d 100644
 --- a/src/Audio/ModMusic.cpp
 +++ b/src/Audio/ModMusic.cpp
 @@ -32,7 +32,7 @@
@@ -37,49 +37,48 @@ index cb8eef8c..2d368fdb 100644
  using namespace slade;
  using namespace audio;
 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 802598f6..222e6040 100644
+index fef3d009..5363802c 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})
+@@ -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}
-@@ -118,9 +119,9 @@ include_directories(
- 	${CURL_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
  	)
- 
-@@ -200,6 +201,7 @@ target_link_libraries(slade
- 	${CURL_LIBRARIES}
+@@ -201,6 +202,7 @@ target_link_libraries(slade
+ 	${OPENGL_LIBRARIES}
  	${LUA_LIBRARIES}
  	${MPG123_LIBRARIES}
 +	${DUMB_LIBRARIES}
- 	${fmt_LIBRARIES}
- 	-lstdc++fs
  )
+ 
+ if(LINUX)
 diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt
-index 6b0eb504..a3757c91 100644
+index f84cfc8a..2622852b 100644
 --- a/thirdparty/CMakeLists.txt
 +++ b/thirdparty/CMakeLists.txt
-@@ -12,8 +12,6 @@ set(EXTERNAL_SOURCES
+@@ -10,7 +10,6 @@ set(BZIP2_LIBRARIES ${BZIP2_LIBRARIES} PARENT_SCOPE)
+ set(EXTERNAL_SOURCES
+ )
  file(GLOB_RECURSE EXTERNAL_SOURCES
- 	*.cpp
- 	*.cxx
 -	dumb/*.c
--	lua/*.c
  	lzma/C/LzmaDec.c
- 	fmt/*.cc
- 	${SLADE_HEADERS}
+ 	mus2mid/mus2mid.cpp
+ 	zreaders/*.cpp
 -- 
-2.30.0
+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 000000000000..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 <sirjuddington@gmail.com>
+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_beta2.ebuild b/games-util/slade/slade-3.2.0.ebuild
index c11364215f02..76979d24ed46 100644
--- a/games-util/slade/slade-3.2.0_beta2.ebuild
+++ b/games-util/slade/slade-3.2.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 LUA_COMPAT=( lua5-{1..3} )
 WX_GTK_VER="3.0-gtk3"
@@ -46,8 +46,9 @@ BDEPEND="
 S="${WORKDIR}/${PN^^}-${MY_PV}"
 
 PATCHES=(
-	"${FILESDIR}"/${P}-bundled-libs.patch
-	"${FILESDIR}"/${P}-fluidsynth-driver.patch
+	"${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() {