From 4e4eb9c96e06d6048188ef38da2825063605c2de Mon Sep 17 00:00:00 2001 From: John McQuah Date: Wed, 14 Aug 2024 15:46:03 +0000 Subject: [PATCH] wxgtk3: updated to version 3.2.5 --- wxgtk3/.footprint | 56 +++++++++++++++++------------------ wxgtk3/.signature | 9 +++--- wxgtk3/Pkgfile | 7 ++--- wxgtk3/glegl-no-wayland.patch | 31 ------------------- 4 files changed, 35 insertions(+), 68 deletions(-) delete mode 100644 wxgtk3/glegl-no-wayland.patch diff --git a/wxgtk3/.footprint b/wxgtk3/.footprint index 31f58f5f4..30170397c 100644 --- a/wxgtk3/.footprint +++ b/wxgtk3/.footprint @@ -1569,47 +1569,47 @@ drwxr-xr-x root/root usr/lib/cmake/wxWidgets/ -rw-r--r-- root/root usr/lib/cmake/wxWidgets/wxWidgetsTargets-release.cmake -rw-r--r-- root/root usr/lib/cmake/wxWidgets/wxWidgetsTargets.cmake lrwxrwxrwx root/root usr/lib/libwx_baseu-3.2.so -> libwx_baseu-3.2.so.0 -lrwxrwxrwx root/root usr/lib/libwx_baseu-3.2.so.0 -> libwx_baseu-3.2.so.0.2.2 --rwxr-xr-x root/root usr/lib/libwx_baseu-3.2.so.0.2.2 +lrwxrwxrwx root/root usr/lib/libwx_baseu-3.2.so.0 -> libwx_baseu-3.2.so.0.2.3 +-rwxr-xr-x root/root usr/lib/libwx_baseu-3.2.so.0.2.3 lrwxrwxrwx root/root usr/lib/libwx_baseu_net-3.2.so -> libwx_baseu_net-3.2.so.0 -lrwxrwxrwx root/root usr/lib/libwx_baseu_net-3.2.so.0 -> libwx_baseu_net-3.2.so.0.2.2 --rwxr-xr-x root/root usr/lib/libwx_baseu_net-3.2.so.0.2.2 +lrwxrwxrwx root/root usr/lib/libwx_baseu_net-3.2.so.0 -> libwx_baseu_net-3.2.so.0.2.3 +-rwxr-xr-x root/root usr/lib/libwx_baseu_net-3.2.so.0.2.3 lrwxrwxrwx root/root usr/lib/libwx_baseu_xml-3.2.so -> libwx_baseu_xml-3.2.so.0 -lrwxrwxrwx root/root usr/lib/libwx_baseu_xml-3.2.so.0 -> libwx_baseu_xml-3.2.so.0.2.2 --rwxr-xr-x root/root usr/lib/libwx_baseu_xml-3.2.so.0.2.2 +lrwxrwxrwx root/root usr/lib/libwx_baseu_xml-3.2.so.0 -> libwx_baseu_xml-3.2.so.0.2.3 +-rwxr-xr-x root/root usr/lib/libwx_baseu_xml-3.2.so.0.2.3 lrwxrwxrwx root/root usr/lib/libwx_gtk3u_adv-3.2.so -> libwx_gtk3u_adv-3.2.so.0 -lrwxrwxrwx root/root usr/lib/libwx_gtk3u_adv-3.2.so.0 -> libwx_gtk3u_adv-3.2.so.0.2.2 --rwxr-xr-x root/root usr/lib/libwx_gtk3u_adv-3.2.so.0.2.2 +lrwxrwxrwx root/root usr/lib/libwx_gtk3u_adv-3.2.so.0 -> libwx_gtk3u_adv-3.2.so.0.2.3 +-rwxr-xr-x root/root usr/lib/libwx_gtk3u_adv-3.2.so.0.2.3 lrwxrwxrwx root/root usr/lib/libwx_gtk3u_aui-3.2.so -> libwx_gtk3u_aui-3.2.so.0 -lrwxrwxrwx root/root usr/lib/libwx_gtk3u_aui-3.2.so.0 -> libwx_gtk3u_aui-3.2.so.0.2.2 --rwxr-xr-x root/root usr/lib/libwx_gtk3u_aui-3.2.so.0.2.2 +lrwxrwxrwx root/root usr/lib/libwx_gtk3u_aui-3.2.so.0 -> libwx_gtk3u_aui-3.2.so.0.2.3 +-rwxr-xr-x root/root usr/lib/libwx_gtk3u_aui-3.2.so.0.2.3 lrwxrwxrwx root/root usr/lib/libwx_gtk3u_core-3.2.so -> libwx_gtk3u_core-3.2.so.0 -lrwxrwxrwx root/root usr/lib/libwx_gtk3u_core-3.2.so.0 -> libwx_gtk3u_core-3.2.so.0.2.2 --rwxr-xr-x root/root usr/lib/libwx_gtk3u_core-3.2.so.0.2.2 +lrwxrwxrwx root/root usr/lib/libwx_gtk3u_core-3.2.so.0 -> libwx_gtk3u_core-3.2.so.0.2.3 +-rwxr-xr-x root/root usr/lib/libwx_gtk3u_core-3.2.so.0.2.3 lrwxrwxrwx root/root usr/lib/libwx_gtk3u_gl-3.2.so -> libwx_gtk3u_gl-3.2.so.0 -lrwxrwxrwx root/root usr/lib/libwx_gtk3u_gl-3.2.so.0 -> libwx_gtk3u_gl-3.2.so.0.2.2 --rwxr-xr-x root/root usr/lib/libwx_gtk3u_gl-3.2.so.0.2.2 +lrwxrwxrwx root/root usr/lib/libwx_gtk3u_gl-3.2.so.0 -> libwx_gtk3u_gl-3.2.so.0.2.3 +-rwxr-xr-x root/root usr/lib/libwx_gtk3u_gl-3.2.so.0.2.3 lrwxrwxrwx root/root usr/lib/libwx_gtk3u_html-3.2.so -> libwx_gtk3u_html-3.2.so.0 -lrwxrwxrwx root/root usr/lib/libwx_gtk3u_html-3.2.so.0 -> libwx_gtk3u_html-3.2.so.0.2.2 --rwxr-xr-x root/root usr/lib/libwx_gtk3u_html-3.2.so.0.2.2 +lrwxrwxrwx root/root usr/lib/libwx_gtk3u_html-3.2.so.0 -> libwx_gtk3u_html-3.2.so.0.2.3 +-rwxr-xr-x root/root usr/lib/libwx_gtk3u_html-3.2.so.0.2.3 lrwxrwxrwx root/root usr/lib/libwx_gtk3u_propgrid-3.2.so -> libwx_gtk3u_propgrid-3.2.so.0 -lrwxrwxrwx root/root usr/lib/libwx_gtk3u_propgrid-3.2.so.0 -> libwx_gtk3u_propgrid-3.2.so.0.2.2 --rwxr-xr-x root/root usr/lib/libwx_gtk3u_propgrid-3.2.so.0.2.2 +lrwxrwxrwx root/root usr/lib/libwx_gtk3u_propgrid-3.2.so.0 -> libwx_gtk3u_propgrid-3.2.so.0.2.3 +-rwxr-xr-x root/root usr/lib/libwx_gtk3u_propgrid-3.2.so.0.2.3 lrwxrwxrwx root/root usr/lib/libwx_gtk3u_qa-3.2.so -> libwx_gtk3u_qa-3.2.so.0 -lrwxrwxrwx root/root usr/lib/libwx_gtk3u_qa-3.2.so.0 -> libwx_gtk3u_qa-3.2.so.0.2.2 --rwxr-xr-x root/root usr/lib/libwx_gtk3u_qa-3.2.so.0.2.2 +lrwxrwxrwx root/root usr/lib/libwx_gtk3u_qa-3.2.so.0 -> libwx_gtk3u_qa-3.2.so.0.2.3 +-rwxr-xr-x root/root usr/lib/libwx_gtk3u_qa-3.2.so.0.2.3 lrwxrwxrwx root/root usr/lib/libwx_gtk3u_ribbon-3.2.so -> libwx_gtk3u_ribbon-3.2.so.0 -lrwxrwxrwx root/root usr/lib/libwx_gtk3u_ribbon-3.2.so.0 -> libwx_gtk3u_ribbon-3.2.so.0.2.2 --rwxr-xr-x root/root usr/lib/libwx_gtk3u_ribbon-3.2.so.0.2.2 +lrwxrwxrwx root/root usr/lib/libwx_gtk3u_ribbon-3.2.so.0 -> libwx_gtk3u_ribbon-3.2.so.0.2.3 +-rwxr-xr-x root/root usr/lib/libwx_gtk3u_ribbon-3.2.so.0.2.3 lrwxrwxrwx root/root usr/lib/libwx_gtk3u_richtext-3.2.so -> libwx_gtk3u_richtext-3.2.so.0 -lrwxrwxrwx root/root usr/lib/libwx_gtk3u_richtext-3.2.so.0 -> libwx_gtk3u_richtext-3.2.so.0.2.2 --rwxr-xr-x root/root usr/lib/libwx_gtk3u_richtext-3.2.so.0.2.2 +lrwxrwxrwx root/root usr/lib/libwx_gtk3u_richtext-3.2.so.0 -> libwx_gtk3u_richtext-3.2.so.0.2.3 +-rwxr-xr-x root/root usr/lib/libwx_gtk3u_richtext-3.2.so.0.2.3 lrwxrwxrwx root/root usr/lib/libwx_gtk3u_stc-3.2.so -> libwx_gtk3u_stc-3.2.so.0 -lrwxrwxrwx root/root usr/lib/libwx_gtk3u_stc-3.2.so.0 -> libwx_gtk3u_stc-3.2.so.0.2.2 --rwxr-xr-x root/root usr/lib/libwx_gtk3u_stc-3.2.so.0.2.2 +lrwxrwxrwx root/root usr/lib/libwx_gtk3u_stc-3.2.so.0 -> libwx_gtk3u_stc-3.2.so.0.2.3 +-rwxr-xr-x root/root usr/lib/libwx_gtk3u_stc-3.2.so.0.2.3 lrwxrwxrwx root/root usr/lib/libwx_gtk3u_xrc-3.2.so -> libwx_gtk3u_xrc-3.2.so.0 -lrwxrwxrwx root/root usr/lib/libwx_gtk3u_xrc-3.2.so.0 -> libwx_gtk3u_xrc-3.2.so.0.2.2 --rwxr-xr-x root/root usr/lib/libwx_gtk3u_xrc-3.2.so.0.2.2 +lrwxrwxrwx root/root usr/lib/libwx_gtk3u_xrc-3.2.so.0 -> libwx_gtk3u_xrc-3.2.so.0.2.3 +-rwxr-xr-x root/root usr/lib/libwx_gtk3u_xrc-3.2.so.0.2.3 drwxr-xr-x root/root usr/lib/wx/ drwxr-xr-x root/root usr/lib/wx/config/ -rwxr-xr-x root/root usr/lib/wx/config/gtk3-unicode-3.2 diff --git a/wxgtk3/.signature b/wxgtk3/.signature index c81f348b4..68679225b 100644 --- a/wxgtk3/.signature +++ b/wxgtk3/.signature @@ -1,6 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -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 +RWSagIOpLGJF39S8+Hwf2WOwlEhwCT1me2L5hOac8e6C/rt+mPG+2gSwIinfjHUWkOqY956mL3vaHd8zusX2/QBQh4R5hVQn+go= +SHA256 (Pkgfile) = b547a547aa93be2ab889779bd7ec5a471d9910c584fc67f5a122d85a53b27578 +SHA256 (.footprint) = 3ba195764f1af754fc420e52278f6e63aba59639f535f1582bf3a7f1262630be +SHA256 (wxWidgets-3.2.5.tar.bz2) = 0ad86a3ad3e2e519b6a705248fc9226e3a09bbf069c6c692a02acf7c2d1c6b51 diff --git a/wxgtk3/Pkgfile b/wxgtk3/Pkgfile index 5061a0f74..43410f0d2 100644 --- a/wxgtk3/Pkgfile +++ b/wxgtk3/Pkgfile @@ -5,13 +5,11 @@ # Optional: gstreamer libmspack libnotify libsdl libsdl2 libsoup wayland webkitgtk name=wxgtk3 -version=3.2.4 +version=3.2.5 release=1 -source=(https://github.com/wxWidgets/wxWidgets/releases/download/v$version/wxWidgets-$version.tar.bz2 glegl-no-wayland.patch) +source=(https://github.com/wxWidgets/wxWidgets/releases/download/v$version/wxWidgets-$version.tar.bz2) 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 \ @@ -28,6 +26,7 @@ build() { -D wxUSE_LIBLZMA=sys \ -D wxUSE_PRIVATE_FONTS=ON \ -D wxUSE_GTKPRINT=ON \ + -D wxUSE_XLOCALE=OFF \ -Wno-dev ninja -C build -j ${JOBS:-1} diff --git a/wxgtk3/glegl-no-wayland.patch b/wxgtk3/glegl-no-wayland.patch deleted file mode 100644 index 04441ff8f..000000000 --- a/wxgtk3/glegl-no-wayland.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- 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()