qt6-qtbase: remove building qtbase using qmake patches

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

Module Name:	pkgsrc-wip
Committed By:	Niclas Rosenvik <nros%NetBSD.org@localhost>
Pushed By:	nros
Date:		Sun Mar 28 21:38:17 2021 +0000
Changeset:	fa86da1fc4a0627487de68ccc2c18923ed1a58b7

Modified Files:
	qt6-qtbase/distinfo
Removed Files:
	qt6-qtbase/patches/patch-qmake_Makefile.unix
	qt6-qtbase/patches/patch-src_corelib_io_io.pri
	qt6-qtbase/patches/patch-tests_auto_corelib_io_qprocess_qprocess.pro
	qt6-qtbase/patches/patch-tests_auto_widgets_itemviews_qtreewidgetitemiterator_qtreewidgetitemiterator.pro

Log Message:
qt6-qtbase: remove building qtbase using qmake patches

Remove patches that affect buildling qtbase using qmake
these are useless since qt is now built with cmake.

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

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

diffstat:
 qt6-qtbase/distinfo                                |  4 ----
 qt6-qtbase/patches/patch-qmake_Makefile.unix       | 28 ----------------------
 qt6-qtbase/patches/patch-src_corelib_io_io.pri     | 17 -------------
 ...tch-tests_auto_corelib_io_qprocess_qprocess.pro | 18 --------------
 ...ewidgetitemiterator_qtreewidgetitemiterator.pro | 14 -----------
 5 files changed, 81 deletions(-)

diffs:
diff --git a/qt6-qtbase/distinfo b/qt6-qtbase/distinfo
index 5635f80ffe..42e7633250 100644
--- a/qt6-qtbase/distinfo
+++ b/qt6-qtbase/distinfo
@@ -13,7 +13,6 @@ 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) = be1889f2292e932a086ea10a8b857926b7c2156b
@@ -23,7 +22,6 @@ SHA1 (patch-src_corelib_global_qoperatingsystemversion.cpp) = 84695f7523352f0e7c
 SHA1 (patch-src_corelib_global_qoperatingsystemversion.h) = 33a2e58242e12c44da8ce2c3cdbdd85177673646
 SHA1 (patch-src_corelib_global_qoperatingsystemversion__uname.cpp) = ab30d7f7c3ec3c9ac5eac61cee4383b916d16724
 SHA1 (patch-src_corelib_global_qrandom.cpp) = d910579df42d5b01583b88fa19f514b230596ca7
-SHA1 (patch-src_corelib_io_io.pri) = b2c1057e20c3150162695947bab958a2644df7dc
 SHA1 (patch-src_corelib_io_qstandardpaths_unix.cpp) = b12a41da19b25e34e12fdf80714a37e8c46278f9
 SHA1 (patch-src_corelib_io_qstorageinfo_unix.cpp) = 9919194e9f6b47f1f311b8f8223a6a7519152073
 SHA1 (patch-src_corelib_thread_qmutex__p.h) = 093089b8a37baa3071257c99bbde5f6295bd2eec
@@ -43,5 +41,3 @@ SHA1 (patch-src_plugins_platforms_xcb_qxcbconnection__basic.h) = e369001cba31e86
 SHA1 (patch-src_tools_bootstrap_CMakeLists.txt) = 5b13a8d9cdfb9228a8594ab226fd0ff5b44e2009
 SHA1 (patch-src_tools_moc_main.cpp) = ebdddd657ba1c24657a9ca5624907e31a5d0c8bb
 SHA1 (patch-src_widgets_graphicsview_qgraphicsitem__p.h) = fd55d5ef6fde506849aab07f7ba23e856373b3a1
