qt6-qtbase: add fixes for FreeBSD

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: qt6-qtbase: add fixes for FreeBSD
From: Niclas Rosenvik <nros%NetBSD.org@localhost>
Date: Sun, 07 Mar 2021 14:08:02 +0000
Module Name:	pkgsrc-wip
Committed By:	Niclas Rosenvik <nros%NetBSD.org@localhost>
Pushed By:	nros
Date:		Sun Mar 7 14:08:02 2021 +0000
Changeset:	7922359c147195b5defc2b18f7355ef108a47cf8

Modified Files:
	qt6-qtbase/distinfo
	qt6-qtbase/patches/patch-cmake_FindGSSAPI.cmake
	qt6-qtbase/patches/patch-configure
	qt6-qtbase/patches/patch-src_corelib_CMakeLists.txt
Added Files:
	qt6-qtbase/PLIST.FreeBSD

Log Message:
qt6-qtbase: add fixes for FreeBSD

Add fixes and PLIST for FreeBSD.
Put gssapi in findgssapi first since FreeBSD has both gssapi and gsssapi_krb5
but the functions are in gssapi.
Add --warn-unresolved-symbols to ldflags since environ is not a waek symbol in
libc and that breaks the build.
The patch for configure got updated automaticly as well.

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

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

diffstat:
 qt6-qtbase/PLIST.FreeBSD                           | 29 ++++++++++++++++++++++
 qt6-qtbase/distinfo                                |  6 ++---
 qt6-qtbase/patches/patch-cmake_FindGSSAPI.cmake    |  6 ++---
 qt6-qtbase/patches/patch-configure                 | 12 ++++-----
 .../patches/patch-src_corelib_CMakeLists.txt       | 20 ++++++++++++---
 5 files changed, 58 insertions(+), 15 deletions(-)

diffs:
diff --git a/qt6-qtbase/PLIST.FreeBSD b/qt6-qtbase/PLIST.FreeBSD
new file mode 100644
index 0000000000..a0319de89b
--- /dev/null
+++ b/qt6-qtbase/PLIST.FreeBSD
@@ -0,0 +1,29 @@
+@comment $NetBSD$
+qt6/lib/cmake/Qt6Gui/Qt6QEvdevKeyboardPluginAdditionalTargetInfo.cmake
+qt6/lib/cmake/Qt6Gui/Qt6QEvdevKeyboardPluginConfig.cmake
+qt6/lib/cmake/Qt6Gui/Qt6QEvdevKeyboardPluginConfigVersion.cmake
+qt6/lib/cmake/Qt6Gui/Qt6QEvdevKeyboardPluginDependencies.cmake
+qt6/lib/cmake/Qt6Gui/Qt6QEvdevKeyboardPluginTargets-release.cmake
+qt6/lib/cmake/Qt6Gui/Qt6QEvdevKeyboardPluginTargets.cmake
+qt6/lib/cmake/Qt6Gui/Qt6QEvdevMousePluginAdditionalTargetInfo.cmake
+qt6/lib/cmake/Qt6Gui/Qt6QEvdevMousePluginConfig.cmake
+qt6/lib/cmake/Qt6Gui/Qt6QEvdevMousePluginConfigVersion.cmake
+qt6/lib/cmake/Qt6Gui/Qt6QEvdevMousePluginDependencies.cmake
+qt6/lib/cmake/Qt6Gui/Qt6QEvdevMousePluginTargets-release.cmake
+qt6/lib/cmake/Qt6Gui/Qt6QEvdevMousePluginTargets.cmake
+qt6/lib/cmake/Qt6Gui/Qt6QEvdevTabletPluginAdditionalTargetInfo.cmake
+qt6/lib/cmake/Qt6Gui/Qt6QEvdevTabletPluginConfig.cmake
+qt6/lib/cmake/Qt6Gui/Qt6QEvdevTabletPluginConfigVersion.cmake
+qt6/lib/cmake/Qt6Gui/Qt6QEvdevTabletPluginDependencies.cmake
+qt6/lib/cmake/Qt6Gui/Qt6QEvdevTabletPluginTargets-release.cmake
+qt6/lib/cmake/Qt6Gui/Qt6QEvdevTabletPluginTargets.cmake
+qt6/lib/cmake/Qt6Gui/Qt6QEvdevTouchScreenPluginAdditionalTargetInfo.cmake
+qt6/lib/cmake/Qt6Gui/Qt6QEvdevTouchScreenPluginConfig.cmake
+qt6/lib/cmake/Qt6Gui/Qt6QEvdevTouchScreenPluginConfigVersion.cmake
+qt6/lib/cmake/Qt6Gui/Qt6QEvdevTouchScreenPluginDependencies.cmake
+qt6/lib/cmake/Qt6Gui/Qt6QEvdevTouchScreenPluginTargets-release.cmake
+qt6/lib/cmake/Qt6Gui/Qt6QEvdevTouchScreenPluginTargets.cmake
+qt6/plugins/generic/libqevdevkeyboardplugin.so
+qt6/plugins/generic/libqevdevmouseplugin.so
+qt6/plugins/generic/libqevdevtabletplugin.so
+qt6/plugins/generic/libqevdevtouchplugin.so
diff --git a/qt6-qtbase/distinfo b/qt6-qtbase/distinfo
index 6e021aa2c5..5635f80ffe 100644
--- a/qt6-qtbase/distinfo
+++ b/qt6-qtbase/distinfo
@@ -4,19 +4,19 @@ SHA1 (qtbase-everywhere-src-6.0.2.tar.xz) = a04a95beeecc82edaf376257e797d438ea4f
 RMD160 (qtbase-everywhere-src-6.0.2.tar.xz) = c00c96106db8c8c685b8708751fe29c679dc40e0
 SHA512 (qtbase-everywhere-src-6.0.2.tar.xz) = f8a14d6fdbaa5e9dd83f12ee6b02b375230e04e435d5bced290070ec09bd22997414243c71000b85e5d1c0ab57bbb4cb26831b6939b2f944ba1c2c8d40fafd27
 Size (qtbase-everywhere-src-6.0.2.tar.xz) = 46265472 bytes
