qt6-qtbase: proper -fp-model when gcc fix

[Niclas Rosenvik <nros%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Niclas Rosenvik <nros%NetBSD.org@localhost>
Pushed By:	nros
Date:		Fri Feb 19 14:21:01 2021 +0000
Changeset:	e050bf1a5df49ee12238e98d1544a3b5c7ee81fb

Modified Files:
	qt6-qtbase/distinfo
	qt6-qtbase/patches/patch-cmake_QtPlatformSupport.cmake
	qt6-qtbase/patches/patch-src_corelib_CMakeLists.txt
Removed Files:
	qt6-qtbase/patches/patch-tests_auto_corelib_global_qnumeric_CMakeLists.txt

Log Message:
qt6-qtbase: proper -fp-model when gcc fix

add patch that fixes the problem that the -fp-model switch gets added
when gcc is used. The line that sets ICC checks for icl or icc in
CMAKE_C_COMPILER and it can include the whole path to the compiler.
this causes ICC to be set if the pkgsrc directory is in a path that
has a directory with a name that includes icc or icl.

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

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

diffstat:
 qt6-qtbase/distinfo                                   |  5 ++---
 .../patches/patch-cmake_QtPlatformSupport.cmake       | 18 +++++++++++++++++-
 qt6-qtbase/patches/patch-src_corelib_CMakeLists.txt   | 19 ++++---------------
 ...-tests_auto_corelib_global_qnumeric_CMakeLists.txt | 15 ---------------
 4 files changed, 23 insertions(+), 34 deletions(-)

diffs:
diff --git a/qt6-qtbase/distinfo b/qt6-qtbase/distinfo
index 1afee2b1d0..0aab830e79 100644
--- a/qt6-qtbase/distinfo
+++ b/qt6-qtbase/distinfo
@@ -6,14 +6,14 @@ SHA512 (qtbase-everywhere-src-6.0.1.tar.xz) = 69a24162239f19e8eb889d51662c6cea38
 Size (qtbase-everywhere-src-6.0.1.tar.xz) = 46262020 bytes
 SHA1 (patch-cmake_FindGSSAPI.cmake) = 522dd9f02daef2587eb46a3a1c582fdd98a77360
 SHA1 (patch-cmake_QtBuild.cmake) = 9e51c025686de3b1a383056eb6c61b0884349b57
-SHA1 (patch-cmake_QtPlatformSupport.cmake) = 597c57d1acd2798e2f8393c6fd391721c2f54f41
+SHA1 (patch-cmake_QtPlatformSupport.cmake) = bd90fd811a27e80fe55d9ac1fe91ec6315b821c6
 SHA1 (patch-configure) = f5019131cc4e6cd4e35242cc7b598fbf8f5f766b
 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) = 143853018b34cda0f0d48c3fe2d106714136d88d
+SHA1 (patch-src_corelib_CMakeLists.txt) = a468e59a87fea434b42b0fcb84472e9ab0d9bdc2
 SHA1 (patch-src_corelib_configure.json) = 7a83a356330e602cbc65256dd345a107004a67cb
 SHA1 (patch-src_corelib_global_qrandom.cpp) = d910579df42d5b01583b88fa19f514b230596ca7
 SHA1 (patch-src_corelib_io_io.pri) = b2c1057e20c3150162695947bab958a2644df7dc
@@ -33,6 +33,5 @@ SHA1 (patch-src_plugins_platforms_xcb_qxcbatom.cpp) = abbd0b04b881666e82f45adc18
 SHA1 (patch-src_plugins_platforms_xcb_qxcbconnection__basic.h) = e369001cba31e865adf010ab714ad132b96c1bef
 SHA1 (patch-src_tools_moc_main.cpp) = ebdddd657ba1c24657a9ca5624907e31a5d0c8bb
 SHA1 (patch-src_widgets_graphicsview_qgraphicsitem__p.h) = fd55d5ef6fde506849aab07f7ba23e856373b3a1
-SHA1 (patch-tests_auto_corelib_global_qnumeric_CMakeLists.txt) = 53f3fcfcfd344565e36253d2b9105c1cd5dc6dd0
 SHA1 (patch-tests_auto_corelib_io_qprocess_qprocess.pro) = 1dbb08e5ec6715cbe239efdfb45389959b179ea3
 SHA1 (patch-tests_auto_widgets_itemviews_qtreewidgetitemiterator_qtreewidgetitemiterator.pro) = a0534c3fe05ea1d7a23170811d1da7fa740e31d1
