qt6-qtbase: add configure option to avoid cmake archiving api

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

Module Name:	pkgsrc-wip
Committed By:	Niclas Rosenvik <nros%netbsd.org@localhost>
Pushed By:	nros
Date:		Fri Apr 23 15:46:30 2021 +0000
Changeset:	e10ac32568b54e5fd3074e3fc0b98c41c0599863

Modified Files:
	qt6-qtbase/Makefile
	qt6-qtbase/distinfo
	qt6-qtbase/patches/patch-cmake_QtProcessConfigureArgs.cmake
	qt6-qtbase/patches/patch-src_corelib_CMakeLists.txt
Added Files:
	qt6-qtbase/patches/patch-src_corelib_qt__cmdline.cmake

Log Message:
qt6-qtbase: add configure option to avoid cmake archiving api

add configure options to avoid cmake archiving api
it needs to be avoided since kibarchive in pkgsrc is built without
zstd support

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

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

diffstat:
 qt6-qtbase/Makefile                                |  1 +
 qt6-qtbase/distinfo                                |  5 ++--
 .../patch-cmake_QtProcessConfigureArgs.cmake       | 13 ++++++++-
 .../patches/patch-src_corelib_CMakeLists.txt       | 34 +++++++++++++---------
 .../patches/patch-src_corelib_qt__cmdline.cmake    | 13 +++++++++
 5 files changed, 50 insertions(+), 16 deletions(-)

diffs:
diff --git a/qt6-qtbase/Makefile b/qt6-qtbase/Makefile
index b88034ed0d..8d07817df8 100644
--- a/qt6-qtbase/Makefile
+++ b/qt6-qtbase/Makefile
@@ -42,6 +42,7 @@ CONFIGURE_ARGS+=	-system-libpng
 CONFIGURE_ARGS+=	-system-pcre
 CONFIGURE_ARGS+=	-system-sqlite
 CONFIGURE_ARGS+=	-system-zlib
+CONFIGURE_ARGS+=	-avoid_cmake_archiving_api
 .if defined(MAKE_JOBS)
 .  if !defined(MAKE_JOBS_SAFE) || empty(MAKE_JOBS_SAFE:M[nN][oO])
 CONFIGURE_ENV+=		MAKEFLAGS=-j${MAKE_JOBS}
diff --git a/qt6-qtbase/distinfo b/qt6-qtbase/distinfo
index 99d443d503..7acd9f2aa1 100644
--- a/qt6-qtbase/distinfo
+++ b/qt6-qtbase/distinfo
@@ -8,14 +8,14 @@ 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-cmake_QtProcessConfigureArgs.cmake) = bc071cc80001c2cb5bf7ba205df6d9ba769ab16f
 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_generators_makefile.cpp) = 1bca636dc88f258876df54bd0c6c64114fa7411d
 SHA1 (patch-qmake_generators_unix_unixmake2.cpp) = 6ea4efd2ce88d7cf3c73e1dc2cdf984fe3b6af04
-SHA1 (patch-src_corelib_CMakeLists.txt) = be1889f2292e932a086ea10a8b857926b7c2156b
+SHA1 (patch-src_corelib_CMakeLists.txt) = 773be9e15bdc4f9953474ed54a7781b8d8415f9f
 SHA1 (patch-src_corelib_configure.json) = 7a83a356330e602cbc65256dd345a107004a67cb
 SHA1 (patch-src_corelib_global_qconfig-bootstrapped.h) = 3db71f61e51cdd71f01ad1e580e89367fc179c7c
 SHA1 (patch-src_corelib_global_qglobal.cpp) = 6368692c2d5d64633d956a89c6b4607667c121a7
@@ -24,6 +24,7 @@ SHA1 (patch-src_corelib_global_qoperatingsystemversion.h) = 33a2e58242e12c44da8c
 SHA1 (patch-src_corelib_global_qoperatingsystemversion__uname.cpp) = ab30d7f7c3ec3c9ac5eac61cee4383b916d16724
 SHA1 (patch-src_corelib_io_qstandardpaths_unix.cpp) = b12a41da19b25e34e12fdf80714a37e8c46278f9
 SHA1 (patch-src_corelib_io_qstorageinfo_unix.cpp) = 9919194e9f6b47f1f311b8f8223a6a7519152073
+SHA1 (patch-src_corelib_qt__cmdline.cmake) = 25fe89821ba1e1323edae87ca1ee0bd5ccf0e407
 SHA1 (patch-src_corelib_thread_qmutex__p.h) = 093089b8a37baa3071257c99bbde5f6295bd2eec
 SHA1 (patch-src_corelib_thread_qwaitcondition__unix.cpp) = 9dffdbfc81bc7d3259020cd32b4039b7be6ee2bd
 SHA1 (patch-src_gui_CMakeLists.txt) = 927c4fe13b26a0800d2b08299b01b1fed3b6c51f
diff --git a/qt6-qtbase/patches/patch-cmake_QtProcessConfigureArgs.cmake b/qt6-qtbase/patches/patch-cmake_QtProcessConfigureArgs.cmake
index f01d49d72e..8f466815e2 100644
--- a/qt6-qtbase/patches/patch-cmake_QtProcessConfigureArgs.cmake
+++ b/qt6-qtbase/patches/patch-cmake_QtProcessConfigureArgs.cmake
@@ -3,7 +3,10 @@ $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
+* add support for avoiding the cmake archiving api using configure since
+  libarchive in pkgsrc that cmake uses is built without zstd support
+
+--- cmake/QtProcessConfigureArgs.cmake.orig	2021-02-11 10:23:05.000000000 +0000
 +++ cmake/QtProcessConfigureArgs.cmake
 @@ -133,7 +133,7 @@ defstub(qt_feature_definition)
  defstub(qt_find_package)