-SHA1 (patch-cmake_FindGSSAPI.cmake) = 2e26dcf1d412ff2dfe87d136012dfc74efb77e6c
+SHA1 (patch-cmake_FindGSSAPI.cmake) = 6ff305c475a874d8647f2f556d64250a77a9664b
 SHA1 (patch-cmake_QtBuild.cmake) = 9e51c025686de3b1a383056eb6c61b0884349b57
 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) = 07fb98e8c6629515867d0112b46853f8aa4532e1
 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
 SHA1 (patch-qmake_generators_makefile.cpp) = 1bca636dc88f258876df54bd0c6c64114fa7411d
 SHA1 (patch-qmake_generators_unix_unixmake2.cpp) = 6ea4efd2ce88d7cf3c73e1dc2cdf984fe3b6af04
-SHA1 (patch-src_corelib_CMakeLists.txt) = fb128a3119a5a0c0672af047238263938eb1fbf7
+SHA1 (patch-src_corelib_CMakeLists.txt) = be1889f2292e932a086ea10a8b857926b7c2156b
 SHA1 (patch-src_corelib_configure.json) = 7a83a356330e602cbc65256dd345a107004a67cb
 SHA1 (patch-src_corelib_global_qglobal.cpp) = 6368692c2d5d64633d956a89c6b4607667c121a7
 SHA1 (patch-src_corelib_global_qoperatingsystemversion.cpp) = 84695f7523352f0e7cf925da8d57715e73713bad
diff --git a/qt6-qtbase/patches/patch-cmake_FindGSSAPI.cmake b/qt6-qtbase/patches/patch-cmake_FindGSSAPI.cmake
index decddb46ae..1d8a1e6d8e 100644
--- a/qt6-qtbase/patches/patch-cmake_FindGSSAPI.cmake
+++ b/qt6-qtbase/patches/patch-cmake_FindGSSAPI.cmake
@@ -5,12 +5,12 @@ $NetBSD$
 * look for heimdals gssapi implementation as well
   fixes build where KRB5_TYPE = heimdal, see mk/krb5.buildlink3.mk
 
---- cmake/FindGSSAPI.cmake.orig	2021-01-26 18:29:22.000000000 +0000
+--- cmake/FindGSSAPI.cmake.orig	2021-02-09 18:01:03.000000000 +0000
 +++ cmake/FindGSSAPI.cmake
 @@ -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)
++pkg_search_module(PC_GSSAPI QUIET heimdal-gssapi krb5-gssapi)
  
  find_path(GSSAPI_INCLUDE_DIRS
            NAMES gssapi/gssapi.h
@@ -26,8 +26,8 @@ $NetBSD$
               GSS # framework
 -             gssapi_krb5
 +             gss
-+             gssapi_krb5 # mit krb5
 +             gssapi # heimdal
++             gssapi_krb5 # mit krb5
               HINTS ${PC_GSSAPILIBDIR}
  )
  
