qt6-qtbase: add and update patches to add solaris/illumos support

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: qt6-qtbase: add and update patches to add solaris/illumos support
From: Niclas Rosenvik <nros%NetBSD.org@localhost>
Date: Tue, 23 Feb 2021 15:09:42 +0000
Module Name:	pkgsrc-wip
Committed By:	Niclas Rosenvik <nros%NetBSD.org@localhost>
Pushed By:	nros
Date:		Tue Feb 23 15:09:42 2021 +0000
Changeset:	b9bc47b753564540d6894d11e638cd8df2de3c72

Modified Files:
	qt6-qtbase/distinfo
	qt6-qtbase/patches/patch-cmake_FindGSSAPI.cmake
	qt6-qtbase/patches/patch-cmake_QtPlatformSupport.cmake
Added Files:
	qt6-qtbase/patches/patch-cmake_QtFeature.cmake
	qt6-qtbase/patches/patch-cmake_QtProcessConfigureArgs.cmake
	qt6-qtbase/patches/patch-configure.cmake
	qt6-qtbase/patches/patch-src_network_CMakeLists.txt
	qt6-qtbase/patches/patch-src_network_configure.cmake

Log Message:
qt6-qtbase: add and update patches to add solaris/illumos support

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=b9bc47b753564540d6894d11e638cd8df2de3c72

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

diffstat:
 qt6-qtbase/distinfo                                |  9 +++++--
 qt6-qtbase/patches/patch-cmake_FindGSSAPI.cmake    |  7 +++--
 qt6-qtbase/patches/patch-cmake_QtFeature.cmake     | 29 ++++++++++++++++++++
 .../patches/patch-cmake_QtPlatformSupport.cmake    | 12 ++++++---
 .../patch-cmake_QtProcessConfigureArgs.cmake       | 16 +++++++++++
 qt6-qtbase/patches/patch-configure.cmake           | 15 +++++++++++
 .../patches/patch-src_network_CMakeLists.txt       | 12 +++++++++
 .../patches/patch-src_network_configure.cmake      | 31 ++++++++++++++++++++++
 8 files changed, 124 insertions(+), 7 deletions(-)

diffs:
diff --git a/qt6-qtbase/distinfo b/qt6-qtbase/distinfo
index 0aab830e79..dc21b4bcc3 100644
--- a/qt6-qtbase/distinfo
+++ b/qt6-qtbase/distinfo
@@ -4,10 +4,13 @@ SHA1 (qtbase-everywhere-src-6.0.1.tar.xz) = 1cd91a1696b8e4b59483a271aa7f9fde22a9
 RMD160 (qtbase-everywhere-src-6.0.1.tar.xz) = 2b3a5bc8834c3330ac4194eaaaedb327faeb9c3d
 SHA512 (qtbase-everywhere-src-6.0.1.tar.xz) = 69a24162239f19e8eb889d51662c6cea3869ad7e53a889fe16c35083840fde8c90053b0f943129c82066364eea0ec94eb86d91d3293ef874e100476dad10a998
 Size (qtbase-everywhere-src-6.0.1.tar.xz) = 46262020 bytes
-SHA1 (patch-cmake_FindGSSAPI.cmake) = 522dd9f02daef2587eb46a3a1c582fdd98a77360
+SHA1 (patch-cmake_FindGSSAPI.cmake) = 2e26dcf1d412ff2dfe87d136012dfc74efb77e6c
 SHA1 (patch-cmake_QtBuild.cmake) = 9e51c025686de3b1a383056eb6c61b0884349b57
-SHA1 (patch-cmake_QtPlatformSupport.cmake) = bd90fd811a27e80fe55d9ac1fe91ec6315b821c6
+SHA1 (patch-cmake_QtFeature.cmake) = 14f2f760c1e603b80fa14699e91240e8fcd699d3
+SHA1 (patch-cmake_QtPlatformSupport.cmake) = 656067b74fd8e44f0a225710613fa595accf8fd7
+SHA1 (patch-cmake_QtProcessConfigureArgs.cmake) = 354d22c59ea69a9af24f5aa68279eb25fbb37f71
 SHA1 (patch-configure) = f5019131cc4e6cd4e35242cc7b598fbf8f5f766b
