diff options
28 files changed, 237 insertions, 235 deletions
@@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Fri Dec 16 07:54:25 UTC 2016 +# Sat Dec 24 12:04:18 UTC 2016 pkgbase = mingw-w64-qt5-base-angle pkgdesc = A cross-platform application and UI framework (mingw-w64) - pkgver = 5.7.0 - pkgrel = 10 + pkgver = 5.7.1 + pkgrel = 1 url = https://www.qt.io/ arch = i686 arch = x86_64 @@ -39,7 +39,7 @@ pkgbase = mingw-w64-qt5-base-angle 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 = https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtbase-opensource-src-5.7.1.tar.xz 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 @@ -91,58 +91,58 @@ pkgbase = mingw-w64-qt5-base-angle 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 = 79a566c874a2b15acdd5ada456ff7781 - md5sums = 16d668d460645879f403f9f1b9cf5539 - md5sums = 72dd9f8e572c43e4f490b9a16a799d0f - md5sums = 582aa4fabd82de714445f1f419c9143a - md5sums = a676f9447cdba7f16feead657c0f3720 - md5sums = 5b06de1d87761baaf8cddc3263702b83 - md5sums = eeb4ee5384c54f4c7802506b9d23523c - md5sums = b0629fce5041c51c7244aa0e18630e4e - md5sums = 62573876286a3f1cac8c83c605a055ec - md5sums = 201a0dde87d2946bff414e04110a02bb - md5sums = 08be6b0dfd0149d78124711eeb369a46 - md5sums = a762027682537f1e5d263f93a5e18c12 - md5sums = 352fb81ecc6bf30bbeee2891a34647ba - md5sums = 0aec926df4eb78325a014660b834818e - md5sums = 19a16543aceb3a621093c00305403bbd - md5sums = ec16616371b3a323f8eabdf3605ac9ef - md5sums = 48196a5b3a0a713877e28df51e9f2465 - md5sums = d9a63b6f703778e51fd373732b5af31f - md5sums = 5a6513ca11c2e386f34d2f133bb2256a - md5sums = 990f642145f2b6a64ba3fc41c84f0e57 - md5sums = fa8709ba448f1537542b263bdd94ddbc - md5sums = e0ebb9a1cdf23a0ee392491db42ddd75 - md5sums = 0ad6e88622026d6252bedde357900452 - md5sums = f2948d806f16fbf263d733e8824cf4b8 - md5sums = 02fc0f80007bba9137854439eb3d7513 - md5sums = 79a566c874a2b15acdd5ada456ff7781 - md5sums = 16d668d460645879f403f9f1b9cf5539 - md5sums = 72dd9f8e572c43e4f490b9a16a799d0f - md5sums = 582aa4fabd82de714445f1f419c9143a - md5sums = a676f9447cdba7f16feead657c0f3720 - md5sums = 5b06de1d87761baaf8cddc3263702b83 - md5sums = eeb4ee5384c54f4c7802506b9d23523c - md5sums = b0629fce5041c51c7244aa0e18630e4e - md5sums = 62573876286a3f1cac8c83c605a055ec - md5sums = 201a0dde87d2946bff414e04110a02bb - md5sums = 08be6b0dfd0149d78124711eeb369a46 - md5sums = a762027682537f1e5d263f93a5e18c12 - md5sums = 352fb81ecc6bf30bbeee2891a34647ba - md5sums = 0aec926df4eb78325a014660b834818e - md5sums = 19a16543aceb3a621093c00305403bbd - md5sums = ec16616371b3a323f8eabdf3605ac9ef - md5sums = 48196a5b3a0a713877e28df51e9f2465 - md5sums = d9a63b6f703778e51fd373732b5af31f - md5sums = 5a6513ca11c2e386f34d2f133bb2256a - md5sums = 990f642145f2b6a64ba3fc41c84f0e57 - md5sums = fa8709ba448f1537542b263bdd94ddbc - md5sums = e0ebb9a1cdf23a0ee392491db42ddd75 - md5sums = 0ad6e88622026d6252bedde357900452 - md5sums = f2948d806f16fbf263d733e8824cf4b8 - md5sums = 02fc0f80007bba9137854439eb3d7513 - md5sums = 645037becd8fdd266ac8e7cacdde85ab + md5sums = f0809befe04160fbb73bbf38a06a2073 + md5sums = 14ea9353fcc9234a9c7cb98ef14050a3 + md5sums = 34c9df86a43132f58b18bd3061305b36 + md5sums = 94f3ec6cdb456cc9b0535bd549cf2859 + md5sums = eb118e7a01ff8e39f608e715758ac3dd + md5sums = c5184ae70974aaeaf5e1996dc7af6ec0 + md5sums = 917a3439afa97afab1b0b722082d640b + md5sums = bea9eb1a5be8e5e1ee2592007b112fe5 + md5sums = 281a81a7c32cc2f4bfeb83f5bea29d59 + md5sums = ec262ef6bcf2f12832f83aad30d2f728 + md5sums = 10c24aec6ca3743d01ca7e0f2704b024 + md5sums = bfa3574a0d44f831e412befba235b2ca + md5sums = 366b8209ba35b00e2fe4ddcf448ed015 + md5sums = 0c17f618cbee73a49d7829da7c816cd7 + md5sums = 11f26a2237acd5e78d5a3db4de2d6d90 + md5sums = 632765f81a4b72b540376255a10b4c2e + md5sums = 1f57d40dc492822f2e931bdd3a0b7435 + md5sums = 758afe3653d7ce126ebae03e6a8f222f + md5sums = d616bd0fd1ac1ae0d749f93fcba0aeb1 + md5sums = 6847671b013c249aaa2dd7d7e646e4e6 + md5sums = 9e3c6cee969a55b15558f6a46f7aad20 + md5sums = 7bf4cf112551bea4c4d3dd91ed7e1461 + md5sums = 97ece0bb54a249aa0a1fc662eedc93de + md5sums = 4bdbf113772fdfe4cc6da53c866216b2 + md5sums = 399555789f729477d65861179efaf9e3 + md5sums = 295d83b50278474289727dc49a688e95 + md5sums = 14ea9353fcc9234a9c7cb98ef14050a3 + md5sums = 34c9df86a43132f58b18bd3061305b36 + md5sums = 94f3ec6cdb456cc9b0535bd549cf2859 + md5sums = eb118e7a01ff8e39f608e715758ac3dd + md5sums = c5184ae70974aaeaf5e1996dc7af6ec0 + md5sums = 917a3439afa97afab1b0b722082d640b + md5sums = bea9eb1a5be8e5e1ee2592007b112fe5 + md5sums = 281a81a7c32cc2f4bfeb83f5bea29d59 + md5sums = ec262ef6bcf2f12832f83aad30d2f728 + md5sums = 10c24aec6ca3743d01ca7e0f2704b024 + md5sums = bfa3574a0d44f831e412befba235b2ca + md5sums = 366b8209ba35b00e2fe4ddcf448ed015 + md5sums = 0c17f618cbee73a49d7829da7c816cd7 + md5sums = 11f26a2237acd5e78d5a3db4de2d6d90 + md5sums = 632765f81a4b72b540376255a10b4c2e + md5sums = 1f57d40dc492822f2e931bdd3a0b7435 + md5sums = 758afe3653d7ce126ebae03e6a8f222f + md5sums = d616bd0fd1ac1ae0d749f93fcba0aeb1 + md5sums = 6847671b013c249aaa2dd7d7e646e4e6 + md5sums = 9e3c6cee969a55b15558f6a46f7aad20 + md5sums = 7bf4cf112551bea4c4d3dd91ed7e1461 + md5sums = 97ece0bb54a249aa0a1fc662eedc93de + md5sums = 4bdbf113772fdfe4cc6da53c866216b2 + md5sums = 399555789f729477d65861179efaf9e3 + md5sums = 295d83b50278474289727dc49a688e95 + md5sums = 541413adc439b0650ad236f13c47e28e pkgname = mingw-w64-qt5-base-angle diff --git a/0001-Fix-qwindows-plugin-linking-with-system-freetype.patch b/0001-Fix-qwindows-plugin-linking-with-system-freetype.patch index 4ada02a10ca5..40f1749fdd3e 100644 --- a/0001-Fix-qwindows-plugin-linking-with-system-freetype.patch +++ b/0001-Fix-qwindows-plugin-linking-with-system-freetype.patch @@ -1,4 +1,4 @@ -From ce1268a5bce5652761fc2a54e4e361bc003befec Mon Sep 17 00:00:00 2001 +From 33a70ca96428d1da21de74c5ddcdb1b0a5015687 Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Thu, 6 Aug 2015 23:35:08 +0200 Subject: [PATCH 01/26] Fix qwindows plugin linking with system-freetype @@ -8,7 +8,7 @@ Subject: [PATCH 01/26] Fix qwindows plugin linking with system-freetype 1 file changed, 1 insertion(+) diff --git a/src/3rdparty/freetype_dependency.pri b/src/3rdparty/freetype_dependency.pri -index 39280de..e152b0d 100644 +index 39280deb2f..e152b0dedf 100644 --- a/src/3rdparty/freetype_dependency.pri +++ b/src/3rdparty/freetype_dependency.pri @@ -4,4 +4,5 @@ contains(QT_CONFIG, freetype) { @@ -18,5 +18,5 @@ index 39280de..e152b0d 100644 + win32:shared:LIBS_PRIVATE += -lfreetype } -- -2.10.2 +2.11.0 diff --git a/0002-Fix-oci-config-test-on-windows.patch b/0002-Fix-oci-config-test-on-windows.patch index f3fae17233cd..c46beae96966 100644 --- a/0002-Fix-oci-config-test-on-windows.patch +++ b/0002-Fix-oci-config-test-on-windows.patch @@ -1,4 +1,4 @@ -From 3c7458eaa2d7fb3bb9ca379eec96418e1c6ba482 Mon Sep 17 00:00:00 2001 +From 46b5449c24017b2965803ed110601ce4800cb470 Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Mon, 8 Dec 2014 14:15:12 +0100 Subject: [PATCH 02/26] Fix oci config test on windows @@ -8,7 +8,7 @@ Subject: [PATCH 02/26] Fix oci config test on windows 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.tests/unix/oci/oci.pro b/config.tests/unix/oci/oci.pro -index 3ffda1d..39b6f3759 100644 +index 3ffda1ddd7..39b6f37596 100644 --- a/config.tests/unix/oci/oci.pro +++ b/config.tests/unix/oci/oci.pro @@ -1,3 +1,3 @@ @@ -17,5 +17,5 @@ index 3ffda1d..39b6f3759 100644 -LIBS += -lclntsh +!win32:LIBS += -lclntsh -- -2.10.2 +2.11.0 diff --git a/0003-Don-t-set-QT_NO_SYSTEMSEMAPHORE-for-Windows.patch b/0003-Don-t-set-QT_NO_SYSTEMSEMAPHORE-for-Windows.patch index 611b83149d4e..0e37954246e0 100644 --- a/0003-Don-t-set-QT_NO_SYSTEMSEMAPHORE-for-Windows.patch +++ b/0003-Don-t-set-QT_NO_SYSTEMSEMAPHORE-for-Windows.patch @@ -1,4 +1,4 @@ -From 93f3b6c5d93a539bcebd3087b6209a9dd81104fd Mon Sep 17 00:00:00 2001 +From 7f9c28d0bd3a4b89ea5ecb44e38c4b0aabcc0026 Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Thu, 6 Aug 2015 13:24:56 +0200 Subject: [PATCH 03/26] Don't set QT_NO_SYSTEMSEMAPHORE for Windows @@ -8,11 +8,11 @@ Subject: [PATCH 03/26] Don't set QT_NO_SYSTEMSEMAPHORE for Windows 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure -index 43b55f0..de2c3ec 100755 +index ba94d08714..50e6dfbce6 100755 --- a/configure +++ b/configure -@@ -4656,7 +4656,7 @@ fi - [ "$XPLATFORM_ANDROID" = "yes" ] && QMakeVar add styles "android" +@@ -4677,7 +4677,7 @@ fi + [ "$XPLATFORM_ANDROID" != "no" ] && QMakeVar add styles "android" # check IPC support -if ! compileTest unix/ipc_sysv "ipc_sysv" ; then @@ -21,5 +21,5 @@ index 43b55f0..de2c3ec 100755 if compileTest unix/ipc_posix "ipc_posix" ; then QCONFIG_FLAGS="$QCONFIG_FLAGS QT_POSIX_IPC" -- -2.10.2 +2.11.0 diff --git a/0004-Fix-building-mysql-driver-under-mingw.patch b/0004-Fix-building-mysql-driver-under-mingw.patch index 2038c4edb75f..81a3038c3fa9 100644 --- a/0004-Fix-building-mysql-driver-under-mingw.patch +++ b/0004-Fix-building-mysql-driver-under-mingw.patch @@ -1,4 +1,4 @@ -From f30b82c0605e3a2c1dfe8f0ac7da11182ebcd19f Mon Sep 17 00:00:00 2001 +From 1188f25bbc6ccd2fce5b080b98862aeb8420fc94 Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Tue, 6 Oct 2015 09:53:20 +0200 Subject: [PATCH 04/26] Fix building mysql driver under mingw @@ -8,7 +8,7 @@ Subject: [PATCH 04/26] Fix building mysql driver under mingw 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sql/drivers/mysql/qsql_mysql.pri b/src/sql/drivers/mysql/qsql_mysql.pri -index 3cfb614..8b7063f 100644 +index 3cfb6144a1..8b7063f1e4 100644 --- a/src/sql/drivers/mysql/qsql_mysql.pri +++ b/src/sql/drivers/mysql/qsql_mysql.pri @@ -4,7 +4,7 @@ SOURCES += $$PWD/qsql_mysql.cpp @@ -21,5 +21,5 @@ index 3cfb614..8b7063f 100644 !contains(LIBS, .*mysqlclient.*):!contains(LIBS, .*mysqld.*) { use_libmysqlclient_r:LIBS += -lmysqlclient_r -- -2.10.2 +2.11.0 diff --git a/0005-Support-ANGLE-switches-via-configure-shell-script.patch b/0005-Support-ANGLE-switches-via-configure-shell-script.patch index 558fa825bc42..7bb3c6b144eb 100644 --- a/0005-Support-ANGLE-switches-via-configure-shell-script.patch +++ b/0005-Support-ANGLE-switches-via-configure-shell-script.patch @@ -1,4 +1,4 @@ -From 443ebf3f1644a5111fae06cfa248c641d96e1ffb Mon Sep 17 00:00:00 2001 +From a40c4d89a09af39c8a9b6e07f99aab277139da28 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 13:36:53 +0200 Subject: [PATCH 05/26] Support ANGLE switches via configure shell script @@ -11,7 +11,7 @@ this case executing configure.bat is not appropriate 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/configure b/configure -index de2c3ec..cf879ff 100755 +index 50e6dfbce6..af275de52c 100755 --- a/configure +++ b/configure @@ -1287,6 +1287,7 @@ while [ "$#" -gt 0 ]; do @@ -22,7 +22,7 @@ index de2c3ec..cf879ff 100755 [ "$VAL" = "yes" ] || [ "$VAL" = "no" ] || [ "$VAL" = "es2" ]; then CFG_OPENGL="$VAL" -@@ -5312,7 +5313,7 @@ if [ "$XPLATFORM_MINGW" = "yes" ]; then +@@ -5320,7 +5321,7 @@ if [ "$XPLATFORM_MINGW" = "yes" ]; then fi if [ "$CFG_OPENGL" = "auto" ] || [ "$CFG_OPENGL" = "yes" ]; then if compileTest x11/opengl "OpenGL"; then @@ -31,7 +31,7 @@ index de2c3ec..cf879ff 100755 elif compileTest unix/opengles2 "OpenGL ES 2.0"; then CFG_OPENGL=es2 else -@@ -5348,6 +5349,17 @@ if [ "$XPLATFORM_MINGW" = "yes" ]; then +@@ -5356,6 +5357,17 @@ if [ "$XPLATFORM_MINGW" = "yes" ]; then echo " ${XQMAKESPEC}." exit 1 fi @@ -49,7 +49,7 @@ index de2c3ec..cf879ff 100755 elif [ "$CFG_OPENGL" = "desktop" ]; then # Desktop OpenGL support compileTest x11/opengl "OpenGL" -@@ -6423,6 +6435,16 @@ if [ "$CFG_OPENGL" = "es2" ]; then +@@ -6431,6 +6443,16 @@ if [ "$CFG_OPENGL" = "es2" ]; then QT_CONFIG="$QT_CONFIG opengles2" fi @@ -66,8 +66,8 @@ index de2c3ec..cf879ff 100755 if [ "$CFG_SHARED" = "yes" ]; then QT_CONFIG="$QT_CONFIG shared" QTCONFIG_CONFIG="$QTCONFIG_CONFIG shared" -@@ -7474,7 +7496,7 @@ report_support " OpenSSL .............." "$CFG_OPENSSL" yes "loading librarie - report_support " NIS ...................." "$CFG_NIS" +@@ -7479,7 +7501,7 @@ report_support " OpenSSL .............." "$CFG_OPENSSL" yes "loading librarie + report_support " SecureTransport ......" "$CFG_SECURETRANSPORT" report_support " OpenGL / OpenVG:" report_support " EGL .................." "$CFG_EGL" -report_support " OpenGL ..............." "$CFG_OPENGL" yes "Desktop OpenGL" es2 "OpenGL ES 2.0+" @@ -76,7 +76,7 @@ index de2c3ec..cf879ff 100755 report_support " PCRE ..................." "$CFG_PCRE" yes "system library" qt "bundled copy" if [ -n "$PKG_CONFIG" ]; then diff --git a/src/gui/opengl/qopenglfunctions.h b/src/gui/opengl/qopenglfunctions.h -index f6cd0e5..17214a0 100644 +index f6cd0e553e..17214a0545 100644 --- a/src/gui/opengl/qopenglfunctions.h +++ b/src/gui/opengl/qopenglfunctions.h @@ -56,9 +56,7 @@ @@ -90,5 +90,5 @@ index f6cd0e5..17214a0 100644 #ifdef Q_ENABLE_OPENGL_FUNCTIONS_DEBUG #include <stdio.h> -- -2.10.2 +2.11.0 diff --git a/0006-Use-external-ANGLE-library.patch b/0006-Use-external-ANGLE-library.patch index 68744f2fc5c7..08e22ce775ce 100644 --- a/0006-Use-external-ANGLE-library.patch +++ b/0006-Use-external-ANGLE-library.patch @@ -1,4 +1,4 @@ -From 6d05281c9dbdcbc60ecbcf596db1c06a86f4d19d Mon Sep 17 00:00:00 2001 +From 22922f121b3dc7865b7d0c553ed033dca700cc74 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 13:41:38 +0200 Subject: [PATCH 06/26] Use external ANGLE library @@ -12,7 +12,7 @@ Subject: [PATCH 06/26] Use external ANGLE library 5 files changed, 8 insertions(+), 11 deletions(-) diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in -index 07869ef..2e32911 100644 +index 07869efd7d..2e32911a64 100644 --- a/src/gui/Qt5GuiConfigExtras.cmake.in +++ b/src/gui/Qt5GuiConfigExtras.cmake.in @@ -2,9 +2,9 @@ @@ -28,7 +28,7 @@ index 07869ef..2e32911 100644 _qt5_Gui_check_file_exists(${Qt5Gui_EGL_INCLUDE_DIRS}) diff --git a/src/gui/gui.pro b/src/gui/gui.pro -index 462f133..db30dd3 100644 +index 462f133ff8..db30dd3440 100644 --- a/src/gui/gui.pro +++ b/src/gui/gui.pro @@ -17,11 +17,6 @@ MODULE_PLUGIN_TYPES = \ @@ -55,7 +55,7 @@ index 462f133..db30dd3 100644 include(accessible/accessible.pri) diff --git a/src/opengl/opengl.pro b/src/opengl/opengl.pro -index 2386ef5..fe3b327 100644 +index 2386ef5d19..fe3b327f13 100644 --- a/src/opengl/opengl.pro +++ b/src/opengl/opengl.pro @@ -11,6 +11,7 @@ QMAKE_DOCS = $$PWD/doc/qtopengl.qdocconf @@ -67,7 +67,7 @@ index 2386ef5..fe3b327 100644 HEADERS += qgl.h \ qgl_p.h \ diff --git a/src/plugins/platforms/windows/windows.pri b/src/plugins/platforms/windows/windows.pri -index 48c5359..3498dbe 100644 +index 48c53592d6..3498dbeaa8 100644 --- a/src/plugins/platforms/windows/windows.pri +++ b/src/plugins/platforms/windows/windows.pri @@ -3,6 +3,7 @@ LIBS *= -lole32 @@ -79,10 +79,10 @@ index 48c5359..3498dbe 100644 mingw: LIBS *= -luuid # For the dialog helpers: diff --git a/src/src.pro b/src/src.pro -index 71347dc..921c4d8 100644 +index 3d185408f8..1e4f93d17d 100644 --- a/src/src.pro +++ b/src/src.pro -@@ -159,10 +159,6 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent +@@ -163,10 +163,6 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent SUBDIRS += src_3rdparty_harfbuzzng src_gui.depends += src_3rdparty_harfbuzzng } @@ -90,9 +90,9 @@ index 71347dc..921c4d8 100644 - SUBDIRS += src_angle - src_gui.depends += src_angle - } - contains(QT_CONFIG, freetype) { - SUBDIRS += src_3rdparty_freetype - src_platformsupport.depends += src_3rdparty_freetype + contains(QT_CONFIG, png) { + SUBDIRS += src_3rdparty_libpng + src_3rdparty_freetype.depends += src_3rdparty_libpng -- -2.10.2 +2.11.0 diff --git a/0007-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch b/0007-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch index 2ee0771ba2a7..558f13f13dcc 100644 --- a/0007-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch +++ b/0007-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch @@ -1,4 +1,4 @@ -From 20e2f7b8353a9828ca2dc2d8d0d93357ddfefbc7 Mon Sep 17 00:00:00 2001 +From 73e031e4308c76638e67f7e167df47d3988c7c14 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 13:48:51 +0200 Subject: [PATCH 07/26] Fix too many sections assemler error in OpenGL factory @@ -11,7 +11,7 @@ Hence the assembler option -mbig-obj is required. 1 file changed, 1 insertion(+) diff --git a/src/gui/opengl/opengl.pri b/src/gui/opengl/opengl.pri -index b13f258..8a9093f 100644 +index b13f258fda..8a9093f4ca 100644 --- a/src/gui/opengl/opengl.pri +++ b/src/gui/opengl/opengl.pri @@ -4,6 +4,7 @@ contains(QT_CONFIG, opengl):CONFIG += opengl @@ -23,5 +23,5 @@ index b13f258..8a9093f 100644 HEADERS += opengl/qopengl.h \ opengl/qopengl_p.h \ -- -2.10.2 +2.11.0 diff --git a/0008-Make-sure-.pc-files-are-installed-correctly.patch b/0008-Make-sure-.pc-files-are-installed-correctly.patch index ae773eb47c0c..b4249f905c8e 100644 --- a/0008-Make-sure-.pc-files-are-installed-correctly.patch +++ b/0008-Make-sure-.pc-files-are-installed-correctly.patch @@ -1,4 +1,4 @@ -From 2f08b378abc94becbecfdf3833084320cbb6a936 Mon Sep 17 00:00:00 2001 +From fbd42996783866ecf559aae52d73e2871f207b54 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 13:54:12 +0200 Subject: [PATCH 08/26] Make sure *.pc files are installed correctly @@ -10,7 +10,7 @@ Subject: [PATCH 08/26] Make sure *.pc files are installed correctly 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp -index 12004c6..a3f71ba 100644 +index d356adada5..fa5c796387 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -3149,7 +3149,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const @@ -36,10 +36,10 @@ index 12004c6..a3f71ba 100644 return ret; } diff --git a/qmake/generators/makefile.h b/qmake/generators/makefile.h -index 41b90eb..cf67b3e 100644 +index a67a0ec0fc..9ec1abfaa8 100644 --- a/qmake/generators/makefile.h +++ b/qmake/generators/makefile.h -@@ -87,7 +87,7 @@ protected: +@@ -89,7 +89,7 @@ protected: virtual void writeDefaultVariables(QTextStream &t); QString pkgConfigPrefix() const; @@ -49,7 +49,7 @@ index 41b90eb..cf67b3e 100644 void writePkgConfigFile(); // for pkg-config diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp -index 0846cb2..543e905 100644 +index 0846cb2d8f..543e905051 100644 --- a/qmake/generators/win32/winmakefile.cpp +++ b/qmake/generators/win32/winmakefile.cpp @@ -718,7 +718,7 @@ QString Win32MakefileGenerator::defaultInstall(const QString &t) @@ -62,5 +62,5 @@ index 0846cb2..543e905 100644 uninst.append("\n\t"); uninst.append("-$(DEL_FILE) " + escapeFilePath(dst_pc)); -- -2.10.2 +2.11.0 diff --git a/0009-Don-t-add-resource-files-to-LIBS-parameter.patch b/0009-Don-t-add-resource-files-to-LIBS-parameter.patch index 3069b8b6c95d..0cdf983bdea3 100644 --- a/0009-Don-t-add-resource-files-to-LIBS-parameter.patch +++ b/0009-Don-t-add-resource-files-to-LIBS-parameter.patch @@ -1,4 +1,4 @@ -From bdac1b16ee425b00cc9e55727164a7583fb63948 Mon Sep 17 00:00:00 2001 +From b98187a679d8a09d1fc1cf08e5ca940cd6152995 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 13:58:28 +0200 Subject: [PATCH 09/26] Don't add resource files to LIBS parameter @@ -11,7 +11,7 @@ like .obj/debug/Qt5Cored_resource_res.o 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp -index 382b10c..3caad90 100644 +index 382b10c37b..3caad900a8 100644 --- a/qmake/generators/win32/mingw_make.cpp +++ b/qmake/generators/win32/mingw_make.cpp @@ -196,7 +196,7 @@ void MingwMakefileGenerator::init() @@ -24,5 +24,5 @@ index 382b10c..3caad90 100644 if (project->isActiveConfig("dll")) { QString destDir = ""; -- -2.10.2 +2.11.0 diff --git a/0010-Prevent-debug-library-names-in-pkg-config-files.patch b/0010-Prevent-debug-library-names-in-pkg-config-files.patch index e7b867f008ca..dfbf6ae9c4d9 100644 --- a/0010-Prevent-debug-library-names-in-pkg-config-files.patch +++ b/0010-Prevent-debug-library-names-in-pkg-config-files.patch @@ -1,4 +1,4 @@ -From 24392ab66af0cc0ed385a793921d641ef53d7afb Mon Sep 17 00:00:00 2001 +From b32d821f76823f529a35afdb698633870fc18936 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 14:01:14 +0200 Subject: [PATCH 10/26] Prevent debug library names in pkg-config files @@ -15,7 +15,7 @@ files for the debug build an unique file name. 1 file changed, 3 insertions(+) diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp -index a3f71ba..b4792fe 100644 +index fa5c796387..04c0210eb9 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -3163,6 +3163,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir) @@ -29,5 +29,5 @@ index a3f71ba..b4792fe 100644 QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString(); if(!subdir.isEmpty()) { -- -2.10.2 +2.11.0 diff --git a/0011-Fix-linking-against-static-D-Bus.patch b/0011-Fix-linking-against-static-D-Bus.patch index 0d07083f23fe..da7ac99385bf 100644 --- a/0011-Fix-linking-against-static-D-Bus.patch +++ b/0011-Fix-linking-against-static-D-Bus.patch @@ -1,4 +1,4 @@ -From f46f51482f05364b021d24352f7618f26d2d3794 Mon Sep 17 00:00:00 2001 +From c9836f2d0b0d86b47ff5607d581d133f9e3f06c6 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 14:07:02 +0200 Subject: [PATCH 11/26] Fix linking against static D-Bus @@ -9,7 +9,7 @@ Subject: [PATCH 11/26] Fix linking against static D-Bus 2 files changed, 8 insertions(+) diff --git a/config.tests/unix/dbus/dbus.cpp b/config.tests/unix/dbus/dbus.cpp -index 295c904..80d3e9c 100644 +index 295c904400..80d3e9c044 100644 --- a/config.tests/unix/dbus/dbus.cpp +++ b/config.tests/unix/dbus/dbus.cpp @@ -37,6 +37,10 @@ @@ -24,7 +24,7 @@ index 295c904..80d3e9c 100644 #include <dbus/dbus.h> diff --git a/src/dbus/qdbus_symbols_p.h b/src/dbus/qdbus_symbols_p.h -index fbeea61..8e73e9e 100644 +index fbeea61c95..8e73e9eec8 100644 --- a/src/dbus/qdbus_symbols_p.h +++ b/src/dbus/qdbus_symbols_p.h @@ -57,6 +57,10 @@ @@ -39,5 +39,5 @@ index fbeea61..8e73e9e 100644 # include <dbus/dbus.h> #else -- -2.10.2 +2.11.0 diff --git a/0012-Adjust-win32-g-mkspecs-profile.patch b/0012-Adjust-win32-g-mkspecs-profile.patch index 98fa91865a08..9c064d453dff 100644 --- a/0012-Adjust-win32-g-mkspecs-profile.patch +++ b/0012-Adjust-win32-g-mkspecs-profile.patch @@ -1,4 +1,4 @@ -From c92196a9e56f233e4db9256496361a98764d6bcf Mon Sep 17 00:00:00 2001 +From 5c8fa53c4690db11914df6470853958a09e6f0e2 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 14:15:08 +0200 Subject: [PATCH 12/26] Adjust win32-g++ mkspecs profile @@ -11,7 +11,7 @@ Subject: [PATCH 12/26] Adjust win32-g++ mkspecs profile 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf -index c5f6353..db92487 100644 +index 6ed39745ae..3ee820e54b 100644 --- a/mkspecs/win32-g++/qmake.conf +++ b/mkspecs/win32-g++/qmake.conf @@ -26,7 +26,7 @@ QMAKE_LEX = flex @@ -23,7 +23,7 @@ index c5f6353..db92487 100644 QMAKE_CFLAGS_DEPS = -M QMAKE_CFLAGS_WARN_ON = -Wall -Wextra QMAKE_CFLAGS_WARN_OFF = -w -@@ -74,10 +74,10 @@ QMAKE_RUN_CXX_IMP = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< +@@ -75,10 +75,10 @@ QMAKE_RUN_CXX_IMP = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< QMAKE_LINK = $${CROSS_COMPILE}g++ QMAKE_LINK_C = $${CROSS_COMPILE}gcc @@ -36,7 +36,7 @@ index c5f6353..db92487 100644 QMAKE_LFLAGS_DEBUG = QMAKE_LFLAGS_CONSOLE = -Wl,-subsystem,console QMAKE_LFLAGS_WINDOWS = -Wl,-subsystem,windows -@@ -95,21 +95,26 @@ QMAKE_EXTENSION_STATICLIB = a +@@ -96,21 +96,26 @@ QMAKE_EXTENSION_STATICLIB = a QMAKE_LIB_EXTENSIONS = a dll.a QMAKE_LIBS = @@ -71,5 +71,5 @@ index c5f6353..db92487 100644 + load(qt_config) -- -2.10.2 +2.11.0 diff --git a/0013-Fix-linking-against-external-harfbuzz.patch b/0013-Fix-linking-against-external-harfbuzz.patch index 789fb3f92db5..738b8664bd72 100644 --- a/0013-Fix-linking-against-external-harfbuzz.patch +++ b/0013-Fix-linking-against-external-harfbuzz.patch @@ -1,4 +1,4 @@ -From 3bbcdf8e7657d5112e3d35e372786949424b5a37 Mon Sep 17 00:00:00 2001 +From e08f71f26c964c3f5a82eb208d871fc883869f23 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 14:22:56 +0200 Subject: [PATCH 13/26] Fix linking against external harfbuzz @@ -9,7 +9,7 @@ Subject: [PATCH 13/26] Fix linking against external harfbuzz 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/config.tests/unix/harfbuzz/harfbuzz.pro b/config.tests/unix/harfbuzz/harfbuzz.pro -index 32edd6e..cc40fc1 100644 +index 32edd6e358..cc40fc1678 100644 --- a/config.tests/unix/harfbuzz/harfbuzz.pro +++ b/config.tests/unix/harfbuzz/harfbuzz.pro @@ -1,3 +1,4 @@ @@ -19,7 +19,7 @@ index 32edd6e..cc40fc1 100644 +contains(CONFIG, static): LIBS += $$system($$PKG_CONFIG --static --libs harfbuzz) +else: LIBS += $$system($$PKG_CONFIG --libs harfbuzz) diff --git a/src/3rdparty/harfbuzz_dependency.pri b/src/3rdparty/harfbuzz_dependency.pri -index 7443368..2932f05 100644 +index 74433688f6..2932f059e9 100644 --- a/src/3rdparty/harfbuzz_dependency.pri +++ b/src/3rdparty/harfbuzz_dependency.pri @@ -2,5 +2,7 @@ contains(QT_CONFIG, harfbuzz) { @@ -32,5 +32,5 @@ index 7443368..2932f05 100644 + else: LIBS_PRIVATE += $$system($$PKG_CONFIG --libs harfbuzz) } -- -2.10.2 +2.11.0 diff --git a/0014-Fix-linking-against-static-pcre.patch b/0014-Fix-linking-against-static-pcre.patch index 1bd0be47decc..28a357f21ddc 100644 --- a/0014-Fix-linking-against-static-pcre.patch +++ b/0014-Fix-linking-against-static-pcre.patch @@ -1,4 +1,4 @@ -From 41f31abf629018e7e937aca6edbec022a01a1522 Mon Sep 17 00:00:00 2001 +From edcc4cad1376de4e843212cca56cb74aa5d7a7dd Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 14:24:01 +0200 Subject: [PATCH 14/26] Fix linking against static pcre @@ -8,7 +8,7 @@ Subject: [PATCH 14/26] Fix linking against static pcre 1 file changed, 4 insertions(+) diff --git a/src/corelib/tools/qregularexpression.cpp b/src/corelib/tools/qregularexpression.cpp -index e7f86dd..63fc683 100644 +index e7f86ddf6b..63fc683c68 100644 --- a/src/corelib/tools/qregularexpression.cpp +++ b/src/corelib/tools/qregularexpression.cpp @@ -54,6 +54,10 @@ @@ -23,5 +23,5 @@ index e7f86dd..63fc683 100644 QT_BEGIN_NAMESPACE -- -2.10.2 +2.11.0 diff --git a/0015-Rename-qtmain-to-qt5main.patch b/0015-Rename-qtmain-to-qt5main.patch index 119cb61a9df6..4398ab7ddf9b 100644 --- a/0015-Rename-qtmain-to-qt5main.patch +++ b/0015-Rename-qtmain-to-qt5main.patch @@ -1,4 +1,4 @@ -From bf08fb6aa45fd8492ff17db5c5ea8f2a6b861ad8 Mon Sep 17 00:00:00 2001 +From 23032a6a5efa261c73b40adbc708cec7fe309b3d Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 14:25:40 +0200 Subject: [PATCH 15/26] Rename qtmain to qt5main @@ -11,7 +11,7 @@ Prevents conflict with mingw-w64-qt4 package 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf -index 11fb52a..4adacf6 100644 +index 11fb52a0b1..4adacf6762 100644 --- a/mkspecs/features/create_cmake.prf +++ b/mkspecs/features/create_cmake.prf @@ -225,8 +225,8 @@ mac { @@ -26,7 +26,7 @@ index 11fb52a..4adacf6 100644 !isEmpty(CMAKE_STATIC_TYPE) { CMAKE_STATIC_WINDOWS_BUILD = "true" diff --git a/mkspecs/features/win32/windows.prf b/mkspecs/features/win32/windows.prf -index 986067f..339ac15 100644 +index 986067fc8c..339ac15efe 100644 --- a/mkspecs/features/win32/windows.prf +++ b/mkspecs/features/win32/windows.prf @@ -5,7 +5,7 @@ contains(TEMPLATE, ".*app") { @@ -39,7 +39,7 @@ index 986067f..339ac15 100644 QMAKE_LIBS += -L$$QT.core.libs CONFIG(debug, debug|release): QMAKE_LIBS += $${entryLib}$${QT_LIBINFIX}d diff --git a/src/winmain/winmain.pro b/src/winmain/winmain.pro -index b497765..d63a684 100644 +index b4977653ce..d63a684a18 100644 --- a/src/winmain/winmain.pro +++ b/src/winmain/winmain.pro @@ -2,7 +2,7 @@ @@ -52,5 +52,5 @@ index b497765..d63a684 100644 CONFIG += static -- -2.10.2 +2.11.0 diff --git a/0016-Build-dynamic-host-libraries.patch b/0016-Build-dynamic-host-libraries.patch index 1c1b71422c9f..8a299a72b9d2 100644 --- a/0016-Build-dynamic-host-libraries.patch +++ b/0016-Build-dynamic-host-libraries.patch @@ -1,4 +1,4 @@ -From 61bdeeb1fd3b4eabc204fd65dd9049ddaeb5583f Mon Sep 17 00:00:00 2001 +From 5b1b584626a4b89500bd8925dee62a61f869f179 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 14:27:28 +0200 Subject: [PATCH 16/26] Build dynamic host libraries @@ -11,7 +11,7 @@ standards 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf -index 5bd5101..30a325b 100644 +index d9011f5482..cb29009970 100644 --- a/mkspecs/features/qt_module.prf +++ b/mkspecs/features/qt_module.prf @@ -25,7 +25,7 @@ isEmpty(VERSION): error("Module does not define version.") @@ -24,7 +24,7 @@ index 5bd5101..30a325b 100644 host_build { QT -= gui # no host module will ever use gui diff --git a/src/tools/bootstrap-dbus/bootstrap-dbus.pro b/src/tools/bootstrap-dbus/bootstrap-dbus.pro -index c3ed27d..30d2114 100644 +index c3ed27d979..30d2114aa1 100644 --- a/src/tools/bootstrap-dbus/bootstrap-dbus.pro +++ b/src/tools/bootstrap-dbus/bootstrap-dbus.pro @@ -27,4 +27,4 @@ SOURCES = \ @@ -34,5 +34,5 @@ index c3ed27d..30d2114 100644 -INSTALLS = lib +INSTALLS += lib -- -2.10.2 +2.11.0 diff --git a/0017-Enable-rpath-for-build-tools.patch b/0017-Enable-rpath-for-build-tools.patch index cecd335bba2c..3c6f1eb830fc 100644 --- a/0017-Enable-rpath-for-build-tools.patch +++ b/0017-Enable-rpath-for-build-tools.patch @@ -1,4 +1,4 @@ -From 42cab8b3eec8eb5c8078ef8360a05b7835a533ba Mon Sep 17 00:00:00 2001 +From 1fae399984442e1ece149022f4411c4cac7c16ad Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 17:59:27 +0200 Subject: [PATCH 17/26] Enable rpath for build tools @@ -11,7 +11,7 @@ Subject: [PATCH 17/26] Enable rpath for build tools 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkspecs/features/qt_app.prf b/mkspecs/features/qt_app.prf -index 46aca50..e763602 100644 +index 46aca50cc2..e7636027aa 100644 --- a/mkspecs/features/qt_app.prf +++ b/mkspecs/features/qt_app.prf @@ -20,6 +20,7 @@ isEmpty(QMAKE_INFO_PLIST): CONFIG -= app_bundle @@ -31,5 +31,5 @@ index 46aca50..e763602 100644 INSTALLS += target -- -2.10.2 +2.11.0 diff --git a/0018-Use-system-zlib-for-build-tools.patch b/0018-Use-system-zlib-for-build-tools.patch index b20a0d6d25e8..fdf6e4422a97 100644 --- a/0018-Use-system-zlib-for-build-tools.patch +++ b/0018-Use-system-zlib-for-build-tools.patch @@ -1,4 +1,4 @@ -From 2e7791965e771e6d4a544a6b81e86cba8ad6b181 Mon Sep 17 00:00:00 2001 +From 3dc08a44504c948ee201bc214277fa634940fa54 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 18:04:42 +0200 Subject: [PATCH 18/26] Use system zlib for build tools @@ -8,7 +8,7 @@ Subject: [PATCH 18/26] Use system zlib for build tools 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro -index a431052..b97ff0a 100644 +index a43105297f..b97ff0aa31 100644 --- a/src/tools/bootstrap/bootstrap.pro +++ b/src/tools/bootstrap/bootstrap.pro @@ -134,7 +134,7 @@ macx { @@ -21,5 +21,5 @@ index a431052..b97ff0a 100644 } else { CONFIG += no_core_dep -- -2.10.2 +2.11.0 diff --git a/0019-Disable-determing-default-include-and-lib-dirs-at-qm.patch b/0019-Disable-determing-default-include-and-lib-dirs-at-qm.patch index 3d4e8d8f3a1e..e4cdc0c91872 100644 --- a/0019-Disable-determing-default-include-and-lib-dirs-at-qm.patch +++ b/0019-Disable-determing-default-include-and-lib-dirs-at-qm.patch @@ -1,26 +1,26 @@ -From 63595b743f993ab734821f7f415cc63bf1dba9ca Mon Sep 17 00:00:00 2001 +From 6b99dac278b4c41000fd6f92c8d400a82cbe484a Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 18:20:25 +0200 Subject: [PATCH 19/26] Disable determing default include and lib dirs at qmake time when building with mingw-w64 --- - mkspecs/features/default_pre.prf | 2 +- + mkspecs/features/toolchain.prf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/mkspecs/features/default_pre.prf b/mkspecs/features/default_pre.prf -index cffffdc..6445481 100644 ---- a/mkspecs/features/default_pre.prf -+++ b/mkspecs/features/default_pre.prf -@@ -29,7 +29,7 @@ isEmpty(QMAKE_DEFAULT_INCDIRS):!host_build { +diff --git a/mkspecs/features/toolchain.prf b/mkspecs/features/toolchain.prf +index 7691b7db34..d262097f09 100644 +--- a/mkspecs/features/toolchain.prf ++++ b/mkspecs/features/toolchain.prf +@@ -3,7 +3,7 @@ isEmpty(QMAKE_DEFAULT_INCDIRS):!host_build { # # Get default include and library paths from compiler # - gcc { + !win32:gcc { - equals(QMAKE_DIR_SEP, /) { + !equals(QMAKE_HOST.os, Windows) { cmd_prefix = "LC_ALL=C" cmd_suffix = "</dev/null >/dev/null" -- -2.10.2 +2.11.0 diff --git a/0020-Use-.dll.a-as-import-lib-extension.patch b/0020-Use-.dll.a-as-import-lib-extension.patch index 1b5d26ab6ff9..d86cb4642eb0 100644 --- a/0020-Use-.dll.a-as-import-lib-extension.patch +++ b/0020-Use-.dll.a-as-import-lib-extension.patch @@ -1,4 +1,4 @@ -From e0f3940f8a6df9e347a29d37671fa1bae7d84735 Mon Sep 17 00:00:00 2001 +From dd6f19fca955ac5918c3b0dca245f9eec9f0755e Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 18:26:18 +0200 Subject: [PATCH 20/26] Use *.dll.a as import lib extension @@ -10,7 +10,7 @@ Subject: [PATCH 20/26] Use *.dll.a as import lib extension 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf -index 4adacf6..0ff1c6d 100644 +index 4adacf6762..0ff1c6d142 100644 --- a/mkspecs/features/create_cmake.prf +++ b/mkspecs/features/create_cmake.prf @@ -236,8 +236,9 @@ mac { @@ -26,10 +26,10 @@ index 4adacf6..0ff1c6d 100644 } else { CMAKE_WINMAIN_FILE_LOCATION_DEBUG = qtmain$${QT_LIBINFIX}d.lib diff --git a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf -index db92487..607bd3e 100644 +index 3ee820e54b..44253a2a37 100644 --- a/mkspecs/win32-g++/qmake.conf +++ b/mkspecs/win32-g++/qmake.conf -@@ -92,7 +92,7 @@ QMAKE_PREFIX_SHLIB = +@@ -93,7 +93,7 @@ QMAKE_PREFIX_SHLIB = QMAKE_EXTENSION_SHLIB = dll QMAKE_PREFIX_STATICLIB = lib QMAKE_EXTENSION_STATICLIB = a @@ -39,7 +39,7 @@ index db92487..607bd3e 100644 QMAKE_LIBS = QMAKE_LIBS_CORE = -lole32 -luuid -lws2_32 -ladvapi32 -lshell32 -luser32 -lkernel32 -lz -lpcre16 diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp -index 543e905..456f21c 100644 +index 543e905051..456f21cedb 100644 --- a/qmake/generators/win32/winmakefile.cpp +++ b/qmake/generators/win32/winmakefile.cpp @@ -80,10 +80,14 @@ Win32MakefileGenerator::parseLibFlag(const ProString &flag, ProString *arg) @@ -76,5 +76,5 @@ index 543e905..456f21c 100644 + project->first("QMAKE_EXTENSION_SHLIB")); project->values("TARGET").first() = project->first("QMAKE_PREFIX_SHLIB") + project->first("TARGET"); -- -2.10.2 +2.11.0 diff --git a/0021-Merge-shared-and-static-library-trees.patch b/0021-Merge-shared-and-static-library-trees.patch index d5a943ab617c..b100204767ca 100644 --- a/0021-Merge-shared-and-static-library-trees.patch +++ b/0021-Merge-shared-and-static-library-trees.patch @@ -1,4 +1,4 @@ -From 9aec74947e4726660486236f083ca485f05625c7 Mon Sep 17 00:00:00 2001 +From 4a2456d3e7372aaacf0aa25a116f85aebf21ef5b Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 18:45:08 +0200 Subject: [PATCH 21/26] Merge shared and static library trees @@ -13,10 +13,10 @@ Allow installation of shared and static build in the same prefix 5 files changed, 40 insertions(+), 6 deletions(-) diff --git a/configure b/configure -index cf879ff..b4c75c6 100755 +index af275de52c..9ecc7f9ada 100755 --- a/configure +++ b/configure -@@ -7181,6 +7181,12 @@ host_build { +@@ -7187,6 +7187,12 @@ host_build { } QT_CONFIG += $QT_CONFIG @@ -30,7 +30,7 @@ index cf879ff..b4c75c6 100755 QT_VERSION = $QT_VERSION QT_MAJOR_VERSION = $QT_MAJOR_VERSION diff --git a/mkspecs/features/default_post.prf b/mkspecs/features/default_post.prf -index e7e9a5b..799278d 100644 +index e7e9a5bd87..799278d445 100644 --- a/mkspecs/features/default_post.prf +++ b/mkspecs/features/default_post.prf @@ -120,3 +120,11 @@ c++11|c++14|c++1z { @@ -46,7 +46,7 @@ index e7e9a5b..799278d 100644 + QMAKE_EXT_PRL=.static.prl # prevents qmake from finding the prl file for shared libs +} diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf -index 03ec36a..c4d7beb 100644 +index bb52f23378..1815ba3241 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf @@ -150,6 +150,18 @@ for(ever) { @@ -69,7 +69,7 @@ index 03ec36a..c4d7beb 100644 !isEmpty(BAD_QT):error("Unknown module(s) in QT$$var_sfx: $$replace(BAD_QT, _private$, -private)") diff --git a/mkspecs/features/spec_pre.prf b/mkspecs/features/spec_pre.prf -index 090f348..05d2863 100644 +index 090f348ebf..05d28636b9 100644 --- a/mkspecs/features/spec_pre.prf +++ b/mkspecs/features/spec_pre.prf @@ -14,9 +14,14 @@ QMAKE_EXT_H = .h .hpp .hh .hxx @@ -91,7 +91,7 @@ index 090f348..05d2863 100644 QMAKE_EXT_YACC = .y diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp -index b4792fe..edd7918 100644 +index 04c0210eb9..f05a039d2f 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -3166,6 +3166,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir) @@ -118,5 +118,5 @@ index b4792fe..edd7918 100644 t << endl; -- -2.10.2 +2.11.0 diff --git a/0022-Allow-usage-of-static-version-with-CMake.patch b/0022-Allow-usage-of-static-version-with-CMake.patch index 45eba6c1e34c..614e2d442c38 100644 --- a/0022-Allow-usage-of-static-version-with-CMake.patch +++ b/0022-Allow-usage-of-static-version-with-CMake.patch @@ -1,4 +1,4 @@ -From baadc36def778c99b33f68d2c840c176bb873d66 Mon Sep 17 00:00:00 2001 +From 5e519508a93e9b6229f2f7f8052f2c1abf8f7ef1 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 18:32:00 +0200 Subject: [PATCH 22/26] Allow usage of static version with CMake @@ -18,7 +18,7 @@ Subject: [PATCH 22/26] Allow usage of static version with CMake 6 files changed, 358 insertions(+), 151 deletions(-) diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf -index 0ff1c6d..d0d4a7f 100644 +index 0ff1c6d142..d0d4a7fc1a 100644 --- a/mkspecs/features/create_cmake.prf +++ b/mkspecs/features/create_cmake.prf @@ -38,7 +38,8 @@ split_incpath { @@ -221,7 +221,7 @@ index 0ff1c6d..d0d4a7f 100644 # We are generating cmake files. Most developers of Qt are not aware of cmake, # so we require automatic tests to be available. The only module which should diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -index d2358ca..89575ef 100644 +index d2358cae4b..89575efd6f 100644 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in @@ -35,15 +35,18 @@ set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\") @@ -774,7 +774,7 @@ index d2358ca..89575ef 100644 endif() diff --git a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in -index 5baf0fd..54345e4 100644 +index 5baf0fdb10..54345e4117 100644 --- a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in +++ b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in @@ -1,11 +1,31 @@ @@ -815,7 +815,7 @@ index 5baf0fd..54345e4 100644 -list(APPEND Qt5$${CMAKE_MODULE_NAME}_PLUGINS Qt5::$$CMAKE_PLUGIN_NAME) +endif() diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp -index edd7918..9f860da 100644 +index f05a039d2f..831d7c74c0 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -997,6 +997,13 @@ MakefileGenerator::writePrlFile(QTextStream &t) @@ -833,7 +833,7 @@ index edd7918..9f860da 100644 } diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in -index a5ed8b2..3375e1e 100644 +index a5ed8b2ea3..3375e1eeea 100644 --- a/src/corelib/Qt5CoreConfigExtras.cmake.in +++ b/src/corelib/Qt5CoreConfigExtras.cmake.in @@ -1,4 +1,10 @@ @@ -932,7 +932,7 @@ index a5ed8b2..3375e1e 100644 +unset(_isExe) +!!ENDIF diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in -index 2e32911..31567d7 100644 +index 2e32911a64..31567d7da2 100644 --- a/src/gui/Qt5GuiConfigExtras.cmake.in +++ b/src/gui/Qt5GuiConfigExtras.cmake.in @@ -1,4 +1,10 @@ @@ -968,5 +968,5 @@ index 2e32911..31567d7 100644 ${Qt5Gui_EGL_LIBRARIES} ${Qt5Gui_OPENGL_LIBRARIES} ) -- -2.10.2 +2.11.0 diff --git a/0023-Use-correct-pkg-config-static-flag.patch b/0023-Use-correct-pkg-config-static-flag.patch index 4dd8e73e1b4b..356037840ffa 100644 --- a/0023-Use-correct-pkg-config-static-flag.patch +++ b/0023-Use-correct-pkg-config-static-flag.patch @@ -1,4 +1,4 @@ -From aeec21b7d2c0185499531c55282d8738c19770f2 Mon Sep 17 00:00:00 2001 +From 737579eb780ab8a22e075d8032a5ce983d397064 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 18:50:21 +0200 Subject: [PATCH 23/26] Use correct pkg-config --static flag @@ -8,10 +8,10 @@ Subject: [PATCH 23/26] Use correct pkg-config --static flag 1 file changed, 5 insertions(+) diff --git a/configure b/configure -index b4c75c6..eea15f0 100755 +index 9ecc7f9ada..40db8b196a 100755 --- a/configure +++ b/configure -@@ -4153,6 +4153,11 @@ if [ -z "$PKG_CONFIG" ]; then +@@ -4166,6 +4166,11 @@ if [ -z "$PKG_CONFIG" ]; then # See if PKG_CONFIG is set in the mkspec: PKG_CONFIG="`"$CFG_QMAKE_PATH" -qtconf "$QTCONFFILE" -E -nocache -spec "$XQMAKESPEC" "CONFIG=" $DEV_NULL 2>&1 | sed -n -e 's,^PKG_CONFIG = \(.*\),\1,p'`" [ -n "$PKG_CONFIG" ] && [ "$OPT_VERBOSE" = "yes" ] && echo "Found pkg-config from mkspec: $PKG_CONFIG" @@ -24,5 +24,5 @@ index b4c75c6..eea15f0 100755 if [ -z "$PKG_CONFIG" ]; then PKG_CONFIG=`"$WHICH" pkg-config 2>/dev/null` -- -2.10.2 +2.11.0 diff --git a/0024-Use-shared-static-version-of-MariaDB.patch b/0024-Use-shared-static-version-of-MariaDB.patch index d8e8adf190ca..d20a6e920464 100644 --- a/0024-Use-shared-static-version-of-MariaDB.patch +++ b/0024-Use-shared-static-version-of-MariaDB.patch @@ -1,4 +1,4 @@ -From c49745c7dd018086e2566fed2a7a393fe21460d6 Mon Sep 17 00:00:00 2001 +From c207ebb10833de703bbdb23fbbb6863456ae7475 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 18:56:55 +0200 Subject: [PATCH 24/26] Use shared/static version of MariaDB @@ -8,7 +8,7 @@ Subject: [PATCH 24/26] Use shared/static version of MariaDB 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/config.tests/unix/mysql/mysql.pro b/config.tests/unix/mysql/mysql.pro -index 06d1880..5dadbfb 100644 +index 06d1880f08..5dadbfbf2f 100644 --- a/config.tests/unix/mysql/mysql.pro +++ b/config.tests/unix/mysql/mysql.pro @@ -1,3 +1,7 @@ @@ -21,5 +21,5 @@ index 06d1880..5dadbfb 100644 + LIBS += -lmariadbclient +} -- -2.10.2 +2.11.0 diff --git a/0025-Use-shared-static-version-of-PostgreSQL.patch b/0025-Use-shared-static-version-of-PostgreSQL.patch index e133b300ff3d..6696363f2216 100644 --- a/0025-Use-shared-static-version-of-PostgreSQL.patch +++ b/0025-Use-shared-static-version-of-PostgreSQL.patch @@ -1,4 +1,4 @@ -From 96cc0debf89c8c17413cc0d28a57f962ce20653e Mon Sep 17 00:00:00 2001 +From 81894b88cdd2e46c211da26ec94e43b1e34de7f8 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 18:58:25 +0200 Subject: [PATCH 25/26] Use shared/static version of PostgreSQL @@ -8,7 +8,7 @@ Subject: [PATCH 25/26] Use shared/static version of PostgreSQL 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/config.tests/unix/psql/psql.pro b/config.tests/unix/psql/psql.pro -index d0f3761..58f1638 100644 +index d0f3761bfb..58f163843e 100644 --- a/config.tests/unix/psql/psql.pro +++ b/config.tests/unix/psql/psql.pro @@ -1,3 +1,7 @@ @@ -21,5 +21,5 @@ index d0f3761..58f1638 100644 + LIBS *= -lpq +} -- -2.10.2 +2.11.0 diff --git a/0026-Fix-qt5_wrap_ui-macro.patch b/0026-Fix-qt5_wrap_ui-macro.patch index 2773f0a33081..858792f5d41b 100644 --- a/0026-Fix-qt5_wrap_ui-macro.patch +++ b/0026-Fix-qt5_wrap_ui-macro.patch @@ -1,4 +1,4 @@ -From 7e20d462a43054bc5ff6776454277344436df710 Mon Sep 17 00:00:00 2001 +From 681c27e949a6c2469c4bbd3ea403432b2b6a301d Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 4 Dec 2016 20:35:47 +0100 Subject: [PATCH 26/26] Fix qt5_wrap_ui() macro @@ -9,7 +9,7 @@ See https://github.com/Martchus/PKGBUILDs/issues/11 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/widgets/Qt5WidgetsMacros.cmake b/src/widgets/Qt5WidgetsMacros.cmake -index f5e7b7f..18d120f 100644 +index f5e7b7f050..18d120f0c7 100644 --- a/src/widgets/Qt5WidgetsMacros.cmake +++ b/src/widgets/Qt5WidgetsMacros.cmake @@ -55,8 +55,9 @@ function(QT5_WRAP_UI outfiles ) @@ -24,5 +24,5 @@ index f5e7b7f..18d120f 100644 MAIN_DEPENDENCY ${infile} VERBATIM) list(APPEND ${outfiles} ${outfile}) -- -2.10.2 +2.11.0 @@ -77,8 +77,8 @@ isNoOpenGL() { } pkgname=mingw-w64-qt5-base-angle -pkgver=5.7.0 -pkgrel=10 +pkgver=5.7.1 +pkgrel=1 pkgdesc='A cross-platform application and UI framework (mingw-w64)' # The static variant doesn't contain any executables which need to be executed on the build machine isStatic && arch=('any') || arch=('i686' 'x86_64') @@ -144,58 +144,58 @@ source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/sub '0024-Use-shared-static-version-of-MariaDB.patch' '0025-Use-shared-static-version-of-PostgreSQL.patch' '0026-Fix-qt5_wrap_ui-macro.patch') -md5sums=('184f9460b40752d71b15b827260580c2' - '79a566c874a2b15acdd5ada456ff7781' - '16d668d460645879f403f9f1b9cf5539' - '72dd9f8e572c43e4f490b9a16a799d0f' - '582aa4fabd82de714445f1f419c9143a' - 'a676f9447cdba7f16feead657c0f3720' - '5b06de1d87761baaf8cddc3263702b83' - 'eeb4ee5384c54f4c7802506b9d23523c' - 'b0629fce5041c51c7244aa0e18630e4e' - '62573876286a3f1cac8c83c605a055ec' - '201a0dde87d2946bff414e04110a02bb' - '08be6b0dfd0149d78124711eeb369a46' - 'a762027682537f1e5d263f93a5e18c12' - '352fb81ecc6bf30bbeee2891a34647ba' - '0aec926df4eb78325a014660b834818e' - '19a16543aceb3a621093c00305403bbd' - 'ec16616371b3a323f8eabdf3605ac9ef' - '48196a5b3a0a713877e28df51e9f2465' - 'd9a63b6f703778e51fd373732b5af31f' - '5a6513ca11c2e386f34d2f133bb2256a' - '990f642145f2b6a64ba3fc41c84f0e57' - 'fa8709ba448f1537542b263bdd94ddbc' - 'e0ebb9a1cdf23a0ee392491db42ddd75' - '0ad6e88622026d6252bedde357900452' - 'f2948d806f16fbf263d733e8824cf4b8' - '02fc0f80007bba9137854439eb3d7513' - '79a566c874a2b15acdd5ada456ff7781' - '16d668d460645879f403f9f1b9cf5539' - '72dd9f8e572c43e4f490b9a16a799d0f' - '582aa4fabd82de714445f1f419c9143a' - 'a676f9447cdba7f16feead657c0f3720' - '5b06de1d87761baaf8cddc3263702b83' - 'eeb4ee5384c54f4c7802506b9d23523c' - 'b0629fce5041c51c7244aa0e18630e4e' - '62573876286a3f1cac8c83c605a055ec' - '201a0dde87d2946bff414e04110a02bb' - '08be6b0dfd0149d78124711eeb369a46' - 'a762027682537f1e5d263f93a5e18c12' - '352fb81ecc6bf30bbeee2891a34647ba' - '0aec926df4eb78325a014660b834818e' - '19a16543aceb3a621093c00305403bbd' - 'ec16616371b3a323f8eabdf3605ac9ef' - '48196a5b3a0a713877e28df51e9f2465' - 'd9a63b6f703778e51fd373732b5af31f' - '5a6513ca11c2e386f34d2f133bb2256a' - '990f642145f2b6a64ba3fc41c84f0e57' - 'fa8709ba448f1537542b263bdd94ddbc' - 'e0ebb9a1cdf23a0ee392491db42ddd75' - '0ad6e88622026d6252bedde357900452' - 'f2948d806f16fbf263d733e8824cf4b8' - '02fc0f80007bba9137854439eb3d7513' - '645037becd8fdd266ac8e7cacdde85ab') +md5sums=('f0809befe04160fbb73bbf38a06a2073' + '14ea9353fcc9234a9c7cb98ef14050a3' + '34c9df86a43132f58b18bd3061305b36' + '94f3ec6cdb456cc9b0535bd549cf2859' + 'eb118e7a01ff8e39f608e715758ac3dd' + 'c5184ae70974aaeaf5e1996dc7af6ec0' + '917a3439afa97afab1b0b722082d640b' + 'bea9eb1a5be8e5e1ee2592007b112fe5' + '281a81a7c32cc2f4bfeb83f5bea29d59' + 'ec262ef6bcf2f12832f83aad30d2f728' + '10c24aec6ca3743d01ca7e0f2704b024' + 'bfa3574a0d44f831e412befba235b2ca' + '366b8209ba35b00e2fe4ddcf448ed015' + '0c17f618cbee73a49d7829da7c816cd7' + '11f26a2237acd5e78d5a3db4de2d6d90' + '632765f81a4b72b540376255a10b4c2e' + '1f57d40dc492822f2e931bdd3a0b7435' + '758afe3653d7ce126ebae03e6a8f222f' + 'd616bd0fd1ac1ae0d749f93fcba0aeb1' + '6847671b013c249aaa2dd7d7e646e4e6' + '9e3c6cee969a55b15558f6a46f7aad20' + '7bf4cf112551bea4c4d3dd91ed7e1461' + '97ece0bb54a249aa0a1fc662eedc93de' + '4bdbf113772fdfe4cc6da53c866216b2' + '399555789f729477d65861179efaf9e3' + '295d83b50278474289727dc49a688e95' + '14ea9353fcc9234a9c7cb98ef14050a3' + '34c9df86a43132f58b18bd3061305b36' + '94f3ec6cdb456cc9b0535bd549cf2859' + 'eb118e7a01ff8e39f608e715758ac3dd' + 'c5184ae70974aaeaf5e1996dc7af6ec0' + '917a3439afa97afab1b0b722082d640b' + 'bea9eb1a5be8e5e1ee2592007b112fe5' + '281a81a7c32cc2f4bfeb83f5bea29d59' + 'ec262ef6bcf2f12832f83aad30d2f728' + '10c24aec6ca3743d01ca7e0f2704b024' + 'bfa3574a0d44f831e412befba235b2ca' + '366b8209ba35b00e2fe4ddcf448ed015' + '0c17f618cbee73a49d7829da7c816cd7' + '11f26a2237acd5e78d5a3db4de2d6d90' + '632765f81a4b72b540376255a10b4c2e' + '1f57d40dc492822f2e931bdd3a0b7435' + '758afe3653d7ce126ebae03e6a8f222f' + 'd616bd0fd1ac1ae0d749f93fcba0aeb1' + '6847671b013c249aaa2dd7d7e646e4e6' + '9e3c6cee969a55b15558f6a46f7aad20' + '7bf4cf112551bea4c4d3dd91ed7e1461' + '97ece0bb54a249aa0a1fc662eedc93de' + '4bdbf113772fdfe4cc6da53c866216b2' + '399555789f729477d65861179efaf9e3' + '295d83b50278474289727dc49a688e95' + '541413adc439b0650ad236f13c47e28e') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' #_architectures='x86_64-w64-mingw32 i686-w64-mingw32' @@ -380,7 +380,9 @@ package() { rm -f "${pkgdir}/usr/${_arch}/lib/"{lib,}qt5main* \ "${pkgdir}/usr/${_arch}/lib/"{lib,}Qt5OpenGLExtensions* \ "${pkgdir}/usr/${_arch}/lib/"{lib,}Qt5PlatformSupport* \ - "${pkgdir}/usr/${_arch}/lib/"libQt5Bootstrap* + "${pkgdir}/usr/${_arch}/lib/"libQt5Bootstrap* \ + "${pkgdir}/usr/${_arch}/lib/"libqtpng.a \ + "${pkgdir}/usr/${_arch}/lib/"qtpng.static.prl # Also ensure config files don't conflict with shared version pushd "${pkgdir}/usr/${_arch}/lib/cmake" |