CVS commit: pkgsrc/x11/wxGTK32

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Jul 29 18:36:06 UTC 2022

Modified Files:
        pkgsrc/x11/wxGTK32: Makefile distinfo
        pkgsrc/x11/wxGTK32/patches: patch-build_cmake_init.cmake

Log Message:
wxGTK32: use upstream patch

Build using cmake on NetBSD for now.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/x11/wxGTK32/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/x11/wxGTK32/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/x11/wxGTK32/patches/patch-build_cmake_init.cmake

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/Makefile
diff -u pkgsrc/x11/wxGTK32/Makefile:1.6 pkgsrc/x11/wxGTK32/Makefile:1.7
--- pkgsrc/x11/wxGTK32/Makefile:1.6     Fri Jul 29 13:14:59 2022
+++ pkgsrc/x11/wxGTK32/Makefile Fri Jul 29 18:36:06 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2022/07/29 13:14:59 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2022/07/29 18:36:06 wiz Exp $
 
 DISTNAME=      wxWidgets-3.2.0
 PKGNAME=       ${DISTNAME:S/wxWidgets/wxGTK32/}
@@ -40,6 +40,9 @@ REPLACE_SH=           wx-config.in wx-config-inpl
 # and remove support for building with GNU_CONFIGURE
 PKG_OPTIONS_VAR=       PKG_OPTIONS.wxGTK32
 PKG_SUPPORTED_OPTIONS= cmake
+.if ${OPSYS} == "NetBSD"
+PKG_SUGGESTED_OPTIONS= cmake
+.endif
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mcmake)

Index: pkgsrc/x11/wxGTK32/distinfo
diff -u pkgsrc/x11/wxGTK32/distinfo:1.4 pkgsrc/x11/wxGTK32/distinfo:1.5
--- pkgsrc/x11/wxGTK32/distinfo:1.4     Fri Jul 29 13:14:59 2022
+++ pkgsrc/x11/wxGTK32/distinfo Fri Jul 29 18:36:06 2022
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.4 2022/07/29 13:14:59 wiz Exp $
+$NetBSD: distinfo,v 1.5 2022/07/29 18:36:06 wiz Exp $
 
 BLAKE2s (wxWidgets-3.2.0.tar.bz2) = 4029147a8e77a22e0379eeda11bc26f8fee998862aaa52819adf16a8ed4860ea
 SHA512 (wxWidgets-3.2.0.tar.bz2) = e55e7c5ac7abcacf2ecff7c22e367db17ff5a077d3d5d2aa7589e8ba7cc6695cfa48c0f00bcfdffeda8dc4f974f97a857fb61b4b300a724f7687d710fbb23967
 Size (wxWidgets-3.2.0.tar.bz2) = 25296814 bytes
 SHA1 (patch-build_cmake_config.cmake) = 3f2a53683e212d0fe9be966b7dd887b2240c57eb
-SHA1 (patch-build_cmake_init.cmake) = 5b203660ee4c1376b2d8083be73fdcd0c1d09833
+SHA1 (patch-build_cmake_init.cmake) = 341f632aa7062af4c5bc4ca2695f59d2b7254ede
 SHA1 (patch-build_cmake_install.cmake) = 4afe2ec2c6c6e28b941dad3974771da7ed1b41be
 SHA1 (patch-build_cmake_lib_base_CMakeLists.txt) = bec7be2f64bb4629a60d2b4f169e8feb215408e3
 SHA1 (patch-build_cmake_setup.cmake) = 277ae3c5bf4f04d057402f0b626d09d1e9749ca8

Index: pkgsrc/x11/wxGTK32/patches/patch-build_cmake_init.cmake
diff -u pkgsrc/x11/wxGTK32/patches/patch-build_cmake_init.cmake:1.1 pkgsrc/x11/wxGTK32/patches/patch-build_cmake_init.cmake:1.2
--- pkgsrc/x11/wxGTK32/patches/patch-build_cmake_init.cmake:1.1 Thu Jul 21 11:39:21 2022
+++ pkgsrc/x11/wxGTK32/patches/patch-build_cmake_init.cmake     Fri Jul 29 18:36:06 2022
@@ -1,15 +1,29 @@
-$NetBSD: patch-build_cmake_init.cmake,v 1.1 2022/07/21 11:39:21 wiz Exp $
+$NetBSD: patch-build_cmake_init.cmake,v 1.2 2022/07/29 18:36:06 wiz Exp $
 
-Not defined in NetBSD build, don't know what should be added instead.
+fix OpenGL detection
 https://github.com/wxWidgets/wxWidgets/issues/22649
+Patch from
+https://github.com/wxWidgets/wxWidgets/pull/22677/
 
---- build/cmake/init.cmake.orig        2022-07-06 14:19:50.000000000 +0000
+--- build/cmake/init.cmake.orig        2022-07-29 18:21:12.340086310 +0000
 +++ build/cmake/init.cmake
-@@ -410,7 +410,6 @@ if(wxUSE_GUI)
+@@ -409,8 +409,18 @@ if(wxUSE_GUI)
+             set(OPENGL_LIBRARIES "-framework OpenGLES" "-framework QuartzCore" "-framework GLKit")
          else()
              find_package(OpenGL)
++            if(OPENGL_FOUND)
++                foreach(gltarget OpenGL::GL OpenGL::GLU OpenGL::OpenGL)
++                    if(TARGET ${gltarget})
++                        set(OPENGL_LIBRARIES ${gltarget} ${OPENGL_LIBRARIES})
++                    endif()
++                endforeach()
++            endif()
              if(WXGTK3 AND OpenGL_EGL_FOUND AND wxUSE_GLCANVAS_EGL)
 -                set(OPENGL_LIBRARIES OpenGL::OpenGL OpenGL::GLU OpenGL::EGL)
++                if(TARGET OpenGL::EGL)
++                    set(OPENGL_LIBRARIES OpenGL::EGL ${OPENGL_LIBRARIES})
++                endif()
++                set(OPENGL_INCLUDE_DIR ${OPENGL_INCLUDE_DIR} ${OPENGL_EGL_INCLUDE_DIRS})
                  find_package(WAYLANDEGL)
                  if(WAYLANDEGL_FOUND AND wxHAVE_GDK_WAYLAND)
                      list(APPEND OPENGL_LIBRARIES ${WAYLANDEGL_LIBRARIES})