From 05cd4df715c69139a96426605ec769ab56689a18 Mon Sep 17 00:00:00 2001 From: Yao Zi Date: Sat, 21 Mar 2026 11:47:54 +0000 Subject: [PATCH 1/2] [wxwidgets] 3.2.10-2: Drop patch for looking up OpenGL This could be done by alternating CMake options instead. --- ...k-for-OpenGL_OpenGL_FOUND-when-searc.patch | 45 ------------------- PKGBUILD | 14 +++--- 2 files changed, 8 insertions(+), 51 deletions(-) delete mode 100644 0002-build-cmake-Check-for-OpenGL_OpenGL_FOUND-when-searc.patch diff --git a/0002-build-cmake-Check-for-OpenGL_OpenGL_FOUND-when-searc.patch b/0002-build-cmake-Check-for-OpenGL_OpenGL_FOUND-when-searc.patch deleted file mode 100644 index 9a1bebdd1..000000000 --- a/0002-build-cmake-Check-for-OpenGL_OpenGL_FOUND-when-searc.patch +++ /dev/null @@ -1,45 +0,0 @@ -From b45daccc58eeca1c2898cec8be0902ecc52210c1 Mon Sep 17 00:00:00 2001 -From: Yao Zi -Date: Sat, 23 Aug 2025 15:12:51 +0000 -Subject: [PATCH] build: cmake: Check for OpenGL_OpenGL_FOUND when searching - for OpenGL - -On systems without GLX, OPENGL_FOUND will always be set to false since -part of the OpenGL package, OpenGL::GLX, is not found. However it's -still possible to build wxwidgets if we have OpenGL::OpenGL provided by -GLVND instead and could link to EGL for platform-specific APIs. - -Let's check for OpenGL_OpenGL_FOUND instead of OPENGL_FOUND when looking -for OpenGL, which is set as long as any of GLX or GLVND libOpenGL is -found. - -Signed-off-by: Yao Zi ---- - build/cmake/init.cmake | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/build/cmake/init.cmake b/build/cmake/init.cmake -index 3923045fdf1e..46fdbe2bc255 100644 ---- a/build/cmake/init.cmake -+++ b/build/cmake/init.cmake -@@ -436,7 +436,7 @@ if(wxUSE_GUI) - set(OPENGL_LIBRARIES "-framework OpenGLES" "-framework QuartzCore" "-framework GLKit") - else() - find_package(OpenGL) -- if(OPENGL_FOUND) -+ if(OpenGL_OpenGL_FOUND) - foreach(gltarget OpenGL::GL OpenGL::GLU OpenGL::OpenGL) - if(TARGET ${gltarget}) - set(OPENGL_LIBRARIES ${gltarget} ${OPENGL_LIBRARIES}) -@@ -459,7 +459,7 @@ if(wxUSE_GUI) - endif() - endif() - endif() -- if(NOT OPENGL_FOUND) -+ if(NOT OpenGL_OpenGL_FOUND) - message(WARNING "opengl not found, wxGLCanvas won't be available") - wx_option_force_value(wxUSE_OPENGL OFF) - endif() --- -2.50.1 - diff --git a/PKGBUILD b/PKGBUILD index 143f5aefd..62ec9d357 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,7 +3,7 @@ pkgbase=wxwidgets pkgname=(wxwidgets-gtk3) # TODO: package the QT variant pkgver=3.2.10 -pkgrel=1 +pkgrel=2 pkgdesc='Cross-Platform C++ GUI Library' url='Cross-Platform' arch=(x86_64 aarch64 riscv64 loongarch64) @@ -14,13 +14,10 @@ makedepends=(gstreamer-devel gst-plugins-bad cmake samurai) # 0001: Taken from Alpine Linux, define macro wrappers to provide _l variants # for string functions. # https://git.alpinelinux.org/aports/diff/community/wxwidgets/musl-locale-l.patch?id=cc5b7b05c04630cc1cb3f396604630c98d3b3141 -# 0002: Should be upstreamed, allow OpenGL to be used without GLX source=("https://github.com/wxWidgets/wxWidgets/releases/download/v$pkgver/wxWidgets-$pkgver.tar.bz2" - 0001-Adapt-musl-locale-l.patch - 0002-build-cmake-Check-for-OpenGL_OpenGL_FOUND-when-searc.patch) + 0001-Adapt-musl-locale-l.patch) sha256sums=('d66e929569947a4a5920699539089a9bda83a93e5f4917fb313a61f0c344b896' - '69f2dc1a98fbddf338e301f5d45fdd0a84d3692ec48a83b8f29c39b9ecee9d82' - 'bcf59d0be84d0720a7af36c3af442af91a3db4ac1caf1ba615b5585c2f7c638f') + '69f2dc1a98fbddf338e301f5d45fdd0a84d3692ec48a83b8f29c39b9ecee9d82') _srcdir="wxWidgets-$pkgver" prepare() { @@ -33,6 +30,11 @@ build() { cmake -S "$_srcdir" -B build -G Ninja \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ + -DOPENGL_USE_GLX=OFF \ + -DOPENGL_USE_EGL=ON \ + -DOPENGL_USE_GLES2=ON \ + -DOPENGL_USE_GLES3=ON \ + -DOPENGL_USE_OPENGL=ON \ -DwxUSE_SYS_LIBS=ON \ -DwxUSE_WEBVIEW=OFF \ -DwxUSE_SPELLCHECK=OFF \ From a8d70bbdf9fd4beca370796fc70d62718d4b6875 Mon Sep 17 00:00:00 2001 From: Yao Zi Date: Sat, 21 Mar 2026 11:58:35 +0000 Subject: [PATCH 2/2] [wxwidgets] 3.2.10-2: Enable wxWebView --- PKGBUILD | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index 62ec9d357..dd4d79d9e 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -9,7 +9,7 @@ url='Cross-Platform' arch=(x86_64 aarch64 riscv64 loongarch64) license=(LGPL-2.0-or-later WITH WxWindows-exception-3.1) depends=(musl gtk3 libjpeg libpng libtiff libwebp zlib-ng expat libsecret - sdl2 libnotify gstreamer pcre2 nanosvg) + sdl2 libnotify gstreamer pcre2 nanosvg webkit2gtk-4.1) makedepends=(gstreamer-devel gst-plugins-bad cmake samurai) # 0001: Taken from Alpine Linux, define macro wrappers to provide _l variants # for string functions. @@ -36,7 +36,6 @@ build() { -DOPENGL_USE_GLES3=ON \ -DOPENGL_USE_OPENGL=ON \ -DwxUSE_SYS_LIBS=ON \ - -DwxUSE_WEBVIEW=OFF \ -DwxUSE_SPELLCHECK=OFF \ -DwxUSE_NANOSVG="sys" cmake --build build