From e1585e9edbd50c37907dd37a862d254934f613a2 Mon Sep 17 00:00:00 2001
From: davidkaroly <92124087+davidkaroly@users.noreply.github.com>
Date: Thu, 27 Oct 2022 00:49:38 +0200
Subject: [PATCH] wxqt: fix wxBITMAP() definition (#7328)

---
 dev-qt/wxqt/patches/wxqt-3.1.7.patchset | 40 ++++++++++++++++++++++++-
 dev-qt/wxqt/wxqt-3.1.7.recipe           |  2 +-
 2 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/dev-qt/wxqt/patches/wxqt-3.1.7.patchset b/dev-qt/wxqt/patches/wxqt-3.1.7.patchset
index 701029f50..5824be5f4 100644
--- a/dev-qt/wxqt/patches/wxqt-3.1.7.patchset
+++ b/dev-qt/wxqt/patches/wxqt-3.1.7.patchset
@@ -1,4 +1,4 @@
-From d733c86fb176daa2c5bec57155fe5bc7f39a50d1 Mon Sep 17 00:00:00 2001
+From f8b69bb670d0f013bbb57ff701ebdc2b5381c620 Mon Sep 17 00:00:00 2001
 From: Ulrich Telle <ulrich.telle@gmx.de>
 Date: Tue, 21 Jun 2022 10:58:37 +0200
 Subject: Fix wxUILocaleImplUnix::GetLocalizedName() on non-Linux systems
@@ -112,3 +112,41 @@ index 3dfb63f..01556f2 100644
 -- 
 2.37.3
 
+
+From 8f947040170035b4b521fa9b1d3fccc30c0fbe87 Mon Sep 17 00:00:00 2001
+From: Vadim Zeitlin <vadim@wxwidgets.org>
+Date: Sun, 23 Oct 2022 16:07:25 +0200
+Subject: Fix wxBITMAP() definition for wxQt
+
+Define wxBITMAP() for all non-MSW ports in the same, working, way
+instead of using a weird definition which happened to accidentally work
+before for wxQt due to implicitly using wxImage ctor from XPN, but
+doesn't work any longer since the changes of 5e53f74af1 (Make wxImage
+ctor from XPM data explicit, 2021-04-17).
+
+Closes #22908.
+
+diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h
+index 2f5f8ee..0d78068 100644
+--- a/include/wx/gdicmn.h
++++ b/include/wx/gdicmn.h
+@@ -238,15 +238,9 @@ enum wxEllipsizeMode
+ 
+ #if defined(__WINDOWS__) && wxUSE_WXDIB
+     #define wxBITMAP(name) wxBitmap(wxT(#name), wxBITMAP_TYPE_BMP_RESOURCE)
+-#elif defined(__WXGTK__)   || \
+-      defined(__WXMOTIF__) || \
+-      defined(__WXX11__)   || \
+-      defined(__WXMAC__)   || \
+-      defined(__WXDFB__)
++#else
+     // Initialize from an included XPM
+     #define wxBITMAP(name) wxBitmap(name##_xpm)
+-#else // other platforms
+-    #define wxBITMAP(name) wxBitmap(name##_xpm, wxBITMAP_TYPE_XPM)
+ #endif // platform
+ 
+ // Macro for creating wxBitmap from in-memory PNG data.
+-- 
+2.37.3
+
diff --git a/dev-qt/wxqt/wxqt-3.1.7.recipe b/dev-qt/wxqt/wxqt-3.1.7.recipe
index c2ead0bce..0de8df544 100644
--- a/dev-qt/wxqt/wxqt-3.1.7.recipe
+++ b/dev-qt/wxqt/wxqt-3.1.7.recipe
@@ -9,7 +9,7 @@ open-source and mature."
 HOMEPAGE="https://www.wxwidgets.org/"
 COPYRIGHT="1998-2021 Julian Smart, Robert Roebling et al"
 LICENSE="GNU LGPL v2"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://github.com/wxWidgets/wxWidgets/releases/download/v$portVersion/wxWidgets-$portVersion.tar.bz2"
 CHECKSUM_SHA256="3d666e47d86192f085c84089b850c90db7a73a5d26b684b617298d89dce84f19"
 SOURCE_DIR="wxWidgets-$portVersion"