+SHA1 (patch-configure.cmake) = b2f0982b9b097f3c25a57c690a264ad0765d36fc
 SHA1 (patch-mkspecs_features_qt__module.prf) = a04c4b1fe80250b6b3591f5486ac0fd3b5056c26
 SHA1 (patch-mkspecs_features_toolchain.prf) = 0cf13cb6e859dd6276954239b91953e557add515
 SHA1 (patch-qmake_Makefile.unix) = 05037b4db1b83dbfc9647b3258f896f4fac4a4dc
@@ -27,6 +30,8 @@ SHA1 (patch-src_gui_kernel_qopenglcontext__platform.h) = 13f6c1c91f1ad3ca5a5090f
 SHA1 (patch-src_gui_kernel_qplatformopenglcontext.h) = adbdbb18e2a6699454c042d4b1232a56eb35d1ab
 SHA1 (patch-src_gui_platform_unix_qunixnativeinterface.cpp) = 7bc8bd78c6c6f4ec70526f2efaff2551acb3697a
 SHA1 (patch-src_gui_text_qtextmarkdownimporter.cpp) = 64d74c8a7965687a833620b641253f3b94990f5e
+SHA1 (patch-src_network_CMakeLists.txt) = 51f8d137b821e243de45c6c36c0bc7a64dedc19a
+SHA1 (patch-src_network_configure.cmake) = 813d2418960cea75c593b49a4e632b7eb3b1d59f
 SHA1 (patch-src_network_kernel_qnetworkinterface__unix.cpp) = 2c5569eb2ba19999eb62e4fdb54f347c88f6e6a5
 SHA1 (patch-src_plugins_platforms_cocoa_qiosurfacegraphicsbuffer.mm) = 01afb2aef1d14370308c897c1d077b05c5e3f0a9
 SHA1 (patch-src_plugins_platforms_xcb_qxcbatom.cpp) = abbd0b04b881666e82f45adc18e49aafdb43d4be
diff --git a/qt6-qtbase/patches/patch-cmake_FindGSSAPI.cmake b/qt6-qtbase/patches/patch-cmake_FindGSSAPI.cmake
index 853cf981f2..decddb46ae 100644
--- a/qt6-qtbase/patches/patch-cmake_FindGSSAPI.cmake
+++ b/qt6-qtbase/patches/patch-cmake_FindGSSAPI.cmake
@@ -1,11 +1,13 @@
 $NetBSD$
 
+* look for gss as used on Solaris
+
 * look for heimdals gssapi implementation as well
   fixes build where KRB5_TYPE = heimdal, see mk/krb5.buildlink3.mk
 
---- cmake/FindGSSAPI.cmake.orig	2021-02-15 21:57:24.639772681 +0000
+--- cmake/FindGSSAPI.cmake.orig	2021-01-26 18:29:22.000000000 +0000
 +++ cmake/FindGSSAPI.cmake
-@@ -1,15 +1,19 @@
+@@ -1,15 +1,20 @@
  find_package(PkgConfig QUIET)
 -pkg_check_modules(PC_GSSAPI QUIET krb5-gssapi)
 +pkg_search_module(PC_GSSAPI QUIET krb5-gssapi heimdal-gssapi)
@@ -23,6 +25,7 @@ $NetBSD$
               NAMES
               GSS # framework
 -             gssapi_krb5
++             gss
 +             gssapi_krb5 # mit krb5
 +             gssapi # heimdal
               HINTS ${PC_GSSAPILIBDIR}
