games-engines/odamex: Bump to 10.3.0, drop old 10.0.0

Thanks to Mike Wood for the ebuild. Upstream merged most of our patches. I have
bumped wxGTK to 3.2.

Closes: https://bugs.gentoo.org/906221
Signed-off-by: James Le Cuirot <chewi@gentoo.org>

9 files changed, 25 insertions, 337 deletions

diff --git a/games-engines/odamex/Manifest b/games-engines/odamex/Manifest
index cf41cb20eab0..c2381d9c7a73 100644
--- a/games-engines/odamex/Manifest
+++ b/games-engines/odamex/Manifest
@@ -1 +1 @@
-DIST odamex-src-10.0.0.tar.xz 17680868 BLAKE2B 95df336ccc24c2658174bdd051cb9b98ca906d653d84a120330d8fe6f11ad91ba70ba7edfc960f8815d02795f7392761a0174171de30ea78b37389a61deacae7 SHA512 b825953a446a4eb46d2d004b20df876bceec823cb5f0bf661ecac03eff2f07c11fe47c6861f3c3ee417ce9ca869474ff422d78bba1b742485315ba5ba86bd702
+DIST odamex-src-10.3.0.tar.gz 24281159 BLAKE2B f38eacf700f21caa1300e46d926f6e07b97944326cd0ef9d22c3e14af82e91f39e88ae055d90442b81237888b90b8a1c478a54fd599b9648790260863916fb1f SHA512 902f4d20b9246ea94b50099e0ab2c6cd17faad68df344114e9963e100c35a4ac141f3d109b7affb8860a4e082a39ffcfdfcea45d9e6ada6efe09f01c3546f92b
diff --git a/games-engines/odamex/files/odamex-10.0.0-gcc12.patch b/games-engines/odamex/files/odamex-10.0.0-gcc12.patch
deleted file mode 100644
index 8e1a080e1f90..000000000000
--- a/games-engines/odamex/files/odamex-10.0.0-gcc12.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-https://bugs.gentoo.org/852566
---- a/libraries/portmidi/pm_linux/finddefault.c
-+++ b/libraries/portmidi/pm_linux/finddefault.c
-@@ -2,6 +2,7 @@
-    Roger Dannenberg, Jan 2009
- */
- 
-+#include <ctype.h>
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
---- a/master/main.cpp
-+++ b/master/main.cpp
-@@ -29,6 +29,7 @@
- #include <iostream>
- #endif
- 
-+#include <ctime>
- #include <string>
- #include <vector>
- #include <list>
diff --git a/games-engines/odamex/files/odamex-10.0.0-master-std.patch b/games-engines/odamex/files/odamex-10.0.0-master-std.patch
deleted file mode 100644
index 2fe299fd12df..000000000000
--- a/games-engines/odamex/files/odamex-10.0.0-master-std.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 08ff1a04abfde739f7b6d273ebfad65e9a09c24a Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Sun, 20 Mar 2022 13:19:49 +0000
-Subject: [PATCH] Set odamast C++ standard to 98
-
-Otherwise the use of `byte` is ambiguous with newer compilers, resulting
-in a build error.
-
-(cherry picked from commit 4c06d27e60b1e10c4d661523894430323398b140)
----
- master/CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/master/CMakeLists.txt b/master/CMakeLists.txt
-index cbe6a0311..f216eab9a 100644
---- a/master/CMakeLists.txt
-+++ b/master/CMakeLists.txt
-@@ -6,6 +6,7 @@ file(GLOB MASTER_SOURCES *.cpp *.h)
- # Master target
- add_executable(odamast ${MASTER_SOURCES})
- odamex_target_settings(odamast)
-+set_property(TARGET odamast PROPERTY CXX_STANDARD 98)
- 
- if(WIN32)
-   target_link_libraries(odamast wsock32)
--- 
-2.34.1
-
diff --git a/games-engines/odamex/files/odamex-10.0.0-musl.patch b/games-engines/odamex/files/odamex-10.0.0-musl.patch
deleted file mode 100644
index 92af6ad305bd..000000000000
--- a/games-engines/odamex/files/odamex-10.0.0-musl.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From b87798fe9fed746e98871aaa10978324e4b9378f Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Tue, 1 Mar 2022 21:29:32 +0000
-Subject: [PATCH] Fix musl build by checking whether execinfo.h's backtrace is
- present
-
-Closes: https://github.com/odamex/odamex/issues/533
-(cherry picked from commit df3f5976416d342198879db80e4bf35f69eb2ed7)
----
- common/CMakeLists.txt    | 9 +++++++++
- common/i_crash_noop.cpp  | 2 +-
- common/i_crash_posix.cpp | 2 +-
- 3 files changed, 11 insertions(+), 2 deletions(-)
-
-diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
-index 2850607e5..8d02b3212 100644
---- a/common/CMakeLists.txt
-+++ b/common/CMakeLists.txt
-@@ -6,3 +6,12 @@ configure_file(git_describe.h.in "${CMAKE_CURRENT_BINARY_DIR}/git_describe.h")
- add_library(odamex-common INTERFACE)
- target_sources(odamex-common INTERFACE ${COMMON_SOURCES} ${COMMON_HEADERS})
- target_include_directories(odamex-common INTERFACE . ${CMAKE_CURRENT_BINARY_DIR})
-+
-+if(UNIX)
-+  include(CheckSymbolExists)
-+  check_symbol_exists(backtrace "execinfo.h" HAVE_BACKTRACE)
-+
-+  if(HAVE_BACKTRACE)
-+    target_compile_definitions(odamex-common INTERFACE HAVE_BACKTRACE)
-+  endif()
-+endif()
-diff --git a/common/i_crash_noop.cpp b/common/i_crash_noop.cpp
-index 4eb8e70f4..84a406fb3 100644
---- a/common/i_crash_noop.cpp
-+++ b/common/i_crash_noop.cpp
-@@ -23,7 +23,7 @@
- 
- 
- #if defined _WIN32 && !defined _XBOX && defined _MSC_VER && !defined _DEBUG
--#elif defined UNIX && !defined GEKKO
-+#elif defined UNIX && defined HAVE_BACKTRACE && !defined GEKKO
- #else
- 
- #include "odamex.h"
-diff --git a/common/i_crash_posix.cpp b/common/i_crash_posix.cpp
-index 8e6270872..4bf8727f6 100644
---- a/common/i_crash_posix.cpp
-+++ b/common/i_crash_posix.cpp
-@@ -22,7 +22,7 @@
- //-----------------------------------------------------------------------------
- 
- 
--#if defined UNIX && !defined GCONSOLE
-+#if defined UNIX && defined HAVE_BACKTRACE && !defined GCONSOLE
- 
- #include "odamex.h"
- 
--- 
-2.34.1
-
diff --git a/games-engines/odamex/files/odamex-10.0.0-unbundle-jsoncpp.patch b/games-engines/odamex/files/odamex-10.0.0-unbundle-jsoncpp.patch
deleted file mode 100644
index 9b0d3284dc48..000000000000
--- a/games-engines/odamex/files/odamex-10.0.0-unbundle-jsoncpp.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From c8d1cd6465d8d64a23a111edb5fba67565660fe8 Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Sun, 27 Feb 2022 22:51:18 +0000
-Subject: [PATCH 2/3] Allow building against the system JsonCpp library
-
-`USE_INTERNAL_JSONCPP` defaults to true and ignores `USE_INTERNAL_LIBS`
-because users are unlikely to have it installed.
-
-More recent versions of JsonCpp require C++11, but Odamex targets C++98
-for compatibility with older platforms. The standard is therefore only
-changed to C++11 when `USE_INTERNAL_JSONCPP` is false, and only for the
-server where JsonCpp is used. Note that C++11 still works when building
-against an older JsonCpp version.
-
-Tested against JsonCpp 1.9.5 on Gentoo Linux.
-
-Closes: https://github.com/odamex/odamex/issues/261
-(cherry picked from commit 5162c6297c7177af907e5e0502eac9d59ffcc22b)
----
- CMakeLists.txt           |  1 +
- libraries/CMakeLists.txt |  2 +-
- server/CMakeLists.txt    | 15 ++++++++++++++-
- 3 files changed, 16 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c43c9f111..9353d0c6b 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -42,6 +42,7 @@ option(USE_INTERNAL_DEUTEX "Use internal DeuTex" ${USE_INTERNAL_LIBS})
- cmake_dependent_option( USE_INTERNAL_ZLIB "Use internal zlib" ${USE_INTERNAL_LIBS} BUILD_CLIENT 0 )

