From 53be0e5173513aadc794772e630ccba838fa3b46 Mon Sep 17 00:00:00 2001
From: Kamil Rytarowski <n54@gmx.com>
Date: Thu, 26 May 2016 02:20:35 +0200
Subject: [PATCH] qt5-qtbase-git: Drop local patches

* Abandon libtool modifications
* Partly local NetBSD and OpenBSD patches merged upstream
---
 .../patch-config.tests_unix_iconv_iconv.cpp   | 18 -----
 qt5-qtbase-git/patches/patch-configure        | 81 -------------------
 .../patch-mkspecs_features_create__cmake.prf  | 26 ------
 .../patches/patch-mkspecs_features_simd.prf   | 38 ---------
 .../patches/patch-qmake_Makefile.unix         | 42 ----------
 .../patch-qmake_generators_makefile.cpp       | 15 ----
 .../patch-qmake_generators_unix_unixmake.cpp  | 15 ----
 .../patch-qmake_generators_unix_unixmake2.cpp | 43 ----------
 qt5-qtbase-git/patches/patch-qmake_qmake.pri  | 15 ----
 ...c_concurrent_qtconcurrentiteratekernel.cpp | 24 ------
 .../patch-src_corelib_arch_sparc_arch.pri     | 15 ----
 .../patch-src_corelib_codecs_qiconvcodec.cpp  | 75 -----------------
 ...atch-src_corelib_global_qsystemdetection.h | 24 ------
 .../patches/patch-src_corelib_io_io.pri       | 25 ------
 .../patch-src_corelib_io_qlockfile__unix.cpp  | 37 ---------
 ...tch-src_corelib_io_qstandardpaths_unix.cpp | 14 ----
 ...patch-src_corelib_io_qstorageinfo_unix.cpp | 25 ------
 ...tch-src_network_kernel_qhostinfo__unix.cpp | 13 ---
 ...-src_openglextensions_openglextensions.pro | 12 ---
 ...ch-src_platformsupport_platformsupport.pro | 15 ----
 ..._platforminputcontexts_compose_compose.pro | 15 ----
 ...exts_compose_generator_qtablegenerator.cpp | 17 ----
 .../patch-src_tools_bootstrap_bootstrap.pro   | 12 ---
 .../patches/patch-src_tools_moc_main.cpp      | 14 ----
 ...rc_widgets_graphicsview_qgraphicsitem__p.h | 13 ---
 ...ests_auto_corelib_io_qprocess_qprocess.pro | 18 -----
 ...etitemiterator_qtreewidgetitemiterator.pro | 14 ----
 27 files changed, 675 deletions(-)
 delete mode 100644 qt5-qtbase-git/patches/patch-config.tests_unix_iconv_iconv.cpp
 delete mode 100644 qt5-qtbase-git/patches/patch-configure
 delete mode 100644 qt5-qtbase-git/patches/patch-mkspecs_features_create__cmake.prf
 delete mode 100644 qt5-qtbase-git/patches/patch-mkspecs_features_simd.prf
 delete mode 100644 qt5-qtbase-git/patches/patch-qmake_Makefile.unix
 delete mode 100644 qt5-qtbase-git/patches/patch-qmake_generators_makefile.cpp
 delete mode 100644 qt5-qtbase-git/patches/patch-qmake_generators_unix_unixmake.cpp
 delete mode 100644 qt5-qtbase-git/patches/patch-qmake_generators_unix_unixmake2.cpp
 delete mode 100644 qt5-qtbase-git/patches/patch-qmake_qmake.pri
 delete mode 100644 qt5-qtbase-git/patches/patch-src_concurrent_qtconcurrentiteratekernel.cpp
 delete mode 100644 qt5-qtbase-git/patches/patch-src_corelib_arch_sparc_arch.pri
 delete mode 100644 qt5-qtbase-git/patches/patch-src_corelib_codecs_qiconvcodec.cpp
 delete mode 100644 qt5-qtbase-git/patches/patch-src_corelib_global_qsystemdetection.h
 delete mode 100644 qt5-qtbase-git/patches/patch-src_corelib_io_io.pri
 delete mode 100644 qt5-qtbase-git/patches/patch-src_corelib_io_qlockfile__unix.cpp
 delete mode 100644 qt5-qtbase-git/patches/patch-src_corelib_io_qstandardpaths_unix.cpp
 delete mode 100644 qt5-qtbase-git/patches/patch-src_corelib_io_qstorageinfo_unix.cpp
 delete mode 100644 qt5-qtbase-git/patches/patch-src_network_kernel_qhostinfo__unix.cpp
 delete mode 100644 qt5-qtbase-git/patches/patch-src_openglextensions_openglextensions.pro
 delete mode 100644 qt5-qtbase-git/patches/patch-src_platformsupport_platformsupport.pro
 delete mode 100644 qt5-qtbase-git/patches/patch-src_plugins_platforminputcontexts_compose_compose.pro
 delete mode 100644 qt5-qtbase-git/patches/patch-src_plugins_platforminputcontexts_compose_generator_qtablegenerator.cpp
 delete mode 100644 qt5-qtbase-git/patches/patch-src_tools_bootstrap_bootstrap.pro
 delete mode 100644 qt5-qtbase-git/patches/patch-src_tools_moc_main.cpp
 delete mode 100644 qt5-qtbase-git/patches/patch-src_widgets_graphicsview_qgraphicsitem__p.h
 delete mode 100644 qt5-qtbase-git/patches/patch-tests_auto_corelib_io_qprocess_qprocess.pro
 delete mode 100644 qt5-qtbase-git/patches/patch-tests_auto_widgets_itemviews_qtreewidgetitemiterator_qtreewidgetitemiterator.pro

