Fix misc issues

1 files changed, 104 insertions, 49 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3c5b6e39f602..242445c3dc1b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Sun Sep 18 17:29:20 UTC 2016
+# Thu Dec  8 20:20:02 UTC 2016
 pkgbase = mingw-w64-qt5-base-static
 	pkgdesc = A cross-platform application and UI framework (mingw-w64)
 	pkgver = 5.7.0
-	pkgrel = 8
+	pkgrel = 10
 	url = https://www.qt.io/
 	arch = any
 	groups = mingw-w64-qt
@@ -28,59 +28,114 @@ pkgbase = mingw-w64-qt5-base-static
 	depends = mingw-w64-qt5-base
 	optdepends = mingw-w64-postgresql: PostgreSQL support
 	optdepends = mingw-w64-mariadb-connector-c: MySQL support
-	optdepends = qtchooser
 	options = !strip
 	options = !buildflags
 	options = staticlibs
 	options = !emptydirs
 	source = https://download.qt.io/official_releases/qt/5.7/5.7.0/submodules/qtbase-opensource-src-5.7.0.tar.xz
-	source = qt5-add-angle-and-dynamic-support.patch
-	source = qt5-use-external-angle-library.patch
-	source = qt5-workaround-pkgconfig-install-issue.patch
-	source = qt5-merge-static-and-shared-library-trees.patch
-	source = qt5-fix-linking-against-static-pcre.patch
-	source = qt5-rename-qtmain-to-qt5main.patch
-	source = qt5-dont-build-host-libs-static.patch
-	source = qt5-enable-rpath-for-host-tools.patch
-	source = qt5-dont-add-resource-files-to-qmake-libs.patch
-	source = qt5-prevent-debug-library-names-in-pkgconfig-files.patch
-	source = qt5-fix-linking-against-static-dbus.patch
-	source = qt5-use-win32-g++-mkspecs-profile.patch
-	source = qt5-use-system-zlib-in-host-libs.patch
-	source = qt5-fix-opengl-to-many-sections.patch
-	source = qt5-fix-static-psql-mysql.patch
-	source = qt5-fixes-from-mxe.patch
-	source = qt5-fix-implib-ext.patch
-	source = qt5-disable-default-lib-include-detection.patch
-	source = qt5-win32-static-cmake-link-ws2_32-and--static.patch
-	source = qt5-allow-usage-of-static-qt-with-cmake.patch
-	source = qt5-customize-extensions-for-static-build.patch
-	source = qt5-use-correct-pkg-config-static-flags.patch
-	source = qt5-use-pkgconfig-for-harfbuzz.patch
+	source = 0001-Fix-qwindows-plugin-linking-with-system-freetype.patch
+	source = 0002-Fix-oci-config-test-on-windows.patch
+	source = 0003-Don-t-set-QT_NO_SYSTEMSEMAPHORE-for-Windows.patch
+	source = 0004-Fix-building-mysql-driver-under-mingw.patch
+	source = 0005-Support-ANGLE-switches-via-configure-shell-script.patch
+	source = 0006-Use-external-ANGLE-library.patch
+	source = 0007-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch
+	source = 0008-Make-sure-.pc-files-are-installed-correctly.patch
+	source = 0009-Don-t-add-resource-files-to-LIBS-parameter.patch
+	source = 0010-Prevent-debug-library-names-in-pkg-config-files.patch
+	source = 0011-Fix-linking-against-static-D-Bus.patch
+	source = 0012-Adjust-win32-g-mkspecs-profile.patch
+	source = 0013-Fix-linking-against-external-harfbuzz.patch
+	source = 0014-Fix-linking-against-static-pcre.patch
+	source = 0015-Rename-qtmain-to-qt5main.patch
+	source = 0016-Build-dynamic-host-libraries.patch
+	source = 0017-Enable-rpath-for-build-tools.patch
+	source = 0018-Use-system-zlib-for-build-tools.patch
+	source = 0019-Disable-determing-default-include-and-lib-dirs-at-qm.patch
+	source = 0020-Use-.dll.a-as-import-lib-extension.patch
+	source = 0021-Merge-shared-and-static-library-trees.patch
+	source = 0022-Allow-usage-of-static-version-with-CMake.patch
+	source = 0023-Use-correct-pkg-config-static-flag.patch
+	source = 0024-Use-shared-static-version-of-MariaDB.patch
+	source = 0025-Use-shared-static-version-of-PostgreSQL.patch
+	source = 0001-Fix-qwindows-plugin-linking-with-system-freetype.patch
+	source = 0002-Fix-oci-config-test-on-windows.patch
+	source = 0003-Don-t-set-QT_NO_SYSTEMSEMAPHORE-for-Windows.patch
+	source = 0004-Fix-building-mysql-driver-under-mingw.patch
+	source = 0005-Support-ANGLE-switches-via-configure-shell-script.patch
+	source = 0006-Use-external-ANGLE-library.patch
+	source = 0007-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch
+	source = 0008-Make-sure-.pc-files-are-installed-correctly.patch
+	source = 0009-Don-t-add-resource-files-to-LIBS-parameter.patch
+	source = 0010-Prevent-debug-library-names-in-pkg-config-files.patch
+	source = 0011-Fix-linking-against-static-D-Bus.patch
+	source = 0012-Adjust-win32-g-mkspecs-profile.patch
+	source = 0013-Fix-linking-against-external-harfbuzz.patch
+	source = 0014-Fix-linking-against-static-pcre.patch
+	source = 0015-Rename-qtmain-to-qt5main.patch
+	source = 0016-Build-dynamic-host-libraries.patch
+	source = 0017-Enable-rpath-for-build-tools.patch
+	source = 0018-Use-system-zlib-for-build-tools.patch
+	source = 0019-Disable-determing-default-include-and-lib-dirs-at-qm.patch
+	source = 0020-Use-.dll.a-as-import-lib-extension.patch
+	source = 0021-Merge-shared-and-static-library-trees.patch
+	source = 0022-Allow-usage-of-static-version-with-CMake.patch
+	source = 0023-Use-correct-pkg-config-static-flag.patch
+	source = 0024-Use-shared-static-version-of-MariaDB.patch
+	source = 0025-Use-shared-static-version-of-PostgreSQL.patch
+	source = 0026-Fix-qt5_wrap_ui-macro.patch
 	md5sums = 184f9460b40752d71b15b827260580c2
