From aa17fc7e1f7fa3c00c6e072fe2126172bae2bdc5 Mon Sep 17 00:00:00 2001
From: davidkaroly <92124087+davidkaroly@users.noreply.github.com>
Date: Thu, 20 Oct 2022 10:44:02 +0200
Subject: [PATCH] wxqt: bump to version 3.1.5 (#7312)

---
 dev-qt/wxqt/patches/wxqt-3.1.3.patchset       | 33 -------------------
 .../{wxqt-3.1.3.recipe => wxqt-3.1.5.recipe}  | 12 +++----
 2 files changed, 6 insertions(+), 39 deletions(-)
 delete mode 100644 dev-qt/wxqt/patches/wxqt-3.1.3.patchset
 rename dev-qt/wxqt/{wxqt-3.1.3.recipe => wxqt-3.1.5.recipe} (96%)

diff --git a/dev-qt/wxqt/patches/wxqt-3.1.3.patchset b/dev-qt/wxqt/patches/wxqt-3.1.3.patchset
deleted file mode 100644
index 655333d84..000000000
--- a/dev-qt/wxqt/patches/wxqt-3.1.3.patchset
+++ /dev/null
@@ -1,33 +0,0 @@
-From 319ef050e1a7f882efe96a737ee82c31abf1851c Mon Sep 17 00:00:00 2001
-From: begasus <begasus@gmail.com>
-Date: Tue, 2 Jun 2020 22:23:59 +0000
-Subject: Fix build, kudos to waddlesplash for the solution
-
-
-diff --git a/src/qt/dc.cpp b/src/qt/dc.cpp
-index 5f1324a..e304b54 100644
---- a/src/qt/dc.cpp
-+++ b/src/qt/dc.cpp
-@@ -15,6 +15,7 @@
- #include <QtGui/QBitmap>
- #include <QtGui/QPen>
- #include <QtGui/QPainter>
-+#include <QtGui/QPainterPath>
- 
- #ifndef WX_PRECOMP
-     #include "wx/icon.h"
-diff --git a/src/qt/graphics.cpp b/src/qt/graphics.cpp
-index 9e06148..1c4d654 100644
---- a/src/qt/graphics.cpp
-+++ b/src/qt/graphics.cpp
-@@ -19,6 +19,7 @@
- #include <QApplication>
- #include <QDesktopWidget>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QPicture>
- 
- #ifndef WX_PRECOMP
--- 
-2.26.0
-
diff --git a/dev-qt/wxqt/wxqt-3.1.3.recipe b/dev-qt/wxqt/wxqt-3.1.5.recipe
similarity index 96%
rename from dev-qt/wxqt/wxqt-3.1.3.recipe
rename to dev-qt/wxqt/wxqt-3.1.5.recipe
index fdc91c3b0..a0c807673 100644
--- a/dev-qt/wxqt/wxqt-3.1.3.recipe
+++ b/dev-qt/wxqt/wxqt-3.1.5.recipe
@@ -7,20 +7,19 @@ applications a truly native look and feel because it uses the platform's \
 native API rather than emulating the GUI. It's also extensive, free, \
 open-source and mature."
 HOMEPAGE="https://www.wxwidgets.org/"
-COPYRIGHT="1998-2019 Julian Smart, Robert Roebling et al"
+COPYRIGHT="1998-2021 Julian Smart, Robert Roebling et al"
 LICENSE="GNU LGPL v2"
-REVISION="8"
+REVISION="1"
 SOURCE_URI="https://github.com/wxWidgets/wxWidgets/releases/download/v$portVersion/wxWidgets-$portVersion.tar.bz2"
-CHECKSUM_SHA256="fffc1d34dac54ff7008df327907984b156c50cff5a2f36ee3da6052744ab554a"
+CHECKSUM_SHA256="d7b3666de33aa5c10ea41bb9405c40326e1aeb74ee725bb88f90f1d50270a224"
 SOURCE_DIR="wxWidgets-$portVersion"
-PATCHES="wxqt-$portVersion.patchset"
 
 ARCHITECTURES="all !x86_gcc2 ?x86"
 SECONDARY_ARCHITECTURES="x86"
 
 libVersion="$portVersion"
 libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
-libSoVersion="3.0.0"
+libSoVersion="5.0.0"
 
 PROVIDES="
 	wxqt$secondaryArchSuffix = $portVersion
@@ -150,7 +149,8 @@ BUILD()
 		--enable-shared \
 		--enable-printfposparam \
 		--enable-unicode \
-		--enable-sound \
+		--disable-dialupman \
+		--disable-sound \
 		--without-sdl
 
 	# build without SDL as otherwise we get a link issue in sound_sdl.cpp, as below: