x11-toolkits/soqt: update to 1.6.1

https://github.com/coin3d/soqt/releases/tag/v1.6.1

x11-toolkits/soqt/Makefile

@@ -1,10 +1,9 @@
 PORTNAME=	SoQt
-PORTVERSION=	1.6.0
-PORTREVISION=	2
+PORTVERSION=	1.6.1
 PORTEPOCH=		1
 CATEGORIES=	x11-toolkits
 # cannot USE_GITHUB: submodules required, distfile built by upstream
-MASTER_SITES=	https://github.com/coin3d/soqt/releases/download/${PORTNAME}-${PORTVERSION}/
+MASTER_SITES=	https://github.com/coin3d/soqt/releases/download/v${PORTVERSION}/
 DISTNAME=	soqt-${PORTVERSION}-src
 
 MAINTAINER=	cmt@FreeBSD.org
@@ -15,15 +14,18 @@ LICENSE=	BSD3CLAUSE
 
 LIB_DEPENDS=	libCoin.so:graphics/Coin
 
-USES=		cmake compiler:c++11-lang dos2unix gl libtool \
-		localbase:ldflags pathfix pkgconfig qmake:no_env qt:5 xorg
+USES=		cmake:noninja compiler:c++11-lang dos2unix gl libtool \
+		localbase pathfix pkgconfig qmake:no_env qt:5 xorg
 USE_QT=		buildtools core gui opengl qmake widgets
 USE_GL=		gl glu
 USE_XORG=	ice sm x11 xext xi
 USE_LDCONFIG=	yes
 
 CPPFLAGS+=	-I${QT_INCDIR}/QtCore -I${QT_INCDIR}
-LDFLAGS+=	-L${QT_LIBDIR}
+CXXFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${QT_LIBDIR} -L${LOCALBASE}/lib
+CMAKE_ARGS+=	-DSOQT_USE_QT4=off -DSOQT_USE_QT5=on -DSOQT_USE_QT6=off
+CONFIGURE_ENV+=	CPPFLAGS=-I${LOCALBASE}/include
 
 WRKSRC=		${WRKDIR}/soqt
 

x11-toolkits/soqt/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1669565946
-SHA256 (soqt-1.6.0-src.tar.gz) = 9f535af59f07c907022815679681bd345c9dec2f408c74833f6b1b24bca40e1f
-SIZE (soqt-1.6.0-src.tar.gz) = 1675532
+TIMESTAMP = 1700512870
+SHA256 (soqt-1.6.1-src.tar.gz) = 80289d9bd49ffe709ab85778c952573f43f1c725ea958c6d5969b2e9c77bb3ba
+SIZE (soqt-1.6.1-src.tar.gz) = 1705089

x11-toolkits/soqt/files/patch-CMakeLists.txt

