CVS commit: pkgsrc/x11/wxGTK32

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Mon Dec 11 16:25:48 UTC 2023

Modified Files:
        pkgsrc/x11/wxGTK32: distinfo
Added Files:
        pkgsrc/x11/wxGTK32/patches: patch-configure patch-src_unix_glegl.cpp

Log Message:
wxGTK32: SunOS and non-wayland fixes.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/x11/wxGTK32/distinfo
cvs rdiff -u -r0 -r1.4 pkgsrc/x11/wxGTK32/patches/patch-configure
cvs rdiff -u -r0 -r1.1 pkgsrc/x11/wxGTK32/patches/patch-src_unix_glegl.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/wxGTK32/distinfo
diff -u pkgsrc/x11/wxGTK32/distinfo:1.11 pkgsrc/x11/wxGTK32/distinfo:1.12
--- pkgsrc/x11/wxGTK32/distinfo:1.11    Fri Nov 17 19:44:10 2023
+++ pkgsrc/x11/wxGTK32/distinfo Mon Dec 11 16:25:47 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2023/11/17 19:44:10 adam Exp $
+$NetBSD: distinfo,v 1.12 2023/12/11 16:25:47 jperkin Exp $
 
 BLAKE2s (wxWidgets-3.2.4.tar.bz2) = 01ecd5fa0d145f3a8070be88e73b2747115278228cbe8b9ebaa50a72b9b359f1
 SHA512 (wxWidgets-3.2.4.tar.bz2) = 8592e8b7ddf4afe83c9dd4894faa43bbf8a5d57d1ac408b3b6b3b77a809063493ef3e2eefa3155214e1c91c5fad2dc6c0760dd79ada3e73f73ec4d06021b6fff
@@ -6,4 +6,6 @@ Size (wxWidgets-3.2.4.tar.bz2) = 2750594
 SHA1 (patch-build_cmake_config.cmake) = 61ea8fe846de12d5bad6c1f4fa7fe8af6ab78152
 SHA1 (patch-build_cmake_install.cmake) = b14a0e4ddd52fd5d73c4453fa35e1db67c1c0806
 SHA1 (patch-build_cmake_utils_CMakeLists.txt) = dcf6165e260ed56a9908e9e3095c02d0537a4364
+SHA1 (patch-configure) = eff4bd9d747e7c36b410a129504d5eba7732d5a5
+SHA1 (patch-src_unix_glegl.cpp) = 1610bc04a0f8155138b169eb68f4b03e60ccecd9
 SHA1 (patch-src_unix_utilsunx.cpp) = be61cc3931e8aa8cf790cfedf6f916a84970f074

Added files:

Index: pkgsrc/x11/wxGTK32/patches/patch-configure
diff -u /dev/null pkgsrc/x11/wxGTK32/patches/patch-configure:1.4
--- /dev/null   Mon Dec 11 16:25:48 2023
+++ pkgsrc/x11/wxGTK32/patches/patch-configure  Mon Dec 11 16:25:47 2023
@@ -0,0 +1,16 @@
+$NetBSD: patch-configure,v 1.4 2023/12/11 16:25:47 jperkin Exp $
+
+Use standard sonames on SunOS.
+
+--- configure.orig     2023-12-11 16:17:41.846863960 +0000
++++ configure
+@@ -44282,7 +44282,8 @@ fi
+       *-*-solaris2* )
+         SONAME_FLAG="-h "
+         USE_SOVERSION=1
+-        USE_SOVERSOLARIS=1
++        USE_SOVERLINUX=1
++        USE_SOTWOSYMLINKS=1
+       ;;
+ 
+       *-*-darwin* )

Index: pkgsrc/x11/wxGTK32/patches/patch-src_unix_glegl.cpp
diff -u /dev/null pkgsrc/x11/wxGTK32/patches/patch-src_unix_glegl.cpp:1.1
--- /dev/null   Mon Dec 11 16:25:48 2023
+++ pkgsrc/x11/wxGTK32/patches/patch-src_unix_glegl.cpp Mon Dec 11 16:25:47 2023
@@ -0,0 +1,22 @@
+$NetBSD: patch-src_unix_glegl.cpp,v 1.1 2023/12/11 16:25:47 jperkin Exp $
+
+Fix non-wayland build.
+
+--- src/unix/glegl.cpp.orig    2023-12-11 16:01:26.158197607 +0000
++++ src/unix/glegl.cpp
+@@ -810,6 +810,7 @@ bool wxGLCanvasEGL::SwapBuffers()
+     // entire application completely unusable just because one of its windows
+     // using wxGLCanvas got occluded or unmapped (e.g. due to a move to another
+     // workspace).
++#ifdef GDK_WINDOWING_WAYLAND
+     if ( !gs_alreadySetSwapInterval.count(this) )
+     {
+         // Ensure that eglSwapBuffers() doesn't block, as we use the surface
+@@ -827,6 +828,7 @@ bool wxGLCanvasEGL::SwapBuffers()
+                        this, eglGetError());
+         }
+     }
++#endif
+ 
+     GdkWindow* const window = GTKGetDrawingWindow();
+ #ifdef GDK_WINDOWING_X11