From 23f94da17cd0d5f8c5bb5f000fd851d87cc60a48 Mon Sep 17 00:00:00 2001
From: davidkaroly <92124087+davidkaroly@users.noreply.github.com>
Date: Mon, 17 Oct 2022 19:17:08 +0200
Subject: [PATCH] wxqt: remove unnecessary patches (#7297)

---
 dev-qt/wxqt/patches/wxqt-3.1.3.patchset | 26 -------------------------
 dev-qt/wxqt/wxqt-3.1.3.recipe           | 18 +++++------------
 2 files changed, 5 insertions(+), 39 deletions(-)

diff --git a/dev-qt/wxqt/patches/wxqt-3.1.3.patchset b/dev-qt/wxqt/patches/wxqt-3.1.3.patchset
index 67a1d1b96..655333d84 100644
--- a/dev-qt/wxqt/patches/wxqt-3.1.3.patchset
+++ b/dev-qt/wxqt/patches/wxqt-3.1.3.patchset
@@ -1,29 +1,3 @@
-From 6d06aabb48f10849b1e29a4dddf6f49bc40cd56a Mon Sep 17 00:00:00 2001
-From: Augustin Cavalier <waddlesplash@gmail.com>
-Date: Sun, 12 Feb 2017 15:40:59 -0500
-Subject: [PATCH] sckaddr: Fix build on Haiku.
-
-
-diff --git a/src/common/sckaddr.cpp b/src/common/sckaddr.cpp
-index 0388132..49a6481 100644
---- a/src/common/sckaddr.cpp
-+++ b/src/common/sckaddr.cpp
-@@ -109,6 +109,11 @@ wxIMPLEMENT_DYNAMIC_CLASS(wxUNIXaddress, wxSockAddress);
-     #endif
- #endif // __WINDOWS__
- 
-+#ifdef __HAIKU__
-+    #define HAVE_GETHOSTBYNAME
-+    #define HAVE_GETSERVBYNAME
-+#endif
-+
- // we assume that we have gethostbyaddr_r() if and only if we have
- // gethostbyname_r() and that it uses the similar conventions to it (see
- // comment in configure)
--- 
-2.26.0
-
-
 From 319ef050e1a7f882efe96a737ee82c31abf1851c Mon Sep 17 00:00:00 2001
 From: begasus <begasus@gmail.com>
 Date: Tue, 2 Jun 2020 22:23:59 +0000
diff --git a/dev-qt/wxqt/wxqt-3.1.3.recipe b/dev-qt/wxqt/wxqt-3.1.3.recipe
index 1cbfeba64..fdc91c3b0 100644
--- a/dev-qt/wxqt/wxqt-3.1.3.recipe
+++ b/dev-qt/wxqt/wxqt-3.1.3.recipe
@@ -9,7 +9,7 @@ open-source and mature."
 HOMEPAGE="https://www.wxwidgets.org/"
 COPYRIGHT="1998-2019 Julian Smart, Robert Roebling et al"
 LICENSE="GNU LGPL v2"
-REVISION="7"
+REVISION="8"
 SOURCE_URI="https://github.com/wxWidgets/wxWidgets/releases/download/v$portVersion/wxWidgets-$portVersion.tar.bz2"
 CHECKSUM_SHA256="fffc1d34dac54ff7008df327907984b156c50cff5a2f36ee3da6052744ab554a"
 SOURCE_DIR="wxWidgets-$portVersion"
@@ -141,16 +141,6 @@ defineDebugInfoPackage wxqt$secondaryArchSuffix \
 	"$libDir"/libwx_qtu_xrc-3.1.so.$libSoVersion
 #	"$libDir"/libwx_qtu_gl-3.1.so.$libSoVersion
 
-PATCH()
-{
-	# autoconf chokes for whatever reason while trying to reconfigure,
-	# so just sed-patch the configure script.
-	sed -i s/lsocket/lnetwork/g configure
-	sed -i s/INET_LINK=\"socket\"/INET_LINK=\"network\"/g configure
-	sed -i 's@\*-\*-freebsd\* | \*-\*-openbsd\*@\*-\*-haiku\* | \*-\*-openbsd\*@' \
-		configure
-}
-
 BUILD()
 {
 	export CXXFLAGS="-std=c++11 -fpermissive"
@@ -161,8 +151,10 @@ BUILD()
 		--enable-printfposparam \
 		--enable-unicode \
 		--enable-sound \
-	#	--with-sdl \
-	# causes libwx_qtu_core-3.1.so.3.0.0: Could not resolve symbol '_ZN11wxSoundData6IncRefEv'
+		--without-sdl
+
+	# build without SDL as otherwise we get a link issue in sound_sdl.cpp, as below:
+	# libwx_qtu_core-3.1.so.3.0.0: Could not resolve symbol '_ZN11wxSoundData6IncRefEv'
 
 	make $jobArgs
 }