diff --git a/qt6-qtbase/patches/patch-configure b/qt6-qtbase/patches/patch-configure
index d6a78249c3..bcec6f7ed4 100644
--- a/qt6-qtbase/patches/patch-configure
+++ b/qt6-qtbase/patches/patch-configure
@@ -3,9 +3,9 @@ $NetBSD: patch-configure,v 1.5 2018/01/17 19:30:47 markd Exp $
 Don't use SDKs on OS X
 Add NetBSD/sparc{,64} support
 
---- configure.orig	2017-05-26 12:43:31.000000000 +0000
+--- configure.orig	2021-02-09 18:01:03.000000000 +0000
 +++ configure
-@@ -292,7 +292,6 @@ getQMakeConf()
+@@ -318,7 +318,6 @@ getQMakeConf()
  {
      if [ -z "$specvals" ]; then
          specvals=`expandQMakeConf "$QMAKESPEC/qmake.conf" | extractQMakeVariables`
@@ -13,10 +13,11 @@ Add NetBSD/sparc{,64} support
      fi
      getSingleQMakeVariable "$1" "$specvals"
  }
-@@ -605,6 +604,19 @@ if [ -z "$PLATFORM" ]; then
+@@ -654,6 +653,19 @@ if [ -z "$PLATFORM" ]; then
+         ;;
       LynxOS*:*)
          PLATFORM=lynxos-g++
-         ;;
++        ;;
 +    NetBSD:*:sparc)
 +        if [ "$OPT_VERBOSE" = "yes" ]; then
 +            echo "    NetBSD on SPARC"
@@ -29,7 +30,6 @@ Add NetBSD/sparc{,64} support
 +        fi
 +        CFG_HOST_ARCH=sparc
 +        CFG_HOST_BITSIZE=64
-+        ;;
+         ;;
       QNX:*)
          PLATFORM=unsupported/qnx-g++
-         ;;
diff --git a/qt6-qtbase/patches/patch-src_corelib_CMakeLists.txt b/qt6-qtbase/patches/patch-src_corelib_CMakeLists.txt
index 3a089f8a98..becd9ab051 100644
--- a/qt6-qtbase/patches/patch-src_corelib_CMakeLists.txt
+++ b/qt6-qtbase/patches/patch-src_corelib_CMakeLists.txt
@@ -1,13 +1,27 @@
 $NetBSD$
 
+* fix linking on Free and OpenBSD due to missing environ symbol
+
 * get QOperatinSystemVersion using uname on Free and NetBSD
 
 * use gzip compression instead of zstd since libarchive might miss zstd even
   if QT uses it, fixes the configure step on NetBSD
 
---- src/corelib/CMakeLists.txt.orig	2021-01-26 18:29:22.000000000 +0000
+--- src/corelib/CMakeLists.txt.orig	2021-02-09 18:01:03.000000000 +0000
 +++ src/corelib/CMakeLists.txt
-@@ -531,6 +531,11 @@ qt_internal_extend_target(Core CONDITION
+@@ -440,8 +440,9 @@ qt_internal_extend_target(Core CONDITION MSVC AND (TES
+         "/BASE:0x67000000"
+ )
+ 
+-#### Keys ignored in scope 6:.:.:corelib.pro:FREEBSD OR OPENBSD:
+-# QMAKE_LFLAGS_NOUNDEF = <EMPTY>
++if(FREEBSD OR OPENBSD)
++    target_link_options(Core PRIVATE "LINKER:--warn-unresolved-symbols")
++endif()
+ 
+ qt_internal_extend_target(Core CONDITION QT_FEATURE_animation
+     SOURCES
+@@ -531,6 +532,11 @@ qt_internal_extend_target(Core CONDITION INTEGRITY
          --pending_instantiations=128
  )
  
@@ -19,7 +33,7 @@ $NetBSD$
  #### Keys ignored in scope 14:.:.:corelib.pro:pathIsAbsolute(_ss_CMAKE_HOST_DATA_DIR):
  # CMAKE_HOST_DATA_DIR = "$$[QT_HOST_DATA/src]/"
  # CMAKE_HOST_DATA_DIR_IS_ABSOLUTE = "True"
-@@ -1179,7 +1184,7 @@ if(QT_FEATURE_mimetype AND QT_FEATURE_mi
+@@ -1178,7 +1184,7 @@ if(QT_FEATURE_mimetype AND QT_FEATURE_mimetype_databas
              COMMENT "Generating ${qmimeprovider_db_output}"
          )
      else()
Prev by Date: TODO: + spotifyd-0.3.2.
Next by Date: Add rterm
Previous by Thread: TODO: + spotifyd-0.3.2.
Next by Thread: Add rterm
Indexes:
Home | Main Index | Thread Index | Old Index