@@ -14,3 +17,11 @@ $NetBSD$
  
  ####################################################################################################
  # Define functions/macros that are called in qt_cmdline.cmake files
+@@ -633,6 +633,7 @@ translate_boolean_input(precompile_heade
+ translate_boolean_input(ccache QT_USE_CCACHE)
+ translate_boolean_input(shared BUILD_SHARED_LIBS)
+ translate_boolean_input(warnings_are_errors WARNINGS_ARE_ERRORS)
++translate_boolean_input(avoid_cmake_archiving_api QT_AVOID_CMAKE_ARCHIVING_API)
+ translate_string_input(qt_namespace QT_NAMESPACE)
+ translate_string_input(qt_libinfix QT_LIBINFIX)
+ translate_string_input(qreal QT_COORD_TYPE)
diff --git a/qt6-qtbase/patches/patch-src_corelib_CMakeLists.txt b/qt6-qtbase/patches/patch-src_corelib_CMakeLists.txt
index becd9ab051..79ce93e3a4 100644
--- a/qt6-qtbase/patches/patch-src_corelib_CMakeLists.txt
+++ b/qt6-qtbase/patches/patch-src_corelib_CMakeLists.txt
@@ -4,12 +4,11 @@ $NetBSD$
 
 * 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
+* fix avoiding the cmake archiving api when buildling with make
 
---- src/corelib/CMakeLists.txt.orig	2021-02-09 18:01:03.000000000 +0000
+--- src/corelib/CMakeLists.txt.orig	2021-02-11 10:23:05.000000000 +0000
 +++ src/corelib/CMakeLists.txt
-@@ -440,8 +440,9 @@ qt_internal_extend_target(Core CONDITION MSVC AND (TES
+@@ -440,8 +440,9 @@ qt_internal_extend_target(Core CONDITION
          "/BASE:0x67000000"
  )
  
@@ -21,7 +20,7 @@ $NetBSD$
  
  qt_internal_extend_target(Core CONDITION QT_FEATURE_animation
      SOURCES
-@@ -531,6 +532,11 @@ qt_internal_extend_target(Core CONDITION INTEGRITY
+@@ -531,6 +532,11 @@ qt_internal_extend_target(Core CONDITION
          --pending_instantiations=128
  )
  
@@ -33,12 +32,21 @@ $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"
-@@ -1178,7 +1184,7 @@ if(QT_FEATURE_mimetype AND QT_FEATURE_mimetype_databas
-             COMMENT "Generating ${qmimeprovider_db_output}"
-         )
-     else()
--        if(QT_FEATURE_zstd)
-+        if(FALSE)
-             set(qmime_db_compression Zstd)
-             string(APPEND qmime_db_content "#define MIME_DATABASE_IS_ZSTD\n")
+@@ -1141,7 +1147,8 @@ if(QT_FEATURE_mimetype AND QT_FEATURE_mi
+     include(${CMAKE_CURRENT_SOURCE_DIR}/mimetypes/mimetypes_resources.cmake)
+ 
+ # Generate qmimeprovider_database.cpp
+-    set(qmimeprovider_db_output "${CMAKE_CURRENT_BINARY_DIR}/.rcc/qmimeprovider_database.cpp")
++    set(qmimeprovider_db_output_dir "${CMAKE_CURRENT_BINARY_DIR}/.rcc")
++    set(qmimeprovider_db_output "${qmimeprovider_db_output_dir}/qmimeprovider_database.cpp")
+     if(CMAKE_VERSION VERSION_LESS 3.18 OR QT_AVOID_CMAKE_ARCHIVING_API)
+         set(command_args "")
+         set(mime_dir "${CMAKE_CURRENT_SOURCE_DIR}/mimetypes/mime")
+@@ -1150,6 +1157,7 @@ if(QT_FEATURE_mimetype AND QT_FEATURE_mi
+             list(APPEND command_args "${mime_dir}/generate.bat")
+             list(APPEND command_depends "${mime_dir}/generate.bat" "${mime_dir}/hexdump.ps1" )
          else()
++            file(MAKE_DIRECTORY ${qmimeprovider_db_output_dir})
+             list(APPEND command_args perl "${mime_dir}/generate.pl" )
+         endif()
+ 
diff --git a/qt6-qtbase/patches/patch-src_corelib_qt__cmdline.cmake b/qt6-qtbase/patches/patch-src_corelib_qt__cmdline.cmake
new file mode 100644
index 0000000000..dc5e8f1ef4
--- /dev/null
+++ b/qt6-qtbase/patches/patch-src_corelib_qt__cmdline.cmake
@@ -0,0 +1,13 @@
+$NetBSD$
+
+* support avoiding the cmake archiving api using configure
+  cmakes archiving api needs to be avoided since pkgsrc libarchive 
+  that cmake uses is built without zstd support
+
+--- src/corelib/qt_cmdline.cmake.orig	2021-02-11 10:23:05.000000000 +0000
++++ src/corelib/qt_cmdline.cmake
+@@ -12,3 +12,4 @@ qt_commandline_option(pps TYPE boolean N
+ qt_commandline_option(slog2 TYPE boolean)
+ qt_commandline_option(syslog TYPE boolean)
+ qt_commandline_option(trace TYPE optionalString VALUES etw lttng no yes)
++qt_commandline_option(avoid_cmake_archiving_api TYPE boolean)