[wxwidgets] Update to 3.2.4 (#35983)

Co-authored-by: Monica <v-liumonica@microsoft.com>
This commit is contained in:
MonicaLiu 2024-01-05 13:16:24 -08:00 committed by GitHub
parent fc3f613661
commit 2f8fe8d3e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 45 additions and 3 deletions

View File

@ -0,0 +1,36 @@
diff --git a/src/unix/glegl.cpp b/src/unix/glegl.cpp
index 9e1b6b7..7407a9f 100644
--- a/src/unix/glegl.cpp
+++ b/src/unix/glegl.cpp
@@ -43,8 +43,9 @@
static const char* TRACE_EGL = "glegl";
-#ifdef GDK_WINDOWING_WAYLAND
-
+// We can't add a member variable to wxGLCanvasEGL in 3.2 branch, so emulate it
+// by encoding the corresponding boolean value via the presence of "this"
+// pointer in the given hash set.
#include "wx/hashset.h"
namespace
@@ -58,8 +59,6 @@ wxGLCanvasSet gs_alreadySetSwapInterval;
} // anonymous namespace
-#endif // GDK_WINDOWING_WAYLAND
-
// ----------------------------------------------------------------------------
// wxGLContextAttrs: OpenGL rendering context attributes
// ----------------------------------------------------------------------------
@@ -633,9 +632,9 @@ wxGLCanvasEGL::~wxGLCanvasEGL()
DestroyWaylandSubsurface();
g_clear_pointer(&m_wlEGLWindow, wl_egl_window_destroy);
g_clear_pointer(&m_wlSurface, wl_surface_destroy);
+#endif
gs_alreadySetSwapInterval.erase(this);
-#endif
}
void wxGLCanvasEGL::CreateWaylandSubsurface()

View File

@ -2,7 +2,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO wxWidgets/wxWidgets
REF "v${VERSION}"
SHA512 d9cfad429c5c160944cd9c23c3a32ca72740e2d25d7392a06c22374bcbdd099affee5f541d59ac4a9983fb3d82f90bda7eaf92a93a1e8b5ace2c5bf29962ed53
SHA512 f1ba875e6dfa3970e6f03741573f96ac224a8d0bace5a4c44dcf95dd4e861031fe086e2dc4429c1c6bcb22d40656fc2c6c287abe0b4678eb9af9698691eda3d9
HEAD_REF master
PATCHES
install-layout.patch
@ -12,6 +12,7 @@ vcpkg_from_github(
fix-pcre2.patch
gtk3-link-libraries.patch
sdl2.patch
fix-glegl.patch
)
vcpkg_check_features(

View File

@ -1,6 +1,6 @@
{
"name": "wxwidgets",
"version": "3.2.3",
"version": "3.2.4",
"description": [
"Widget toolkit and tools library for creating graphical user interfaces (GUIs) for cross-platform applications. ",
"Set WXWIDGETS_USE_STL in a custom triplet to build with the wxUSE_STL build option.",

View File

@ -9165,7 +9165,7 @@
"port-version": 0
},
"wxwidgets": {
"baseline": "3.2.3",
"baseline": "3.2.4",
"port-version": 0
},
"wyhash": {

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "b76c48ce396ff7c6e49ec508b7c5bd749fb94fbb",
"version": "3.2.4",
"port-version": 0
},
{
"git-tree": "8dfaace5786af8de744ecf9e02622b7b3e39087a",
"version": "3.2.3",