diff --git a/qt5-qtbase-git/patches/patch-config.tests_unix_iconv_iconv.cpp b/qt5-qtbase-git/patches/patch-config.tests_unix_iconv_iconv.cpp
deleted file mode 100644
index 5c3cda5b9ca..00000000000
--- a/qt5-qtbase-git/patches/patch-config.tests_unix_iconv_iconv.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-config.tests_unix_iconv_iconv.cpp,v 1.1 2014/12/30 17:23:46 adam Exp $
-
-* Fix for NetBSD iconv(3)
-
---- config.tests/unix/iconv/iconv.cpp.orig	2013-11-27 01:01:17.000000000 +0000
-+++ config.tests/unix/iconv/iconv.cpp
-@@ -48,7 +48,11 @@ int main(int, char **)
- {
-     iconv_t x = iconv_open("", "");
- 
-+#if defined(__NetBSD__)
-+    const char *inp;
-+#else
-     char *inp;
-+#endif
-     char *outp;
-     size_t inbytes, outbytes;
-     iconv(x, &inp, &inbytes, &outp, &outbytes);
diff --git a/qt5-qtbase-git/patches/patch-configure b/qt5-qtbase-git/patches/patch-configure
deleted file mode 100644
index 03ce9d63cd3..00000000000
--- a/qt5-qtbase-git/patches/patch-configure
+++ /dev/null
@@ -1,81 +0,0 @@
-$NetBSD: patch-configure,v 1.4 2016/03/14 06:12:17 dbj Exp $
-
-* Don't use SDKs on OS X
-* Add NetBSD/sparc{,64} support
-
---- configure.orig	2015-10-13 04:35:07.000000000 +0000
-+++ configure
-@@ -337,7 +337,6 @@ getQMakeConf()
- {
-     if [ -z "$specvals" ]; then
-         specvals=`expandQMakeConf "$QMAKESPEC/qmake.conf" | extractQMakeVariables "host_build"`
--        if [ "$BUILD_ON_MAC" = "yes" ]; then specvals=$(macSDKify "$specvals"); fi
-     fi
-     getSingleQMakeVariable "$1" "$specvals"
- }
-@@ -346,7 +345,6 @@ getXQMakeConf()
- {
-     if [ -z "$xspecvals" ]; then
-         xspecvals=`expandQMakeConf "$XQMAKESPEC/qmake.conf" | extractQMakeVariables "!host_build"`
--        if [ "$XPLATFORM_MAC" = "yes" ]; then xspecvals=$(macSDKify "$xspecvals"); fi
-     fi
-     getSingleQMakeVariable "$1" "$xspecvals"
- }
-@@ -527,7 +525,7 @@ if [ "$BUILD_ON_MAC" = "yes" ]; then
-         exit 2
-     fi
- 
--    if ! /usr/bin/xcrun -find xcrun >/dev/null 2>&1; then
-+    if ! /usr/bin/xcrun -find cc >/dev/null 2>&1; then
-         echo >&2
-         echo "   Xcode not set up properly. You may need to confirm the license" >&2
-         echo "   agreement by running /usr/bin/xcodebuild without arguments." >&2
-@@ -2897,6 +2895,19 @@ if [ -z "$PLATFORM" ]; then
-      UNIX_SV:*)
-         PLATFORM=unixware-g++
-         ;;
-+    NetBSD:*:sparc)
-+        if [ "$OPT_VERBOSE" = "yes" ]; then
-+            echo "    NetBSD on SPARC"
-+        fi
-+        CFG_HOST_ARCH=sparc
-+        ;;
-+    NetBSD:*:sparc64)
-+        if [ "$OPT_VERBOSE" = "yes" ]; then
-+            echo "    NetBSD on SPARC64"
-+        fi
-+        CFG_HOST_ARCH=sparc
-+        CFG_HOST_BITSIZE=64
-+        ;;
-      QNX:*)
-         PLATFORM=unsupported/qnx-g++
-         ;;
-@@ -3471,11 +3482,11 @@ if [ "$CFG_USE_GOLD_LINKER" != "no" ]; t
- fi
- 
- # auto-detect --enable-new-dtags support
--if linkerSupportsFlag $TEST_COMPILER --enable-new-dtags; then
--    CFG_ENABLE_NEW_DTAGS=yes
--else
-+#if linkerSupportsFlag $TEST_COMPILER --enable-new-dtags; then
-+#    CFG_ENABLE_NEW_DTAGS=yes
-+#else
-     CFG_ENABLE_NEW_DTAGS=no
--fi
-+#fi
- 
- # auto-detect -fstack-protector-strong support (for QNX only currently)
- if [ "$XPLATFORM_QNX" = "yes" ]; then
-@@ -4014,10 +4025,12 @@ if true; then ###[ '!' -f "$outpath/bin/
-             EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS \$(CARBON_CFLAGS)"
-             EXTRA_OBJS="$EXTRA_OBJS \
-                         qsettings_mac.o \
-+                        qstring_mac.o \
-                         qcore_mac.o \
-                         qcore_mac_objc.o"
-             EXTRA_SRCS="$EXTRA_SRCS \
-                         \"\$(SOURCE_PATH)/src/corelib/io/qsettings_mac.cpp\" \
-+                        \"\$(SOURCE_PATH)/src/corelib/tools/qstring_mac.mm\" \
-                         \"\$(SOURCE_PATH)/src/corelib/kernel/qcore_mac.cpp\" \
-                         \"\$(SOURCE_PATH)/src/corelib/kernel/qcore_mac_objc.mm\""
-         fi
diff --git a/qt5-qtbase-git/patches/patch-mkspecs_features_create__cmake.prf b/qt5-qtbase-git/patches/patch-mkspecs_features_create__cmake.prf
deleted file mode 100644
index 571536fc863..00000000000
--- a/qt5-qtbase-git/patches/patch-mkspecs_features_create__cmake.prf
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-mkspecs_features_create__cmake.prf,v 1.2 2015/10/29 14:48:04 adam Exp $
-
-Fix for shared libraries naming on Darwin.
-
---- mkspecs/features/create_cmake.prf.orig	2015-10-13 04:35:32.000000000 +0000
-+++ mkspecs/features/create_cmake.prf
-@@ -147,7 +147,7 @@ contains(CONFIG, plugin) {
-         }
-     } else {
-         mac {
--            isEmpty(CMAKE_STATIC_TYPE): CMAKE_PlUGIN_EXT = .dylib
-+            isEmpty(CMAKE_STATIC_TYPE): CMAKE_PlUGIN_EXT = .so
-             else: CMAKE_PlUGIN_EXT = .a
- 
-             CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}
-@@ -213,8 +213,8 @@ mac {
-             CMAKE_LIB_FILE_LOCATION_RELEASE = Qt$${CMAKE_MODULE_NAME}$${QT_LIBINFIX}.framework/Qt$${CMAKE_MODULE_NAME}$${QT_LIBINFIX}
-             CMAKE_BUILD_IS_FRAMEWORK = "true"
-         } else {
--            CMAKE_LIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}_debug.$$eval(QT.$${MODULE}.VERSION).dylib
--            CMAKE_LIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.$$eval(QT.$${MODULE}.VERSION).dylib
-+            CMAKE_LIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}_debug.$${QT_MAJOR_VERSION}.dylib
-+            CMAKE_LIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.$${QT_MAJOR_VERSION}.dylib
-         }
-     }
- } else:win32 {
diff --git a/qt5-qtbase-git/patches/patch-mkspecs_features_simd.prf b/qt5-qtbase-git/patches/patch-mkspecs_features_simd.prf
deleted file mode 100644
index 1bcf201745c..00000000000
--- a/qt5-qtbase-git/patches/patch-mkspecs_features_simd.prf
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-mkspecs_features_simd.prf,v 1.2 2015/10/26 19:03:59 adam Exp $
-
-* Use libtool 
-
---- mkspecs/features/simd.prf.orig	2014-12-05 16:24:38.000000000 +0000
-+++ mkspecs/features/simd.prf
-@@ -33,12 +33,12 @@ defineTest(addSimdCompiler) {
-             export(SOURCES)
-         } else {
-             # We need special compiler flags
--            $${name}_compiler.commands = $$QMAKE_CXX -c $(CXXFLAGS) $$cflags $(INCPATH) ${QMAKE_FILE_IN}
-+            $${name}_compiler.commands = $(LIBTOOL) --silent --mode=compile $$QMAKE_CXX -c $(CXXFLAGS) $$cflags $(INCPATH) ${QMAKE_FILE_IN}
-             msvc: $${name}_compiler.commands += -Fo${QMAKE_FILE_OUT}
--            else: $${name}_compiler.commands += -o ${QMAKE_FILE_OUT}
-+            else: $${name}_compiler.commands += -o $$OBJECTS_DIR/${QMAKE_FILE_BASE}.lo
- 
-             $${name}_compiler.dependency_type = TYPE_C
--            $${name}_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)}
-+            $${name}_compiler.output = $$OBJECTS_DIR/${QMAKE_FILE_BASE}.lo
-             $${name}_compiler.input = $$sources_var
-             $${name}_compiler.variable_out = OBJECTS
-             $${name}_compiler.name = compiling[$${name}] ${QMAKE_FILE_IN}
-@@ -62,12 +62,12 @@ defineTest(addSimdCompiler) {
-             SOURCES += $$eval($$asm_var)
-             export(SOURCES)
-         } else {
--            $${name}_assembler.commands = $$QMAKE_CC -c $(CFLAGS)
-+            $${name}_assembler.commands = $(LIBTOOL) --silent --mode=compile $$QMAKE_CC -c $(CFLAGS)
-             !contains(QT_CPU_FEATURES, $${name}): $${name}_assembler.commands += $$cflags
-             clang:no_clang_integrated_as: $${name}_assembler.commands += -fno-integrated-as
--            $${name}_assembler.commands += $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
-+            $${name}_assembler.commands += $(INCPATH) ${QMAKE_FILE_IN} -o $$OBJECTS_DIR/${QMAKE_FILE_BASE}.lo
-             $${name}_assembler.dependency_type = TYPE_C
--            $${name}_assembler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)}
-+            $${name}_assembler.output = $$OBJECTS_DIR/${QMAKE_FILE_BASE}.lo
-             $${name}_assembler.input = $$asm_var
-             $${name}_assembler.variable_out = OBJECTS
-             $${name}_assembler.name = assembling[$${name}] ${QMAKE_FILE_IN}
diff --git a/qt5-qtbase-git/patches/patch-qmake_Makefile.unix b/qt5-qtbase-git/patches/patch-qmake_Makefile.unix
deleted file mode 100644
index ab06baedb16..00000000000
--- a/qt5-qtbase-git/patches/patch-qmake_Makefile.unix
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD: patch-qmake_Makefile.unix,v 1.2 2015/10/26 19:03:59 adam Exp $
-
-* Pass environmental variables from pkgsrc
-
---- qmake/Makefile.unix.orig	2015-06-29 20:03:23.000000000 +0000
-+++ qmake/Makefile.unix
-@@ -74,6 +74,7 @@ DEPEND_SRC = \
- 	   $(SOURCE_PATH)/src/corelib/tools/qlocale_win.cpp \
- 	   $(SOURCE_PATH)/src/corelib/tools/qlinkedlist.cpp \
- 	   $(SOURCE_PATH)/src/corelib/tools/qhash.cpp $(SOURCE_PATH)/src/corelib/kernel/qcore_mac.cpp \
-+	   $(SOURCE_PATH)/src/corelib/tools/qstring_mac.mm \
- 	   $(SOURCE_PATH)/src/corelib/kernel/qcore_mac_objc.mm \
- 	   $(SOURCE_PATH)/src/corelib/io/qtemporaryfile.cpp $(SOURCE_PATH)/src/corelib/kernel/qmetatype.cpp \
- 	   $(SOURCE_PATH)/src/corelib/io/qsettings.cpp $(SOURCE_PATH)/src/corelib/kernel/qvariant.cpp \
-@@ -93,7 +94,7 @@ DEPEND_SRC = \
- 	   $(SOURCE_PATH)/src/corelib/json/qjsonvalue.cpp \
- 	   $(QTSRCS)
- 
--CPPFLAGS = -g $(EXTRA_CPPFLAGS) \
-+CPPFLAGS += -g $(EXTRA_CPPFLAGS) \
- 	   -I$(QMKSRC) -I$(QMKLIBSRC) -I$(QMKSRC)/generators -I$(QMKSRC)/generators/unix -I$(QMKSRC)/generators/win32 \
- 	   -I$(QMKSRC)/generators/mac -I$(QMKSRC)/generators/integrity \
- 	   -I$(INC_PATH) -I$(INC_PATH)/QtCore \
-@@ -106,7 +107,7 @@ CPPFLAGS = -g $(EXTRA_CPPFLAGS) \
- 	   -DQT_NO_THREAD -DQT_NO_QOBJECT -DQT_NO_GEOM_VARIANT -DQT_NO_DATASTREAM \
- 	   -DQT_CRYPTOGRAPHICHASH_ONLY_SHA1 -DQT_JSON_READONLY -DQT_NO_STANDARDPATHS
- 
--CXXFLAGS = $(EXTRA_CXXFLAGS) $(CPPFLAGS)
-+CXXFLAGS += $(EXTRA_CXXFLAGS) $(CPPFLAGS)
- 
- first all: $(BUILD_PATH)/bin/qmake$(EXEEXT)
- qmake: $(BUILD_PATH)/bin/qmake$(EXEEXT)
-@@ -284,6 +285,9 @@ qstring.o: $(SOURCE_PATH)/src/corelib/to
- qstring_compat.o: $(SOURCE_PATH)/src/corelib/tools/qstring_compat.cpp
- 	$(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qstring_compat.cpp
- 
-+qstring_mac.o: $(SOURCE_PATH)/src/corelib/tools/qstring_mac.mm
-+	$(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qstring_mac.mm
-+
- qstringbuilder.o: $(SOURCE_PATH)/src/corelib/tools/qstringbuilder.cpp
- 	$(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qstringbuilder.cpp
- 
diff --git a/qt5-qtbase-git/patches/patch-qmake_generators_makefile.cpp b/qt5-qtbase-git/patches/patch-qmake_generators_makefile.cpp
deleted file mode 100644
index 25d91237f7a..00000000000
--- a/qt5-qtbase-git/patches/patch-qmake_generators_makefile.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-qmake_generators_makefile.cpp,v 1.2 2015/10/26 19:03:59 adam Exp $
-
-* Libtoolized
-
---- qmake/generators/makefile.cpp.orig	2016-05-20 00:28:32.000000000 +0000
-+++ qmake/generators/makefile.cpp
-@@ -3290,7 +3290,7 @@ MakefileGenerator::writePkgConfigFile()
-         pkgConfiglibName = bundle.toQString();
-     } else {
-         if (!project->values("QMAKE_DEFAULT_LIBDIRS").contains(libDir))
--            t << "-L${libdir} ";
-+            t << "-Wl,-R${libdir} -L${libdir} ";
-         pkgConfiglibName = "-l" + project->first("QMAKE_ORIG_TARGET");
-         if (project->isActiveConfig("shared"))
-             pkgConfiglibName += project->first("TARGET_VERSION_EXT").toQString();
diff --git a/qt5-qtbase-git/patches/patch-qmake_generators_unix_unixmake.cpp b/qt5-qtbase-git/patches/patch-qmake_generators_unix_unixmake.cpp
deleted file mode 100644
index 3f8819d1b88..00000000000
--- a/qt5-qtbase-git/patches/patch-qmake_generators_unix_unixmake.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-qmake_generators_unix_unixmake.cpp,v 1.3 2015/10/26 19:03:59 adam Exp $
-
-* fix install target so that destdir is added when installing QMAKE_TARGET
-
---- qmake/generators/unix/unixmake.cpp.orig	2016-05-20 00:28:32.000000000 +0000
-+++ qmake/generators/unix/unixmake.cpp
-@@ -541,7 +541,7 @@ UnixMakefileGenerator::defaultInstall(co
-     QString ret, destdir = project->first("DESTDIR").toQString();
-     if(!destdir.isEmpty() && destdir.right(1) != Option::dir_sep)
-         destdir += Option::dir_sep;
--    QString targetdir = fileFixify(project->first("target.path").toQString(), FileFixifyAbsolute);
-+    QString targetdir = project->first("target.path").toQString();
-     if(targetdir.right(1) != Option::dir_sep)
-         targetdir += Option::dir_sep;
- 
diff --git a/qt5-qtbase-git/patches/patch-qmake_generators_unix_unixmake2.cpp b/qt5-qtbase-git/patches/patch-qmake_generators_unix_unixmake2.cpp
deleted file mode 100644
index bc9854ca415..00000000000
--- a/qt5-qtbase-git/patches/patch-qmake_generators_unix_unixmake2.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD: patch-qmake_generators_unix_unixmake2.cpp,v 1.2 2015/10/26 19:03:59 adam Exp $
-
-* Libtoolized
-
---- qmake/generators/unix/unixmake2.cpp.orig	2016-05-20 00:28:32.000000000 +0000
-+++ qmake/generators/unix/unixmake2.cpp
-@@ -173,12 +173,12 @@ UnixMakefileGenerator::writeMakeParts(QT
-     t << "####### Compiler, tools and options\n\n";
-     t << "CC            = " << var("QMAKE_CC") << endl;
-     t << "CXX           = " << var("QMAKE_CXX") << endl;
--    t << "DEFINES       = "
-+    t << "DEFINES      += "
-       << varGlue("PRL_EXPORT_DEFINES","-D"," -D"," ")
-       << varGlue("DEFINES","-D"," -D","") << endl;
--    t << "CFLAGS        = " << var("QMAKE_CFLAGS") << " $(DEFINES)\n";
--    t << "CXXFLAGS      = " << var("QMAKE_CXXFLAGS") << " $(DEFINES)\n";
--    t << "INCPATH       =";
-+    t << "CFLAGS       += " << var("QMAKE_CFLAGS") << " $(DEFINES)\n";
-+    t << "CXXFLAGS     += " << var("QMAKE_CXXFLAGS") << " $(DEFINES)\n";
-+    t << "INCPATH      +=";
-     {
-         QString isystem = var("QMAKE_CFLAGS_ISYSTEM");
-         const ProStringList &incs = project->values("INCLUDEPATH");
-@@ -202,8 +202,8 @@ UnixMakefileGenerator::writeMakeParts(QT
- 
-     if(!project->isActiveConfig("staticlib")) {
-         t << "LINK          = " << var("QMAKE_LINK") << endl;
--        t << "LFLAGS        = " << var("QMAKE_LFLAGS") << endl;
--        t << "LIBS          = $(SUBLIBS) " << fixLibFlags("QMAKE_LIBS").join(' ') << ' '
-+        t << "LFLAGS       += " << var("QMAKE_LFLAGS") << endl;
-+        t << "LIBS         += $(SUBLIBS) " << fixLibFlags("QMAKE_LIBS").join(' ') << ' '
-                                            << fixLibFlags("QMAKE_LIBS_PRIVATE").join(' ') << endl;
-     }
- 
-@@ -277,6 +277,8 @@ UnixMakefileGenerator::writeMakeParts(QT
-         if(!project->isEmpty("QMAKE_BUNDLE")) {
-             t << "TARGETD       = " << fileVar("TARGET_x.y") << endl;
-             t << "TARGET0       = " << fileVar("TARGET_") << endl;
-+        } else if(project->isActiveConfig("compile_libtool")) {
-+            t << "TARGETD       = " << var("TARGET_la") << endl;
-         } else if (!project->isActiveConfig("unversioned_libname")) {
-             t << "TARGET0       = " << fileVar("TARGET_") << endl;
-             if (project->isEmpty("QMAKE_HPUX_SHLIB")) {
diff --git a/qt5-qtbase-git/patches/patch-qmake_qmake.pri b/qt5-qtbase-git/patches/patch-qmake_qmake.pri
deleted file mode 100644
index 8df02cbace1..00000000000
--- a/qt5-qtbase-git/patches/patch-qmake_qmake.pri
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-qmake_qmake.pri,v 1.1 2015/10/26 19:03:59 adam Exp $
-
-Fix building on Darwin.
-
---- qmake/qmake.pri.orig	2015-07-20 09:25:44.000000000 +0000
-+++ qmake/qmake.pri
-@@ -136,7 +136,7 @@ bootstrap { #Qt code
-         SOURCES += qfilesystemengine_unix.cpp qfilesystemiterator_unix.cpp qfsfileengine_unix.cpp
-         mac {
-           SOURCES += qcore_mac.cpp qsettings_mac.cpp
--          OBJECTIVE_SOURCES += qcore_mac_objc.mm qlocale_mac.mm
-+          OBJECTIVE_SOURCES += qcore_mac_objc.mm qlocale_mac.mm qstring_mac.mm
-           LIBS += -framework ApplicationServices -framework CoreServices -framework Foundation
-         } else {
-           SOURCES += qlocale_unix.cpp
diff --git a/qt5-qtbase-git/patches/patch-src_concurrent_qtconcurrentiteratekernel.cpp b/qt5-qtbase-git/patches/patch-src_concurrent_qtconcurrentiteratekernel.cpp
deleted file mode 100644
index 0c25f5eaf38..00000000000
--- a/qt5-qtbase-git/patches/patch-src_concurrent_qtconcurrentiteratekernel.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-src_concurrent_qtconcurrentiteratekernel.cpp,v 1.2 2015/10/26 19:03:59 adam Exp $
-
-Fix building on Darwin.
-
---- src/concurrent/qtconcurrentiteratekernel.cpp.orig	2013-11-27 01:01:16.000000000 +0000
-+++ src/concurrent/qtconcurrentiteratekernel.cpp
-@@ -41,7 +41,7 @@
- 
- #include "qtconcurrentiteratekernel.h"
- 
--#if defined(Q_OS_MAC)
-+#if defined(Q_OS_MAC) || defined(__APPLE__)
- #include <mach/mach.h>
- #include <mach/mach_time.h>
- #include <unistd.h>
-@@ -67,7 +67,7 @@ enum {
-     MedianSize = 7
- };
- 
--#if defined(Q_OS_MAC)
-+#if defined(Q_OS_MAC) || defined(__APPLE__)
- 
- static qint64 getticks()
- {
diff --git a/qt5-qtbase-git/patches/patch-src_corelib_arch_sparc_arch.pri b/qt5-qtbase-git/patches/patch-src_corelib_arch_sparc_arch.pri
deleted file mode 100644
index bd07d43278b..00000000000
--- a/qt5-qtbase-git/patches/patch-src_corelib_arch_sparc_arch.pri
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_corelib_arch_sparc_arch.pri,v 1.1 2014/12/30 17:23:46 adam Exp $
-
-* Fix for SPARC64
-
---- src/corelib/arch/sparc/arch.pri.orig	2013-11-27 01:01:15.000000000 +0000
-+++ src/corelib/arch/sparc/arch.pri
-@@ -1,7 +1,7 @@
- #
- # SPARC architecture
- #
--*-64* {
-+sEqual(QT_HOST_BITSIZE, 64) | *-64* {
-     SOURCES += $$PWD/qatomic64.s
- }
- else {
diff --git a/qt5-qtbase-git/patches/patch-src_corelib_codecs_qiconvcodec.cpp b/qt5-qtbase-git/patches/patch-src_corelib_codecs_qiconvcodec.cpp
deleted file mode 100644
index d0277e18e52..00000000000
--- a/qt5-qtbase-git/patches/patch-src_corelib_codecs_qiconvcodec.cpp
+++ /dev/null
@@ -1,75 +0,0 @@
-$NetBSD: patch-src_corelib_codecs_qiconvcodec.cpp,v 1.1 2014/12/30 17:23:46 adam Exp $
-
-* Add DragonFly support
-* Add NetBSD support
-
---- src/corelib/codecs/qiconvcodec.cpp.orig	2013-11-27 01:01:15.000000000 +0000
-+++ src/corelib/codecs/qiconvcodec.cpp
-@@ -52,9 +52,14 @@
- #include <stdio.h>
- #include <dlfcn.h>
- 
-+// for __DragonFly_version
-+#if defined(__DragonFly__)
-+#include <sys/param.h>
-+#endif
-+
- // unistd.h is needed for the _XOPEN_UNIX macro
- #include <unistd.h>
--#if defined(_XOPEN_UNIX) && !defined(Q_OS_QNX) && !defined(Q_OS_OSF)
-+#if defined(_XOPEN_UNIX) && !defined(Q_OS_QNX) && !defined(Q_OS_OSF) || defined(Q_OS_NETBSD) || defined(__DragonFly__)
- #  include <langinfo.h>
- #endif
- 
-@@ -71,6 +76,9 @@
- #  else
- #    define UTF16 "UTF-16LE"
- #  endif
-+#elif defined(__DragonFly__) && __DragonFly_version__ < 197700
-+#  define NO_BOM
-+#  define UTF16 "UTF-16"
- #else
- #  define UTF16 "UTF-16"
- #endif
-@@ -223,7 +231,7 @@ QString QIconvCodec::convertToUnicode(co
-     IconvState *state = *pstate;
-     size_t inBytesLeft = len;
-     // best case assumption, each byte is converted into one UTF-16 character, plus 2 bytes for the BOM
--#ifdef GNU_LIBICONV
-+#if defined(GNU_LIBICONV) || defined(__NetBSD__)
-     // GNU doesn't disagree with POSIX :/
-     const char *inBytes = chars;
- #else
-@@ -322,7 +330,7 @@ static bool setByteOrder(iconv_t cd)
-     size_t outBytesLeft = sizeof buf;
-     size_t inBytesLeft = sizeof bom;
- 
--#if defined(GNU_LIBICONV)
-+#if defined(GNU_LIBICONV) || defined(__NetBSD__)
-     const char **inBytesPtr = const_cast<const char **>(&inBytes);
- #else
-     char **inBytesPtr = &inBytes;
-@@ -342,7 +350,7 @@ QByteArray QIconvCodec::convertFromUnico
-     char *outBytes;
-     size_t inBytesLeft;
- 
--#if defined(GNU_LIBICONV)
-+#if defined(GNU_LIBICONV) || defined(__NetBSD__)
-     const char **inBytesPtr = const_cast<const char **>(&inBytes);
- #else
-     char **inBytesPtr = &inBytes;
-@@ -482,11 +490,13 @@ iconv_t QIconvCodec::createIconv_t(const
- #endif
-     const char *codeset = empty_codeset;
-     cd = iconv_open(to ? to : codeset, from ? from : codeset);
-+#elif defined(__NetBSD)
-+    const char *codeset = 0;
- #else
-     char *codeset = 0;
- #endif
- 
--#if defined(_XOPEN_UNIX) && !defined(Q_OS_QNX) && !defined(Q_OS_OSF)
-+#if (defined(_XOPEN_UNIX) && !defined(Q_OS_QNX) && !defined(Q_OS_OSF)) || defined(Q_OS_NETBSD) || defined(__DragonFly__)
-     if (cd == (iconv_t) -1) {
-         codeset = nl_langinfo(CODESET);
-         if (codeset)
diff --git a/qt5-qtbase-git/patches/patch-src_corelib_global_qsystemdetection.h b/qt5-qtbase-git/patches/patch-src_corelib_global_qsystemdetection.h
deleted file mode 100644
index 36d2bbf4fde..00000000000
--- a/qt5-qtbase-git/patches/patch-src_corelib_global_qsystemdetection.h
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-src_corelib_global_qsystemdetection.h,v 1.1 2014/12/30 17:23:46 adam Exp $
-
-* Add Interix support
-
---- src/corelib/global/qsystemdetection.h.orig	2013-11-27 01:01:15.000000000 +0000
-+++ src/corelib/global/qsystemdetection.h
-@@ -68,6 +68,7 @@
-      NETBSD   - NetBSD
-      OPENBSD  - OpenBSD
-      BSDI     - BSD/OS
-+     INTERIX  - Interix
-      IRIX     - SGI Irix
-      OSF      - HP Tru64 UNIX
-      SCO      - SCO OpenServer 5
-@@ -151,6 +152,9 @@
- #elif defined(__bsdi__)
- #  define Q_OS_BSDI
- #  define Q_OS_BSD4
-+#elif defined(__INTERIX)
-+#  define Q_OS_INTERIX
-+#  define Q_OS_BSD4
- #elif defined(__sgi)
- #  define Q_OS_IRIX
- #elif defined(__osf__)
diff --git a/qt5-qtbase-git/patches/patch-src_corelib_io_io.pri b/qt5-qtbase-git/patches/patch-src_corelib_io_io.pri
deleted file mode 100644
index 64eb9e50448..00000000000
--- a/qt5-qtbase-git/patches/patch-src_corelib_io_io.pri
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-src_corelib_io_io.pri,v 1.4 2015/10/26 19:03:59 adam Exp $
-
-* Add DragonFly support
-* Patch sent and merged upstream:
-  http://codereview.qt-project.org/#/c/111741/
-* fix linux test.
-
---- src/corelib/io/io.pri.orig	2014-12-05 16:24:37.000000000 +0000
-+++ src/corelib/io/io.pri
-@@ -172,13 +172,13 @@ win32 {
-                 io/qstorageinfo_unix.cpp
-         }
- 
--        linux|if(qnx:contains(QT_CONFIG, inotify)) {
-+        linux*|if(qnx:contains(QT_CONFIG, inotify)) {
-             SOURCES += io/qfilesystemwatcher_inotify.cpp
-             HEADERS += io/qfilesystemwatcher_inotify_p.h
-         }
- 
-         !nacl {
--            freebsd-*|mac|darwin-*|openbsd-*|netbsd-*:{
-+            freebsd-*|mac|darwin-*|openbsd-*|netbsd-*|dragonfly-*:{
-                 SOURCES += io/qfilesystemwatcher_kqueue.cpp
-                 HEADERS += io/qfilesystemwatcher_kqueue_p.h
-             }
diff --git a/qt5-qtbase-git/patches/patch-src_corelib_io_qlockfile__unix.cpp b/qt5-qtbase-git/patches/patch-src_corelib_io_qlockfile__unix.cpp
deleted file mode 100644
index 51b57802b55..00000000000
--- a/qt5-qtbase-git/patches/patch-src_corelib_io_qlockfile__unix.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-src_corelib_io_qlockfile__unix.cpp,v 1.1 2015/10/26 19:03:59 adam Exp $
-
-Add support for NetBSD and OpenBSD.
-
---- src/corelib/io/qlockfile_unix.cpp.orig	2015-10-25 12:40:42.000000000 +0000
-+++ src/corelib/io/qlockfile_unix.cpp
-@@ -54,6 +54,10 @@
- #elif defined(Q_OS_LINUX)
- #   include <unistd.h>
- #   include <cstdio>
-+#elif defined(Q_OS_NETBSD) || defined(Q_OS_OPENBSD)
-+#   include <kvm.h>
-+#   include <sys/param.h>
-+#   include <sys/sysctl.h>
- #elif defined(Q_OS_BSD4) && !defined(Q_OS_IOS)
- #   include <sys/user.h>
- # if defined(__GLIBC__) && defined(__FreeBSD_kernel__)
-@@ -239,6 +243,19 @@ QString QLockFilePrivate::processNameByP
-     }
-     buf[len] = 0;
-     return QFileInfo(QFile::decodeName(buf)).fileName();
-+#elif defined(Q_OS_NETBSD) || defined(Q_OS_OPENBSD)
-+    kvm_t *kd = kvm_open(NULL, NULL, NULL, KVM_NO_FILES, NULL);
-+    int cnt;
-+    QString name;
-+    struct kinfo_proc2 *proc = kvm_getproc2(kd, KERN_PROC_PID, (int)pid, sizeof(struct kinfo_proc2), &cnt);
-+    if (!proc) {
-+        name = QString();
-+    }
-+    else {
-+        name = QFile::decodeName(proc->p_comm);
-+    }
-+    kvm_close(kd);
-+    return name;
- #elif defined(Q_OS_BSD4) && !defined(Q_OS_IOS)
- # if defined(__GLIBC__) && defined(__FreeBSD_kernel__)
-     int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, pid };
diff --git a/qt5-qtbase-git/patches/patch-src_corelib_io_qstandardpaths_unix.cpp b/qt5-qtbase-git/patches/patch-src_corelib_io_qstandardpaths_unix.cpp
deleted file mode 100644
index 9f5eced30f7..00000000000
--- a/qt5-qtbase-git/patches/patch-src_corelib_io_qstandardpaths_unix.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-src_corelib_io_qstandardpaths_unix.cpp,v 1.1 2016/02/04 10:41:13 markd Exp $
-
-Add $LOCALBASE/share to search path
-
---- src/corelib/io/qstandardpaths_unix.cpp.orig	2015-10-13 04:35:31.000000000 +0000
-+++ src/corelib/io/qstandardpaths_unix.cpp
-@@ -255,6 +255,7 @@ static QStringList xdgDataDirs()
-     // http://standards.freedesktop.org/basedir-spec/latest/
-     QString xdgDataDirsEnv = QFile::decodeName(qgetenv("XDG_DATA_DIRS"));
-     if (xdgDataDirsEnv.isEmpty()) {
-+        dirs.append(QString::fromLatin1("@LOCALBASE@/share"));
-         dirs.append(QString::fromLatin1("/usr/local/share"));
-         dirs.append(QString::fromLatin1("/usr/share"));
-     } else {
diff --git a/qt5-qtbase-git/patches/patch-src_corelib_io_qstorageinfo_unix.cpp b/qt5-qtbase-git/patches/patch-src_corelib_io_qstorageinfo_unix.cpp
deleted file mode 100644
index 8febe628077..00000000000
--- a/qt5-qtbase-git/patches/patch-src_corelib_io_qstorageinfo_unix.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-src_corelib_io_qstorageinfo_unix.cpp,v 1.5 2015/10/26 19:03:59 adam Exp $
-
-* make statvfs available on non-NetBSD BSD platforms
-* fix build on SunOS
-
---- src/corelib/io/qstorageinfo_unix.cpp.orig	2016-05-20 00:28:32.000000000 +0000
-+++ src/corelib/io/qstorageinfo_unix.cpp
-@@ -78,7 +78,7 @@
- #  if !defined(ST_RDONLY)
- #    define ST_RDONLY MNT_RDONLY
- #  endif
--#  if !defined(_STATFS_F_FLAGS)
-+#  if !defined(_STATFS_F_FLAGS) && !defined(Q_OS_NETBSD)
- #    define _STATFS_F_FLAGS 1
- #  endif
- #elif defined(Q_OS_ANDROID)
-@@ -87,7 +87,7 @@
- #  if !defined(ST_RDONLY)
- #    define ST_RDONLY 1 // hack for missing define on Android
- #  endif
--#elif defined(Q_OS_HAIKU)
-+#elif defined(Q_OS_HAIKU) || defined(Q_OS_SOLARIS)
- #  define QT_STATFSBUF struct statvfs
- #  define QT_STATFS    ::statvfs
- #else
diff --git a/qt5-qtbase-git/patches/patch-src_network_kernel_qhostinfo__unix.cpp b/qt5-qtbase-git/patches/patch-src_network_kernel_qhostinfo__unix.cpp
deleted file mode 100644
index 665edcf28ce..00000000000
--- a/qt5-qtbase-git/patches/patch-src_network_kernel_qhostinfo__unix.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_network_kernel_qhostinfo__unix.cpp,v 1.1 2014/12/30 17:23:46 adam Exp $
-
---- src/network/kernel/qhostinfo_unix.cpp.orig	2016-05-20 00:28:33.000000000 +0000
-+++ src/network/kernel/qhostinfo_unix.cpp
-@@ -117,6 +117,8 @@ static bool resolveLibraryInternal()
-         if (!local_res_nclose)
-             local_res_ninit = 0;
-     }
-+    if (local_res_ninit)
-+        local_res_ninit = 0;
- #endif
- 
-     return true;
diff --git a/qt5-qtbase-git/patches/patch-src_openglextensions_openglextensions.pro b/qt5-qtbase-git/patches/patch-src_openglextensions_openglextensions.pro
deleted file mode 100644
index a8a3e5c2b44..00000000000
--- a/qt5-qtbase-git/patches/patch-src_openglextensions_openglextensions.pro
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-src_openglextensions_openglextensions.pro,v 1.1 2015/10/26 19:03:59 adam Exp $
-
-Build shared library.
-
---- src/openglextensions/openglextensions.pro.orig	2015-10-26 11:22:39.000000000 +0000
-+++ src/openglextensions/openglextensions.pro
-@@ -1,5 +1,4 @@
- TARGET     = QtOpenGLExtensions
--CONFIG += static
- 
- contains(QT_CONFIG, opengl):CONFIG += opengl
- contains(QT_CONFIG, opengles2):CONFIG += opengles2
diff --git a/qt5-qtbase-git/patches/patch-src_platformsupport_platformsupport.pro b/qt5-qtbase-git/patches/patch-src_platformsupport_platformsupport.pro
deleted file mode 100644
index a1d97e93d17..00000000000
--- a/qt5-qtbase-git/patches/patch-src_platformsupport_platformsupport.pro
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_platformsupport_platformsupport.pro,v 1.1 2014/12/30 17:23:46 adam Exp $
-
-* Libtoolized and make it shared library
-
---- src/platformsupport/platformsupport.pro.orig	2013-11-27 01:01:11.000000000 +0000
-+++ src/platformsupport/platformsupport.pro
-@@ -1,7 +1,7 @@
- TARGET     = QtPlatformSupport
- QT         = core-private gui-private
- 
--CONFIG += static internal_module
-+CONFIG += internal_module
- mac:LIBS_PRIVATE += -lz
- 
- DEFINES += QT_NO_CAST_FROM_ASCII
diff --git a/qt5-qtbase-git/patches/patch-src_plugins_platforminputcontexts_compose_compose.pro b/qt5-qtbase-git/patches/patch-src_plugins_platforminputcontexts_compose_compose.pro
deleted file mode 100644
index 5578fe1c8c8..00000000000
--- a/qt5-qtbase-git/patches/patch-src_plugins_platforminputcontexts_compose_compose.pro
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_plugins_platforminputcontexts_compose_compose.pro,v 1.1 2014/12/30 17:23:46 adam Exp $
-
-PR pkg/48553
-
---- src/plugins/platforminputcontexts/compose/compose.pro.orig	2014-09-11 10:48:06.000000000 +0000
-+++ src/plugins/platforminputcontexts/compose/compose.pro
-@@ -16,6 +16,8 @@ SOURCES += $$PWD/main.cpp \
- HEADERS += $$PWD/qcomposeplatforminputcontext.h \
-            $$PWD/generator/qtablegenerator.h \
- 
-+DEFINES += X11BASE=\\\"$$(X11BASE)\\\"
-+
- # libxkbcommon
- contains(QT_CONFIG, xkbcommon-qt): {
-     # dont't need x11 dependency for compose key plugin
diff --git a/qt5-qtbase-git/patches/patch-src_plugins_platforminputcontexts_compose_generator_qtablegenerator.cpp b/qt5-qtbase-git/patches/patch-src_plugins_platforminputcontexts_compose_generator_qtablegenerator.cpp
deleted file mode 100644
index 3030a4ec883..00000000000
--- a/qt5-qtbase-git/patches/patch-src_plugins_platforminputcontexts_compose_generator_qtablegenerator.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-src_plugins_platforminputcontexts_compose_generator_qtablegenerator.cpp,v 1.1 2014/12/30 17:23:46 adam Exp $
-
-PR pkg/48553
-
---- src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp.orig	2014-09-11 10:48:06.000000000 +0000
-+++ src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
-@@ -76,6 +76,10 @@ void TableGenerator::initPossibleLocatio
-     // the QTCOMPOSE environment variable
-     if (qEnvironmentVariableIsSet("QTCOMPOSE"))
-         m_possibleLocations.append(QString::fromLocal8Bit(qgetenv("QTCOMPOSE")));
-+#ifdef X11BASE
-+    m_possibleLocations.append(QStringLiteral(X11BASE) + QStringLiteral("/share/X11/locale"));
-+    m_possibleLocations.append(QStringLiteral(X11BASE) + QStringLiteral("/lib/X11/locale"));
-+#endif
-     m_possibleLocations.append(QStringLiteral("/usr/share/X11/locale"));
-     m_possibleLocations.append(QStringLiteral("/usr/local/share/X11/locale"));
-     m_possibleLocations.append(QStringLiteral("/usr/lib/X11/locale"));
diff --git a/qt5-qtbase-git/patches/patch-src_tools_bootstrap_bootstrap.pro b/qt5-qtbase-git/patches/patch-src_tools_bootstrap_bootstrap.pro
deleted file mode 100644
index 36c2f5ef144..00000000000
--- a/qt5-qtbase-git/patches/patch-src_tools_bootstrap_bootstrap.pro
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-src_tools_bootstrap_bootstrap.pro,v 1.2 2015/10/26 19:03:59 adam Exp $
-
-* Create shared library .so file libQt5Bootstrap.la.
-
---- src/tools/bootstrap/bootstrap.pro.orig	2015-07-27 10:28:43.000000000 +0000
-+++ src/tools/bootstrap/bootstrap.pro
-@@ -1,4 +1,4 @@
--option(host_build)
-+#option(host_build)
- 
- TARGET = QtBootstrap
- QT =
diff --git a/qt5-qtbase-git/patches/patch-src_tools_moc_main.cpp b/qt5-qtbase-git/patches/patch-src_tools_moc_main.cpp
deleted file mode 100644
index 5fd51ef2ae5..00000000000
--- a/qt5-qtbase-git/patches/patch-src_tools_moc_main.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-src_tools_moc_main.cpp,v 1.2 2015/10/26 19:03:59 adam Exp $
-
-rh#756395, https://bugreports.qt-project.org/browse/QTBUG-22829
-
---- src/tools/moc/main.cpp.orig	2013-11-27 01:01:11.000000000 +0000
-+++ src/tools/moc/main.cpp
-@@ -192,6 +192,7 @@ int runMoc(int argc, char **argv)
-     Moc moc;
-     pp.macros["Q_MOC_RUN"];
-     pp.macros["__cplusplus"];
-+    pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"];
- 
-     // Don't stumble over GCC extensions
-     Macro dummyVariadicFunctionMacro;
diff --git a/qt5-qtbase-git/patches/patch-src_widgets_graphicsview_qgraphicsitem__p.h b/qt5-qtbase-git/patches/patch-src_widgets_graphicsview_qgraphicsitem__p.h
deleted file mode 100644
index 658e20ea54a..00000000000
--- a/qt5-qtbase-git/patches/patch-src_widgets_graphicsview_qgraphicsitem__p.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_widgets_graphicsview_qgraphicsitem__p.h,v 1.1 2014/12/30 17:23:46 adam Exp $
-
---- src/widgets/graphicsview/qgraphicsitem_p.h.orig	2013-11-27 01:01:12.000000000 +0000
-+++ src/widgets/graphicsview/qgraphicsitem_p.h
-@@ -761,7 +761,7 @@ inline bool qt_closestItemFirst(const QG
-     // item1Ancestor is now at the same level as item2Ancestor, but not the same.
-     const QGraphicsItem *p1 = t1;
-     const QGraphicsItem *p2 = t2;
--    while (t1 && t1 != t2) {
-+    while (t1 && t2 && t1 != t2) {
-         p1 = t1;
-         p2 = t2;
-         t1 = t1->d_ptr->parent;
diff --git a/qt5-qtbase-git/patches/patch-tests_auto_corelib_io_qprocess_qprocess.pro b/qt5-qtbase-git/patches/patch-tests_auto_corelib_io_qprocess_qprocess.pro
deleted file mode 100644
index a961adb5c24..00000000000
--- a/qt5-qtbase-git/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.1 2014/12/30 17:23:46 adam Exp $
-
-* Pass whitespace(s) in filename test cases.
-
---- tests/auto/corelib/io/qprocess/qprocess.pro.orig	2014-02-01 20:37:28.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:!wince* {
-     SUBDIRS += \
diff --git a/qt5-qtbase-git/patches/patch-tests_auto_widgets_itemviews_qtreewidgetitemiterator_qtreewidgetitemiterator.pro b/qt5-qtbase-git/patches/patch-tests_auto_widgets_itemviews_qtreewidgetitemiterator_qtreewidgetitemiterator.pro
deleted file mode 100644
index 9667c6da277..00000000000
--- a/qt5-qtbase-git/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
-