diff --git a/qt6-qtbase/patches/patch-cmake_QtPlatformSupport.cmake b/qt6-qtbase/patches/patch-cmake_QtPlatformSupport.cmake
index a17cd9c2d1..55a4a719b2 100644
--- a/qt6-qtbase/patches/patch-cmake_QtPlatformSupport.cmake
+++ b/qt6-qtbase/patches/patch-cmake_QtPlatformSupport.cmake
@@ -2,7 +2,12 @@ $NetBSD$
 
 * add a common system type for all platforms that support X11
 
---- cmake/QtPlatformSupport.cmake.orig	2020-12-04 10:14:27.000000000 +0000
+* Fix ICC check, since CMAKE_C_COMPILER can include the whole path to the
+  compiler icc|icl matches directory names that include icl or icc
+
+* Fix QCC check for the same reason as the ICC check
+
+--- 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
  
@@ -13,3 +18,14 @@ $NetBSD$
  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)
+ 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")
+-qt_set01(ICC CMAKE_C_COMPILER MATCHES "icc|icl")
+-qt_set01(QCC CMAKE_C_COMPILER MATCHES "qcc") # FIXME: How to identify this?
++qt_set01(ICC CMAKE_CXX_COMPILER_ID MATCHES "Intel")
++qt_set01(QCC CMAKE_CXX_COMPILER_ID STREQUAL "QCC")
+ 
+ if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+     set(QT_64BIT TRUE)
diff --git a/qt6-qtbase/patches/patch-src_corelib_CMakeLists.txt b/qt6-qtbase/patches/patch-src_corelib_CMakeLists.txt
index b0b8fa6b65..9d76c1def1 100644
--- a/qt6-qtbase/patches/patch-src_corelib_CMakeLists.txt
+++ b/qt6-qtbase/patches/patch-src_corelib_CMakeLists.txt
@@ -1,22 +1,11 @@
 $NetBSD$
 
-somehow -fp-model is added to gcc builds when it should not
+* use gzip compression instead of zstd since libarchive might miss zstd even
+  if QT uses it, fixes the configure step on 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	2020-12-04 10:14:27.000000000 +0000
+--- src/corelib/CMakeLists.txt.orig	2021-01-26 18:29:22.000000000 +0000
 +++ src/corelib/CMakeLists.txt
-@@ -690,7 +690,7 @@ qt_internal_extend_target(Core CONDITION
-         WrapAtomic::WrapAtomic
- )
- 
--qt_internal_extend_target(Core CONDITION ICC
-+qt_internal_extend_target(Core CONDITION (ICC AND NOT GCC)
-     COMPILE_OPTIONS
-         -fp-model
-         strict
-@@ -1174,7 +1174,7 @@ if(QT_FEATURE_mimetype AND QT_FEATURE_mi
+@@ -1179,7 +1179,7 @@ if(QT_FEATURE_mimetype AND QT_FEATURE_mi
              COMMENT "Generating ${qmimeprovider_db_output}"
          )
      else()
diff --git a/qt6-qtbase/patches/patch-tests_auto_corelib_global_qnumeric_CMakeLists.txt b/qt6-qtbase/patches/patch-tests_auto_corelib_global_qnumeric_CMakeLists.txt
deleted file mode 100644
index d792c48b6b..0000000000
--- a/qt6-qtbase/patches/patch-tests_auto_corelib_global_qnumeric_CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-somehow -fp-model is added to gcc builds
-
---- tests/auto/corelib/global/qnumeric/CMakeLists.txt.orig	2020-12-04 10:14:27.000000000 +0000
-+++ tests/auto/corelib/global/qnumeric/CMakeLists.txt
-@@ -14,7 +14,7 @@ qt_internal_add_test(tst_qnumeric
- ## Scopes:
- #####################################################################
- 
--qt_internal_extend_target(tst_qnumeric CONDITION ICC
-+qt_internal_extend_target(tst_qnumeric CONDITION (ICC AND NOT GCC)
-     COMPILE_OPTIONS
-         -fp-model
-         strict