wxgtk3: fix build when wayland is not installed

This commit is contained in:
John McQuah 2024-04-30 19:06:46 +00:00
parent 983a3d57d7
commit d3f4b88589
3 changed files with 37 additions and 3 deletions

View File

@ -1,5 +1,6 @@
untrusted comment: verify with /etc/ports/contrib.pub
RWSagIOpLGJF30CRcKMCM5wPfgCpReeHPbF4Vf/sBpdALQmFHEcliO84TZcjtGQYykSjJIb/Coy4SSXOxQar6zDPImWNtyUo7AE=
SHA256 (Pkgfile) = 69f770d501c39addbf8df8d838958911a4eb4a8c4eb3dca2443b533d3f84ea21
RWSagIOpLGJF3/21zIMy9M2jw9ZEgCvraUOgu41i7WaYg4IDYj6+Ow+VuMVdufRj1MYynH74PpKhZaIyou9xUwqhHml/PncxiwQ=
SHA256 (Pkgfile) = 9c7e0a1dedf0bb48375db065f13a844baeb0812b03722b297a3a692fdb6bdd80
SHA256 (.footprint) = 44184ef410020d6e3c1bc4e4fb8ad472833385651d65fe3944472afab6c73400
SHA256 (wxWidgets-3.2.4.tar.bz2) = 0640e1ab716db5af2ecb7389dbef6138d7679261fbff730d23845ba838ca133e
SHA256 (glegl-no-wayland.patch) = 6f85a5d1e57464b2a5bd8871539a4f86e300141df01291fb956fc6c26bba4ff7

View File

@ -7,9 +7,11 @@
name=wxgtk3
version=3.2.4
release=1
source=(https://github.com/wxWidgets/wxWidgets/releases/download/v$version/wxWidgets-$version.tar.bz2)
source=(https://github.com/wxWidgets/wxWidgets/releases/download/v$version/wxWidgets-$version.tar.bz2 glegl-no-wayland.patch)
build() {
patch -d wxWidgets-$version -Np1 -i $SRC/glegl-no-wayland.patch
cmake -S wxWidgets-$version -B build -G Ninja \
-D CMAKE_INSTALL_PREFIX=/usr \
-D CMAKE_BUILD_TYPE=Release \

View File

@ -0,0 +1,31 @@
--- a/src/unix/glegl.cpp 2023-11-08 22:53:55.000000000 +0000
+++ b/src/unix/glegl.cpp 2024-04-30 19:57:34.482151708 +0000
@@ -43,8 +43,6 @@
static const char* TRACE_EGL = "glegl";
-#ifdef GDK_WINDOWING_WAYLAND
-
#include "wx/hashset.h"
namespace
@@ -58,8 +56,6 @@
} // anonymous namespace
-#endif // GDK_WINDOWING_WAYLAND
-
// ----------------------------------------------------------------------------
// wxGLContextAttrs: OpenGL rendering context attributes
// ----------------------------------------------------------------------------
@@ -633,9 +629,9 @@
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()