-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-qmake_Makefile.unix b/qt6-qtbase/patches/patch-qmake_Makefile.unix
deleted file mode 100644
index 6046884b4a..0000000000
--- a/qt6-qtbase/patches/patch-qmake_Makefile.unix
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-qmake_Makefile.unix,v 1.5 2020/06/02 06:41:00 adam Exp $
-
-Pass environmental variables from pkgsrc
-
---- qmake/Makefile.unix.orig	2020-12-04 10:14:27.000000000 +0000
-+++ qmake/Makefile.unix
-@@ -164,7 +164,7 @@ DEPEND_SRC = \
- # by configure); QTSRCS2 may include *.mm entries on macOS.
- # See below for special handling of qlibraryinfo.cpp
- 
--CPPFLAGS = -g $(EXTRA_CPPFLAGS) \
-+CPPFLAGS += -g $(EXTRA_CPPFLAGS) \
- 	   -I$(QMKSRC) -I$(QMKLIBSRC) -I$(QMKGENSRC) \
- 	   -I$(SOURCE_PATH)/src/3rdparty/tinycbor/src \
- 	   -I$(SOURCE_PATH)/src/3rdparty/pcre2/src \
-@@ -180,9 +180,9 @@ CPPFLAGS = -g $(EXTRA_CPPFLAGS) \
-            -DPCRE2_DISABLE_JIT \
-             $(EXTRA_CPPFLAGS)
- 
--CXXFLAGS = $(EXTRA_CXXFLAGS) $(CONFIG_CXXFLAGS) $(CPPFLAGS)
--CFLAGS = $(CPPFLAGS) $(CONFIG_CFLAGS)
--LFLAGS = $(EXTRA_LFLAGS) $(CONFIG_LFLAGS)
-+CXXFLAGS += $(EXTRA_CXXFLAGS) $(CONFIG_CXXFLAGS) $(CPPFLAGS)
-+CFLAGS += $(CPPFLAGS) $(CONFIG_CFLAGS)
-+LFLAGS = $(LDFLAGS) $(EXTRA_LFLAGS) $(CONFIG_LFLAGS)
- 
- first all: $(BUILD_PATH)/bin/qmake$(EXEEXT)
- qmake: $(BUILD_PATH)/bin/qmake$(EXEEXT)
diff --git a/qt6-qtbase/patches/patch-src_corelib_io_io.pri b/qt6-qtbase/patches/patch-src_corelib_io_io.pri
deleted file mode 100644
index a6ed3d1ca2..0000000000
--- a/qt6-qtbase/patches/patch-src_corelib_io_io.pri
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-src_corelib_io_io.pri,v 1.7 2018/12/18 09:57:18 adam Exp $
-
-* Add DragonFly support
-* Patch sent and merged upstream:
-  http://codereview.qt-project.org/#/c/111741/
-
---- src/corelib/io/io.pri.orig	2018-12-03 11:15:26.000000000 +0000
-+++ src/corelib/io/io.pri
-@@ -101,7 +101,7 @@ qtConfig(filesystemwatcher) {
-         SOURCES += io/qfilesystemwatcher_inotify.cpp
-         HEADERS += io/qfilesystemwatcher_inotify_p.h
-     } else {
--        freebsd|darwin|openbsd|netbsd {
-+        freebsd-*|darwin-*|openbsd-*|netbsd-*|dragonfly-* {
-             SOURCES += io/qfilesystemwatcher_kqueue.cpp
-             HEADERS += io/qfilesystemwatcher_kqueue_p.h
-         }
diff --git a/qt6-qtbase/patches/patch-tests_auto_corelib_io_qprocess_qprocess.pro b/qt6-qtbase/patches/patch-tests_auto_corelib_io_qprocess_qprocess.pro
deleted file mode 100644
index fd1b74fd5e..0000000000
--- a/qt6-qtbase/patches/patch-tests_auto_corelib_io_qprocess_qprocess.pro
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-tests_auto_corelib_io_qprocess_qprocess.pro,v 1.2 2018/01/17 19:30:47 markd Exp $
-
-* Pass whitespace(s) in filename test cases.
-
---- tests/auto/corelib/io/qprocess/qprocess.pro.orig	2017-01-18 14:20:58.000000000 +0000
-+++ tests/auto/corelib/io/qprocess/qprocess.pro
-@@ -3,10 +3,7 @@ TEMPLATE = subdirs
- include(qprocess.pri)
- SUBDIRS  = $$SUBPROGRAMS
- # Add special cases
--SUBDIRS += testProcessSpacesArgs/nospace.pro \
--           testProcessSpacesArgs/onespace.pro \
--           testProcessSpacesArgs/twospaces.pro \
--           testSpaceInName
-+SUBDIRS += testProcessSpacesArgs/nospace.pro
- 
- win32 {
-     SUBDIRS += \
diff --git a/qt6-qtbase/patches/patch-tests_auto_widgets_itemviews_qtreewidgetitemiterator_qtreewidgetitemiterator.pro b/qt6-qtbase/patches/patch-tests_auto_widgets_itemviews_qtreewidgetitemiterator_qtreewidgetitemiterator.pro
deleted file mode 100644
index 9667c6da27..0000000000
--- a/qt6-qtbase/patches/patch-tests_auto_widgets_itemviews_qtreewidgetitemiterator_qtreewidgetitemiterator.pro
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-tests_auto_widgets_itemviews_qtreewidgetitemiterator_qtreewidgetitemiterator.pro,v 1.1 2014/12/30 17:23:46 adam Exp $
-
-Consumes too much memory with Clang. As it is just a test case,
-disable optimisation for all compiler.
-
---- tests/auto/widgets/itemviews/qtreewidgetitemiterator/qtreewidgetitemiterator.pro.orig	2013-12-15 15:52:18.000000000 +0000
-+++ tests/auto/widgets/itemviews/qtreewidgetitemiterator/qtreewidgetitemiterator.pro
-@@ -4,4 +4,6 @@ TARGET = tst_qtreewidgetitemiterator
- QT += widgets testlib
- SOURCES  += tst_qtreewidgetitemiterator.cpp
- 
-+QMAKE_CXXFLAGS_WARN_ON= -O0
-+QMAKE_CXXFLAGS_WARN_OFF= -O0
-