diff --git a/qt6-qtbase/patches/patch-cmake_QtFeature.cmake b/qt6-qtbase/patches/patch-cmake_QtFeature.cmake
new file mode 100644
index 0000000000..ea2b84a6e7
--- /dev/null
+++ b/qt6-qtbase/patches/patch-cmake_QtFeature.cmake
@@ -0,0 +1,29 @@
+$NetBSD$
+
+* add function so that libraries such as socket and nsl 
+  can be added to tests
+
+--- cmake/QtFeature.cmake.orig	2021-01-26 18:29:22.000000000 +0000
++++ cmake/QtFeature.cmake
+@@ -1023,4 +1023,21 @@ function(qt_make_features_available targ
+     endforeach()
+ endfunction()
+ 
++# function to add libs to an INTERFACE library target if the lib exists,
++# needed because qt_config_compile test only accepts imported targets in its
++# LIBRARIES argument if PROJECT_PATH is not set.
++function(qt_test_lib_target)
++qt_parse_all_arguments(arg "qt_test_lib_target" "" "TARGET" "LIBS" ${ARGN})
+ 
++if(TARGET ${arg_TARGET})
++return()
++endif()
++add_library(${arg_TARGET} INTERFACE IMPORTED)
++foreach(_lib ${arg_LIBS})
++find_library(fl_${_lib} NAMES ${_lib})
++if(fl_${_lib})
++target_link_libraries(${arg_TARGET} INTERFACE ${fl_${_lib}})
++endif()
++endforeach()
++
++endfunction()
diff --git a/qt6-qtbase/patches/patch-cmake_QtPlatformSupport.cmake b/qt6-qtbase/patches/patch-cmake_QtPlatformSupport.cmake
index 55a4a719b2..91bdc65a14 100644
--- a/qt6-qtbase/patches/patch-cmake_QtPlatformSupport.cmake
+++ b/qt6-qtbase/patches/patch-cmake_QtPlatformSupport.cmake
@@ -1,5 +1,7 @@
 $NetBSD$
 
+*add Solaris support
+
 * add a common system type for all platforms that support X11
 
 * Fix ICC check, since CMAKE_C_COMPILER can include the whole path to the
@@ -9,16 +11,20 @@ $NetBSD$
 
 --- cmake/QtPlatformSupport.cmake.orig	2021-01-26 18:29:22.000000000 +0000
 +++ cmake/QtPlatformSupport.cmake
-@@ -20,6 +20,8 @@ qt_set01(WASM CMAKE_SYSTEM_NAME STREQUAL
+@@ -17,9 +17,12 @@ qt_set01(OPENBSD CMAKE_SYSTEM_NAME STREQ
+ qt_set01(FREEBSD CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") # FIXME: How to identify this?
+ qt_set01(NETBSD CMAKE_SYSTEM_NAME STREQUAL "NetBSD") # FIXME: How to identify this?
+ qt_set01(WASM CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
++qt_set01(SOLARIS CMAKE_SYSTEM_NAME STREQUAL "SunOS")
  
  qt_set01(BSD APPLE OR OPENBSD OR FREEBSD OR NETBSD)
  
-+qt_set01(X11_PLATFORM LINUX OR HPUX OR OPENBSD OR FREEBSD OR NETBSD)
++qt_set01(X11_PLATFORM LINUX OR HPUX OR OPENBSD OR FREEBSD OR NETBSD OR SOLARIS)
 +
  qt_set01(WINRT WIN32 AND CMAKE_VS_PLATFORM_TOOSLET STREQUAL "winrt") # FIXME: How to identify this?
  
  qt_set01(IOS APPLE AND CMAKE_SYSTEM_NAME STREQUAL "iOS")
-@@ -31,8 +33,8 @@ qt_set01(MACOS APPLE AND NOT UIKIT)
+@@ -31,8 +34,8 @@ qt_set01(MACOS APPLE AND NOT UIKIT)
  qt_set01(GCC CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
  qt_set01(CLANG CMAKE_CXX_COMPILER_ID MATCHES "Clang")
  qt_set01(APPLECLANG CMAKE_CXX_COMPILER_ID MATCHES "AppleClang")
diff --git a/qt6-qtbase/patches/patch-cmake_QtProcessConfigureArgs.cmake b/qt6-qtbase/patches/patch-cmake_QtProcessConfigureArgs.cmake
new file mode 100644
index 0000000000..f01d49d72e
--- /dev/null
+++ b/qt6-qtbase/patches/patch-cmake_QtProcessConfigureArgs.cmake
@@ -0,0 +1,16 @@
+$NetBSD$
+
+* add function so that libraries such as socket and nsl 
+  can be added to tests
+
+--- cmake/QtProcessConfigureArgs.cmake.orig	2021-01-26 18:29:22.000000000 +0000
++++ cmake/QtProcessConfigureArgs.cmake
+@@ -133,7 +133,7 @@ defstub(qt_feature_definition)
+ defstub(qt_find_package)
+ defstub(set_package_properties)
+ defstub(qt_qml_find_python)
+-
++defstub(qt_test_lib_target)
+ 
+ ####################################################################################################
+ # Define functions/macros that are called in qt_cmdline.cmake files
diff --git a/qt6-qtbase/patches/patch-configure.cmake b/qt6-qtbase/patches/patch-configure.cmake
new file mode 100644
index 0000000000..3032855e44
--- /dev/null
+++ b/qt6-qtbase/patches/patch-configure.cmake
@@ -0,0 +1,15 @@
+$NetBSD$
+
+* turn off reduce locations on solaris since it currently doesn't work
+
+--- configure.cmake.orig	2021-01-26 18:29:22.000000000 +0000
++++ configure.cmake
+@@ -144,7 +144,7 @@ qt_config_linker_supports_flag_test(gdb_
+ qt_config_compile_test(reduce_relocations
+     LABEL "-Bsymbolic-functions support"
+     CODE
+-"#if !(defined(__i386) || defined(__i386__) || defined(__x86_64) || defined(__x86_64__) || defined(__amd64))
++"#if !(defined(__i386) || defined(__i386__) || defined(__x86_64) || defined(__x86_64__) || defined(__amd64)) || defined(__sun) || defined(__sun__)
+ #  error Symbolic function binding on this architecture may be broken, disabling it (see QTBUG-36129).
+ #endif
+ 
diff --git a/qt6-qtbase/patches/patch-src_network_CMakeLists.txt b/qt6-qtbase/patches/patch-src_network_CMakeLists.txt
new file mode 100644
index 0000000000..847976dab5
--- /dev/null
+++ b/qt6-qtbase/patches/patch-src_network_CMakeLists.txt
@@ -0,0 +1,12 @@
+$NetBSD$
+
+* add libraries needed for networking on solaris
+
+--- src/network/CMakeLists.txt.orig	2021-01-26 18:29:22.000000000 +0000
++++ src/network/CMakeLists.txt
+@@ -430,3 +430,5 @@ qt_internal_add_docs(Network
+ qt_internal_extend_target(Network CONDITION WIN32 PUBLIC_LIBRARIES ws2_32) # special case: mkspecs/common/msvc-desktop.conf
+ 
+ qt_internal_extend_target(Network CONDITION QNX PUBLIC_LIBRARIES socket) # special case: mkspecs/common/qcc-base-qnx.conf
++
++qt_internal_extend_target(Network CONDITION SOLARIS PUBLIC_LIBRARIES socket nsl)
diff --git a/qt6-qtbase/patches/patch-src_network_configure.cmake b/qt6-qtbase/patches/patch-src_network_configure.cmake
new file mode 100644
index 0000000000..7c32fa49cd
--- /dev/null
+++ b/qt6-qtbase/patches/patch-src_network_configure.cmake
@@ -0,0 +1,31 @@
+$NetBSD$
+
+* add libraries needed for networking on solaris
+
+--- src/network/configure.cmake.orig	2021-01-26 18:29:22.000000000 +0000
++++ src/network/configure.cmake
+@@ -9,6 +9,8 @@
+ qt_find_package(WrapBrotli PROVIDED_TARGETS WrapBrotli::WrapBrotliDec MODULE_NAME network QMAKE_LIB brotli)
+ qt_find_package(Libproxy PROVIDED_TARGETS PkgConfig::Libproxy MODULE_NAME network QMAKE_LIB libproxy)
+ qt_find_package(WrapOpenSSLHeaders PROVIDED_TARGETS WrapOpenSSLHeaders::WrapOpenSSLHeaders MODULE_NAME network QMAKE_LIB openssl/nolink)
++qt_test_lib_target(TARGET QtTEST::needed_network_libs LIBS socket nsl)
++
+ # openssl_headers
+ qt_config_compile_test(openssl_headers
+     LIBRARIES
+@@ -66,6 +68,7 @@ qt_find_package(GSSAPI PROVIDED_TARGETS
+ # getifaddrs
+ qt_config_compile_test(getifaddrs
+     LABEL "getifaddrs()"
++    LIBRARIES QtTEST::needed_network_libs
+     CODE
+ "
+ #include <sys/types.h>
+@@ -89,6 +92,7 @@ freeifaddrs(list);
+ # ipv6ifname
+ qt_config_compile_test(ipv6ifname
+     LABEL "IPv6 ifname"
++    LIBRARIES QtTEST::needed_network_libs
+     CODE
+ "
+ #include <sys/types.h>
Prev by Date: qt6-qtbase: pkglint fixes for PLIST.Linux
Next by Date: igv: Update to 2.9.2, add local pkgsrc JAVA_HOME, clean up
Previous by Thread: qt6-qtbase: pkglint fixes for PLIST.Linux
Next by Thread: igv: Update to 2.9.2, add local pkgsrc JAVA_HOME, clean up
Indexes:
Home | Main Index | Thread Index | Old Index