@@ -1,20 +1,46 @@
---- CMakeLists.txt.orig	2020-01-15 23:29:46 UTC
-+++ CMakeLists.txt
-@@ -123,7 +123,7 @@ report_prepare(
+--- CMakeLists.txt.orig	2023-11-20 21:47:34.494796000 +0100
++++ CMakeLists.txt	2023-11-20 23:00:36.630907000 +0100
+@@ -128,7 +128,7 @@
+ # Fail early if one of the required packages cannot be found
 
  find_package(OpenGL REQUIRED)
- # Coin is typically installed as Inventor.framework on APPLE
--find_package(Coin NAMES Inventor Coin REQUIRED)
+-find_package(Coin REQUIRED)
 +find_package(Coin3D REQUIRED)
 
- if(SO${GUI}_USE_QT5)
-   find_package(Qt5 COMPONENTS Core Gui OpenGL Widgets QUIET)
-@@ -243,7 +243,7 @@ elseif(FUNCTION)
+ set(SO${GUI}_PKG_DEPS "Coin")
+
+@@ -290,19 +290,22 @@
  endif()
 
  set(CMAKE_REQUIRED_INCLUDES ${OPENGL_INCLUDE_DIR})
 -set(CMAKE_REQUIRED_LIBRARIES Coin::Coin ${OPENGL_LIBRARIES})
-+# set(CMAKE_REQUIRED_LIBRARIES Coin ${OPENGL_LIBRARIES})
++set(CMAKE_REQUIRED_LIBRARIES Coin ${OPENGL_LIBRARIES})
+
+-check_include_files(windows.h HAVE_WINDOWS_H)
+-if(HAVE_WINDOWS_H)
+-  check_include_files("windows.h;GL/gl.h" HAVE_GL_GL_H)
+-  check_include_files("windows.h;GL/glu.h" HAVE_GL_GLU_H)
+-elseif(APPLE)
+-  check_include_files(OpenGL/gl.h HAVE_OPENGL_GL_H)
+-  check_include_files(OpenGL/glu.h HAVE_OPENGL_GLU_H)
+-else()
+-  check_include_files(GL/gl.h HAVE_GL_GL_H)
+-  check_include_files(GL/glu.h HAVE_GL_GLU_H)
+-endif()
++# that logic below does not work, so we hardcode the result
++set(HAVE_GL_GL_H "1")
++set(HAVE_GL_GLU_H "1")
++# check_include_files(windows.h HAVE_WINDOWS_H)
++# if(HAVE_WINDOWS_H)
++#   check_include_files("windows.h;GL/gl.h" HAVE_GL_GL_H)
++#   check_include_files("windows.h;GL/glu.h" HAVE_GL_GLU_H)
++# elseif(APPLE)
++#   check_include_files(OpenGL/gl.h HAVE_OPENGL_GL_H)
++#   check_include_files(OpenGL/glu.h HAVE_OPENGL_GLU_H)
++# else()
++#   check_include_file(GL/gl.h HAVE_GL_GL_H)
++#   check_include_file(GL/glu.h HAVE_GL_GLU_H)
++# endif()
 
- check_include_files(windows.h HAVE_WINDOWS_H)
- if(HAVE_WINDOWS_H)
+ check_include_files(dlfcn.h HAVE_DLFCN_H)
+ check_include_files(inttypes.h HAVE_INTTYPES_H)

x11-toolkits/soqt/files/patch-soqt-config.cmake.in

@@ -1,11 +1,11 @@
---- soqt-config.cmake.in.orig	2020-01-15 22:42:50 UTC
-+++ soqt-config.cmake.in
+--- soqt-config.cmake.in.orig	2023-11-20 23:22:12.026499000 +0100
++++ soqt-config.cmake.in	2023-11-20 23:22:23.359003000 +0100
 @@ -26,7 +26,7 @@
 
  include(CMakeFindDependencyMacro)
 
--find_dependency(Coin REQUIRED)
-+find_dependency(Coin3D REQUIRED)
+-find_dependency(Coin)
++find_dependency(Coin3D)
 
- set(_have_qt5 @Qt5_FOUND@)
- set(_have_qt4 @Qt4_FOUND@)
+ set(@PROJECT_NAME@_HAVE_QT6 @Qt6_FOUND@)
+ set(@PROJECT_NAME@_HAVE_QT5 @Qt5_FOUND@)

x11-toolkits/soqt/files/patch-src_CMakeLists.txt

@@ -1,11 +1,11 @@
---- src/CMakeLists.txt.orig	2020-01-15 22:43:40 UTC
-+++ src/CMakeLists.txt
-@@ -149,7 +149,7 @@ if(NOT SO${GUI}_BUILD_MAC_FRAMEWORK)
+--- src/CMakeLists.txt.orig	2023-11-20 21:46:16.383242000 +0100
++++ src/CMakeLists.txt	2023-11-20 21:46:30.550874000 +0100
+@@ -163,7 +163,7 @@
    target_include_directories(${PROJECT_NAME} INTERFACE $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
  endif()
 
--target_link_libraries(${PROJECT_NAME} PUBLIC Coin::Coin ${SOQT_QT_TARGETS} ${OPENGL_LIBRARIES})
-+target_link_libraries(${PROJECT_NAME} PUBLIC Coin ${SOQT_QT_TARGETS} ${OPENGL_LIBRARIES})
+-target_link_libraries(${PROJECT_NAME} PUBLIC Coin::Coin ${SOQT_QT_TARGETS} ${OPENGL_LIBRARIES} ${SOQT_X11_LIBRARIES})
++target_link_libraries(${PROJECT_NAME} PUBLIC Coin ${SOQT_QT_TARGETS} ${OPENGL_LIBRARIES} ${SOQT_X11_LIBRARIES})
 
- if(X11_FOUND)
-   target_include_directories(${PROJECT_NAME} PUBLIC ${X11_INCLUDE_DIR})
+ # Add a target to generate API documentation with Doxygen
+ if(SO${GUI}_BUILD_DOCUMENTATION)

x11-toolkits/soqt/files/patch-src_Inventor_Qt_common_spwinput__x11.cpp.in

@@ -0,0 +1,10 @@
+--- src/Inventor/Qt/common/spwinput_x11.cpp.in.orig	2023-11-20 22:02:11.259871000 +0100
++++ src/Inventor/Qt/common/spwinput_x11.cpp.in	2023-11-20 22:02:57.180166000 +0100
+@@ -26,6 +26,7 @@
+ #ifdef HAVE_CONFIG_H
+ #include <config.h>
+ #endif /* HAVE_CONFIG_H */
++#include <netinet/in.h>
+
+ #if SO@GUI@_DEBUG && 0 // debug
+ #define SPW_DEBUG 1

x11-toolkits/soqt/files/patch-src_Inventor_Qt_common_viewers_SoGuiViewer.h.in

@@ -0,0 +1,11 @@
+--- src/Inventor/Qt/common/viewers/SoGuiViewer.h.in.orig	2023-11-20 23:42:54.863005000 +0100
++++ src/Inventor/Qt/common/viewers/SoGuiViewer.h.in	2023-11-20 23:43:09.606863000 +0100
+@@ -49,7 +49,7 @@
+ // Include this first, as a workaround for building on top of SGI and
+ // TGS Inventor on some Linux distributions. (The bug is in SGI/TGS
+ // Inventor.)
+-#include <cmath>
++// #include <cmath>
+
+ #include <Inventor/SbTime.h>
+ #include <Inventor/SoType.h>