- cmake_dependent_option( USE_INTERNAL_PNG "Use internal libpng" ${USE_INTERNAL_LIBS} BUILD_CLIENT 0 )

- cmake_dependent_option( USE_INTERNAL_CURL "Use internal libcurl" ${USE_INTERNAL_LIBS} BUILD_CLIENT 0 )

-+cmake_dependent_option( USE_INTERNAL_JSONCPP "Use internal JsonCpp" 1 BUILD_SERVER 0 )

- cmake_dependent_option( USE_INTERNAL_WXWIDGETS "Use internal wxWidgets" ${USE_INTERNAL_LIBS} BUILD_LAUNCHER 0 )

- cmake_dependent_option( ENABLE_PORTMIDI "Enable portmidi support" 1 BUILD_CLIENT 0 )

- cmake_dependent_option( USE_MINIUPNP "Build with UPnP support" 1 BUILD_SERVER 0 )

-diff --git a/libraries/CMakeLists.txt b/libraries/CMakeLists.txt
-index ae7db4c86..493d8f12b 100644
---- a/libraries/CMakeLists.txt
-+++ b/libraries/CMakeLists.txt
-@@ -295,7 +295,7 @@ endif()
- 
- ### JsonCpp ###
- 
--if(BUILD_SERVER)
-+if(BUILD_SERVER AND USE_INTERNAL_JSONCPP)
-   message(STATUS "Compiling JsonCpp...")
- 
-   # Figure out the correct library path to attach to our imported target
-diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
-index 32297080f..a9bf8c44d 100644
---- a/server/CMakeLists.txt
-+++ b/server/CMakeLists.txt
-@@ -45,7 +45,12 @@ endif()
- add_executable(odasrv
-   ${COMMON_SOURCES} ${SERVER_SOURCES} ${SERVER_WIN32_SOURCES})
- odamex_target_settings(odasrv)
--set_property(TARGET odasrv PROPERTY CXX_STANDARD 98)
-+
-+if(USE_INTERNAL_JSONCPP)
-+  set_property(TARGET odasrv PROPERTY CXX_STANDARD 98)
-+else()
-+  set_property(TARGET odasrv PROPERTY CXX_STANDARD 11)
-+endif()
- 
- target_include_directories(odasrv PRIVATE src)
- if(WIN32)
-@@ -53,6 +58,14 @@ if(WIN32)
- endif()
- target_link_libraries(odasrv ZLIB::ZLIB jsoncpp odamex-common odaproto)
- 
-+if(USE_INTERNAL_JSONCPP)
-+  target_link_libraries(odasrv jsoncpp)
-+else()
-+  find_package(PkgConfig REQUIRED)
-+  pkg_check_modules(JSONCPP jsoncpp REQUIRED IMPORTED_TARGET)
-+  target_link_libraries(odasrv PkgConfig::JSONCPP)
-+endif()
-+
- if(USE_MINIUPNP)
-   if(USE_INTERNAL_MINIUPNP)
-     target_link_libraries(odasrv upnpc-static)
--- 
-2.34.1
-
diff --git a/games-engines/odamex/files/odamex-10.0.0-unbundle-miniupnpc.patch b/games-engines/odamex/files/odamex-10.0.0-unbundle-miniupnpc.patch
deleted file mode 100644
index 80b0806e0c11..000000000000
--- a/games-engines/odamex/files/odamex-10.0.0-unbundle-miniupnpc.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-From 4e9fec4ce56fda2568a3a656e1f7c59cdbc5fb21 Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Sun, 20 Feb 2022 11:24:24 +0000
-Subject: [PATCH 1/3] Allow building against the system miniupnpc library
-
-`USE_INTERNAL_MINIUPNP` defaults to true and ignores `USE_INTERNAL_LIBS` because
-users are unlikely to have it installed.
-
-Although miniupnpc uses pkg-config, it doesn't add any include paths to the
-flags because it expects your include directives to include the miniupnpc
-directory. We should therefore do the same with the internal build so that
-either can be used.
-
-Bug: https://github.com/odamex/odamex/issues/261
-(cherry picked from commit 1832a4a1c06504de953cdec2413a47ee393101c7)
----
- CMakeLists.txt           | 1 +
- common/i_net.cpp         | 7 +++----
- libraries/CMakeLists.txt | 4 ++--
- server/CMakeLists.txt    | 8 +++++++-
- 4 files changed, 13 insertions(+), 7 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index fd17dd36b..c43c9f111 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -45,6 +45,7 @@ cmake_dependent_option( USE_INTERNAL_CURL "Use internal libcurl" ${USE_INTERNAL_
- cmake_dependent_option( USE_INTERNAL_WXWIDGETS "Use internal wxWidgets" ${USE_INTERNAL_LIBS} BUILD_LAUNCHER 0 )

- cmake_dependent_option( ENABLE_PORTMIDI "Enable portmidi support" 1 BUILD_CLIENT 0 )

- cmake_dependent_option( USE_MINIUPNP "Build with UPnP support" 1 BUILD_SERVER 0 )

-+cmake_dependent_option( USE_INTERNAL_MINIUPNP "Use internal MiniUPnP" 1 USE_MINIUPNP 0 )

- 

- set(PROJECT_COPYRIGHT "2006-2022")

- set(PROJECT_RC_VERSION "10,0,0,0")

-diff --git a/common/i_net.cpp b/common/i_net.cpp
-index 27b218d0d..dba512346 100644
---- a/common/i_net.cpp
-+++ b/common/i_net.cpp
-@@ -93,10 +93,9 @@ typedef int SOCKET;
- #include "minilzo.h"
- 
- #ifdef ODA_HAVE_MINIUPNP
--#define MINIUPNP_STATICLIB
--#include "miniwget.h"
--#include "miniupnpc.h"
--#include "upnpcommands.h"
-+#include "miniupnpc/miniwget.h"
-+#include "miniupnpc/miniupnpc.h"
-+#include "miniupnpc/upnpcommands.h"
- #endif
- 
- unsigned int	inet_socket;
-diff --git a/libraries/CMakeLists.txt b/libraries/CMakeLists.txt
-index 1785ed0d8..ae7db4c86 100644
---- a/libraries/CMakeLists.txt
-+++ b/libraries/CMakeLists.txt
-@@ -350,7 +350,7 @@ endif()
- ### MiniUPnPc ###
- if(BUILD_SERVER AND NOT USE_MINIUPNP)
-   message(STATUS "Skipping MiniUPnPc...")
--elseif(BUILD_SERVER AND USE_MINIUPNP)
-+elseif(BUILD_SERVER AND USE_MINIUPNP AND USE_INTERNAL_MINIUPNP)
-   message(STATUS "Compiling MiniUPnPc...")
- 
-   # Figure out the correct library path to attach to our imported target
-@@ -386,7 +386,7 @@ elseif(BUILD_SERVER AND USE_MINIUPNP)
-   # Synthesize an imported target that can be linked against.
-   add_library(upnpc-static STATIC IMPORTED GLOBAL)
-   set_target_properties(upnpc-static PROPERTIES
--    INTERFACE_INCLUDE_DIRECTORIES "${MINIUPNPC_INCLUDE_DIR}"
-+    INTERFACE_COMPILE_DEFINITIONS MINIUPNP_STATICLIB
-     IMPORTED_LOCATION ${MINIUPNPC_LIBRARY})
-   if(WIN32)
-     set_target_properties(upnpc-static PROPERTIES INTERFACE_LINK_LIBRARIES "ws2_32;iphlpapi")
-diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
-index c9fa17b64..32297080f 100644
---- a/server/CMakeLists.txt
-+++ b/server/CMakeLists.txt
-@@ -54,7 +54,13 @@ endif()
- target_link_libraries(odasrv ZLIB::ZLIB jsoncpp odamex-common odaproto)
- 
- if(USE_MINIUPNP)
--  target_link_libraries(odasrv upnpc-static)
-+  if(USE_INTERNAL_MINIUPNP)
-+    target_link_libraries(odasrv upnpc-static)
-+  else()
-+    find_package(PkgConfig REQUIRED)
-+    pkg_check_modules(MINIUPNPC miniupnpc REQUIRED IMPORTED_TARGET)
-+    target_link_libraries(odasrv PkgConfig::MINIUPNPC)
-+  endif()
- endif()
- 
- if(WIN32)
--- 
-2.34.1
-
diff --git a/games-engines/odamex/files/odamex-10.0.0-unbundle-fltk.patch b/games-engines/odamex/files/odamex-10.3.0-unbundle-fltk.patch
index 1c9a8753b44a..6cc6a1d18241 100644
--- a/games-engines/odamex/files/odamex-10.0.0-unbundle-fltk.patch
+++ b/games-engines/odamex/files/odamex-10.3.0-unbundle-fltk.patch
@@ -14,19 +14,9 @@ window is unaffected.
 
 Tested against FLTK 1.3.5 on Gentoo Linux.
 
-(cherry picked from commit 656afab54e30598022f4dd2af298cf6a487a1fe1)
----
- CMakeLists.txt           |  1 +
- client/CMakeLists.txt    | 23 ++++++++++++++++++++++-
- client/gui/gui_boot.cpp  |  2 ++
- libraries/CMakeLists.txt |  2 +-
- 4 files changed, 26 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9353d0c6b..599b6e85b 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -42,6 +42,7 @@ option(USE_INTERNAL_DEUTEX "Use internal DeuTex" ${USE_INTERNAL_LIBS})
+--- a/CMakeLists.txt	2022-11-24 21:02:08.000000000 -0600
++++ b/CMakeLists.txt	2023-05-12 14:08:26.838832213 -0500
+@@ -43,6 +43,7 @@
  cmake_dependent_option( USE_INTERNAL_ZLIB "Use internal zlib" ${USE_INTERNAL_LIBS} BUILD_CLIENT 0 )

  cmake_dependent_option( USE_INTERNAL_PNG "Use internal libpng" ${USE_INTERNAL_LIBS} BUILD_CLIENT 0 )

  cmake_dependent_option( USE_INTERNAL_CURL "Use internal libcurl" ${USE_INTERNAL_LIBS} BUILD_CLIENT 0 )

@@ -34,16 +24,14 @@ index 9353d0c6b..599b6e85b 100644
  cmake_dependent_option( USE_INTERNAL_JSONCPP "Use internal JsonCpp" 1 BUILD_SERVER 0 )

  cmake_dependent_option( USE_INTERNAL_WXWIDGETS "Use internal wxWidgets" ${USE_INTERNAL_LIBS} BUILD_LAUNCHER 0 )

  cmake_dependent_option( ENABLE_PORTMIDI "Enable portmidi support" 1 BUILD_CLIENT 0 )

-diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
-index bd071a7a5..ff1e72ba3 100644
---- a/client/CMakeLists.txt
-+++ b/client/CMakeLists.txt
-@@ -206,7 +206,28 @@ if(TARGET SDL2::SDL2 OR TARGET SDL::SDL)
+--- a/client/CMakeLists.txt	2022-11-24 21:02:08.000000000 -0600
++++ b/client/CMakeLists.txt	2023-05-12 14:10:01.895750073 -0500
+@@ -206,8 +206,28 @@
    target_link_libraries(odamex ${PNG_LIBRARY} ${ZLIB_LIBRARY} CURL::libcurl)
    if(NOT GCONSOLE)
      target_include_directories(odamex PRIVATE gui)
 -    target_link_libraries(odamex fltk fltk_images)
-+
+-  endif()
 +    if(USE_INTERNAL_FLTK)
 +      set(FLTK_LIBRARIES fltk fltk_images)
 +      set(HAVE_FLTK_SCREEN_SCALE TRUE)
@@ -65,16 +53,15 @@ index bd071a7a5..ff1e72ba3 100644
 +    endif()
 +
 +    target_link_libraries(odamex ${FLTK_LIBRARIES})
-   endif()
++   endif()
  
    if(ENABLE_PORTMIDI)
-diff --git a/client/gui/gui_boot.cpp b/client/gui/gui_boot.cpp
-index f0a0035d1..834038209 100644
---- a/client/gui/gui_boot.cpp
-+++ b/client/gui/gui_boot.cpp
-@@ -315,12 +315,14 @@ static BootWindow* MakeBootWindow()
+     target_link_libraries(odamex ${PORTMIDI_LIBRARY})
+--- a/client/gui/gui_boot.cpp	2022-11-24 21:02:08.000000000 -0600
++++ b/client/gui/gui_boot.cpp	2023-05-12 14:11:19.362517260 -0500
+@@ -537,12 +537,14 @@
   */
- std::string GUI_BootWindow()
+ scannedWADs_t GUI_BootWindow()
  {
 +#ifdef HAVE_FLTK_SCREEN_SCALE
  	// Scale according to 1600x900.
@@ -87,19 +74,14 @@ index f0a0035d1..834038209 100644
  
  	BootWindow* win = MakeBootWindow();
  	win->initWADDirs();
-diff --git a/libraries/CMakeLists.txt b/libraries/CMakeLists.txt
-index 493d8f12b..a53441d13 100644
---- a/libraries/CMakeLists.txt
-+++ b/libraries/CMakeLists.txt
-@@ -255,7 +255,7 @@ endif()
+--- a/libraries/CMakeLists.txt	2022-11-24 21:02:08.000000000 -0600
++++ b/libraries/CMakeLists.txt	2023-05-12 14:11:46.463789831 -0500
+@@ -264,7 +264,7 @@
  
  ### FLTK (dep: libpng) ###
  
 -if(BUILD_CLIENT)
 +if(BUILD_CLIENT AND USE_INTERNAL_FLTK)
-   message(STATUS "Compiling FLTK...")
- 
    set(_FLTK_BUILDGEN_PARAMS
--- 
-2.34.1
-
+     "-DOPTION_USE_SYSTEM_LIBJPEG=OFF"
+     "-DOPTION_PRINT_SUPPORT=OFF"
diff --git a/games-engines/odamex/metadata.xml b/games-engines/odamex/metadata.xml
index 1548d4273e2e..6bc351136c9c 100644
--- a/games-engines/odamex/metadata.xml
+++ b/games-engines/odamex/metadata.xml
@@ -17,6 +17,7 @@
 		<changelog>http://odamex.net/changelog.php</changelog>
 		<doc lang="en">http://odamex.net/wiki/Odamex</doc>
 		<bugs-to>http://odamex.net/bugs/</bugs-to>
+		<remote-id type="github">odamex/odamex</remote-id>
 		<remote-id type="sourceforge">odamex</remote-id>
 	</upstream>
 	<longdescription lang="en">
diff --git a/games-engines/odamex/odamex-10.0.0.ebuild b/games-engines/odamex/odamex-10.3.0.ebuild
index 96a4e1334332..2cb036706235 100644
--- a/games-engines/odamex/odamex-10.0.0.ebuild
+++ b/games-engines/odamex/odamex-10.3.0.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-WX_GTK_VER="3.0-gtk3"
+WX_GTK_VER="3.2-gtk3"
 inherit cmake desktop prefix wxwidgets xdg
 
 DESCRIPTION="Online multiplayer free software engine for DOOM"
 HOMEPAGE="https://odamex.net/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${PN}-src-${PV}.tar.xz"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${PN}-src-${PV}.tar.gz"
 
 LICENSE="GPL-2+ MIT"
 SLOT="0"
@@ -41,16 +41,11 @@ BDEPEND="games-util/deutex"
 S="${WORKDIR}/${PN}-src-${PV}"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-10.0.0-unbundle-miniupnpc.patch
-	"${FILESDIR}"/${PN}-10.0.0-unbundle-jsoncpp.patch
-	"${FILESDIR}"/${PN}-10.0.0-unbundle-fltk.patch
-	"${FILESDIR}"/${PN}-10.0.0-musl.patch
-	"${FILESDIR}"/${PN}-10.0.0-master-std.patch
-	"${FILESDIR}"/${PN}-10.0.0-gcc12.patch
+	"${FILESDIR}"/${PN}-10.3.0-unbundle-fltk.patch
 )
 
 src_prepare() {
-	rm -r libraries/libminiupnpc || die
+	rm -r libraries/miniupnp || die
 	hprefixify common/d_main.cpp
 
 	use odalaunch && setup-wxwidgets