-	md5sums = 55a11d8ea5db9ca0cced06b06655b417
-	md5sums = 1f7aea5e8bed840b3efc9172081ddb45
-	md5sums = bc99c4cc6998295d76f37ed681c20d47
-	md5sums = e2ffff39673b37c4d9974e92fcf7213c
-	md5sums = 4fe6523dd1c34398df3aa5a8763530cc
-	md5sums = f32a768e1acb9785c79c8e93aa266db2
-	md5sums = 3bd322551924543553a2bf81b4419a09
-	md5sums = 30fa9ddf8d842b1392e8d63868940657
-	md5sums = 99bb9f51ec684803768f36e407baf486
-	md5sums = 6a6bc88f35ac8080869de39bc128ce5b
-	md5sums = 261d9071a6af3f1d5c3f955da3781573
-	md5sums = 0524dc5427a6c5338ebd45ab08c6ce80
-	md5sums = c15d9f480d0248648fa52aeacb46e3c7
-	md5sums = 612a4dfb9f1a3898a1920c28bb999159
-	md5sums = d0eb81aef1a21c65813fe4ddabbc4206
-	md5sums = 1e8c03872062fe8499ed7786475ed4e0
-	md5sums = 83139869355c2d46921adb25e47cf0fa
-	md5sums = b9565219e9252a17fc1b8fb9ee30662c
-	md5sums = 20de722808e8a3fb684b0212bef8de46
-	md5sums = a60bd6bb231acfe9132f391a26b37e71
-	md5sums = 41ec67d9e5e70e0d6d93b42aebd0e12a
-	md5sums = 61c0f9d0095c5a6dec8d14e9ec35a608
-	md5sums = 16a7d505b503bb1087fc00fad819f64b
+	md5sums = bd3a336834d1dc22bacf38688b30fab0
+	md5sums = 390cd5b394fe2a84054c4c34f9f016d6
+	md5sums = ec43bd375737a578bf7494e14e5726e9
+	md5sums = 358dd9465914f52d8988228c656c508a
+	md5sums = 455134d76b818a994084dd45b11ce51e
+	md5sums = 84fd7ed12061aba4bf8648a5cbd72095
+	md5sums = dcd5889407bc6fd8637bbb04a033ae6a
+	md5sums = 9de955e67e3f0f35d955021ced9dd544
+	md5sums = aa9e36e721864e24c5c632b2fa463dac
+	md5sums = 4642ae1ab8ec5c864b1fa2cc8bf43a8a
+	md5sums = a01ce4e39f309ffc10857c7c1e4a2ae8
+	md5sums = a3fa433801b8c11f83e069fe9c80ea8b
+	md5sums = 64c41f016b9583277ec8403824ff81b7
+	md5sums = b13a0b9c610ff071eac36331c938aba1
+	md5sums = b0da19aa67c3305bd611c9f104efaa74
+	md5sums = 423142ec2a76ee031725587f9c299420
+	md5sums = f5efb8153fa3d0b0fd71fe8604c7d626
+	md5sums = 670fbd9766654969db82363378608c0a
+	md5sums = 424b23ae0de84f4027e375223d945fe4
+	md5sums = 77a50b5fe0cc2f431f0124db402056c1
+	md5sums = 2491ad84a2065cd1477f1a6b34c2a46c
+	md5sums = c646461b4341ed83b1a83426fc627a70
+	md5sums = 0e4e4f1d9a16eb6038709d82cf31227d
+	md5sums = 88b8eb6d0b7cec85cfbc54f2d6716f2d
+	md5sums = 179ae7c4217e062df0d8bd5171792e11
+	md5sums = bd3a336834d1dc22bacf38688b30fab0
+	md5sums = 390cd5b394fe2a84054c4c34f9f016d6
+	md5sums = ec43bd375737a578bf7494e14e5726e9
+	md5sums = 358dd9465914f52d8988228c656c508a
+	md5sums = 455134d76b818a994084dd45b11ce51e
+	md5sums = 84fd7ed12061aba4bf8648a5cbd72095
+	md5sums = dcd5889407bc6fd8637bbb04a033ae6a
+	md5sums = 9de955e67e3f0f35d955021ced9dd544
+	md5sums = aa9e36e721864e24c5c632b2fa463dac
+	md5sums = 4642ae1ab8ec5c864b1fa2cc8bf43a8a
+	md5sums = a01ce4e39f309ffc10857c7c1e4a2ae8
+	md5sums = a3fa433801b8c11f83e069fe9c80ea8b
+	md5sums = 64c41f016b9583277ec8403824ff81b7
+	md5sums = b13a0b9c610ff071eac36331c938aba1
+	md5sums = b0da19aa67c3305bd611c9f104efaa74
+	md5sums = 423142ec2a76ee031725587f9c299420
+	md5sums = f5efb8153fa3d0b0fd71fe8604c7d626
+	md5sums = 670fbd9766654969db82363378608c0a
+	md5sums = 424b23ae0de84f4027e375223d945fe4
+	md5sums = 77a50b5fe0cc2f431f0124db402056c1
+	md5sums = 2491ad84a2065cd1477f1a6b34c2a46c
+	md5sums = c646461b4341ed83b1a83426fc627a70
+	md5sums = 0e4e4f1d9a16eb6038709d82cf31227d
+	md5sums = 88b8eb6d0b7cec85cfbc54f2d6716f2d
+	md5sums = 179ae7c4217e062df0d8bd5171792e11
+	md5sums = 645037becd8fdd266ac8e7cacdde85ab
 
 pkgname = mingw-w64-qt5-base-static