diff options
| author | Martchus | 2017-06-08 21:34:11 +0200 |
|---|---|---|
| committer | Martchus | 2017-06-08 21:34:11 +0200 |
| commit | 846161610d6712abc5d514fd3bf6ee1cc86223cf (patch) | |
| tree | ffe54aee49a30a2cb0ad3ba6f8941703ab29b07c | |
| parent | 65a7f9d368e548df5e089e340bd4f404cdd2430b (diff) | |
| download | aur-846161610d6712abc5d514fd3bf6ee1cc86223cf.tar.gz | |
Update to 5.9.0
36 files changed, 574 insertions, 398 deletions
@@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Wed Mar 22 23:14:35 UTC 2017 +# Thu Jun 8 19:34:10 UTC 2017 pkgbase = mingw-w64-qt5-base-dynamic pkgdesc = A cross-platform application and UI framework (mingw-w64) - pkgver = 5.8.0 - pkgrel = 2 + pkgver = 5.9.0 + pkgrel = 1 url = https://www.qt.io/ arch = i686 arch = x86_64 @@ -22,10 +22,10 @@ pkgbase = mingw-w64-qt5-base-dynamic depends = mingw-w64-libjpeg-turbo depends = mingw-w64-sqlite depends = mingw-w64-libpng - depends = mingw-w64-openssl + depends = mingw-w64-openssl-1.0 depends = mingw-w64-dbus depends = mingw-w64-harfbuzz - depends = mingw-w64-pcre + depends = mingw-w64-pcre2 optdepends = mingw-w64-postgresql: PostgreSQL support optdepends = mingw-w64-mariadb-connector-c: MySQL support optdepends = mingw-w64-angleproject: use ANGLE instead of native OpenGL @@ -39,7 +39,7 @@ pkgbase = mingw-w64-qt5-base-dynamic options = !buildflags options = staticlibs options = !emptydirs - source = https://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qtbase-opensource-src-5.8.0.tar.xz + source = https://download.qt.io/official_releases/qt/5.9/5.9.0/submodules/qtbase-opensource-src-5.9.0.tar.xz source = 0001-Add-profile-for-cross-compilation-with-mingw-w64.patch source = 0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch source = 0003-Use-external-ANGLE-library.patch @@ -49,58 +49,60 @@ pkgbase = mingw-w64-qt5-base-dynamic source = 0007-Prevent-debug-library-names-in-pkg-config-files.patch source = 0008-Fix-linking-against-shared-static-libpng.patch source = 0009-Fix-linking-against-static-D-Bus.patch - source = 0010-Fix-linking-against-static-freetype2.patch - source = 0011-Fix-linking-against-static-harfbuzz.patch - source = 0012-Fix-linking-against-static-pcre.patch - source = 0013-Fix-linking-against-shared-static-MariaDB.patch - source = 0014-Fix-linking-against-shared-static-PostgreSQL.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-Fix-qt5_wrap_ui-macro.patch - source = 0025-Ignore-errors-about-missing-feature-static.patch - source = 0026-Enable-and-fix-use-of-iconv.patch - source = 0027-Ignore-failing-pkg-config-test.patch - source = 0028-Include-uiviewsettingsinterop.h-correctly.patch - source = 0029-Hardcode-linker-flags-for-libqwindows.dll.patch + source = 0010-Don-t-try-to-use-debug-version-of-D-Bus-library.patch + source = 0011-Fix-linking-against-static-freetype2.patch + source = 0012-Fix-linking-against-static-harfbuzz.patch + source = 0013-Fix-linking-against-static-pcre.patch + source = 0014-Fix-linking-against-shared-static-MariaDB.patch + source = 0015-Fix-linking-against-shared-static-PostgreSQL.patch + source = 0016-Rename-qtmain-to-qt5main.patch + source = 0017-Build-dynamic-host-libraries.patch + source = 0018-Enable-rpath-for-build-tools.patch + source = 0019-Use-system-zlib-for-build-tools.patch + source = 0020-Disable-determing-default-include-and-lib-dirs-at-qm.patch + source = 0021-Use-.dll.a-as-import-lib-extension.patch + source = 0022-Merge-shared-and-static-library-trees.patch + source = 0023-Allow-usage-of-static-version-with-CMake.patch + source = 0024-Adjust-linker-flags-for-static-build-with-cmake-ming.patch + source = 0025-Use-correct-pkg-config-static-flag.patch + source = 0026-Fix-macro-invoking-moc-rcc-and-uic.patch + source = 0027-Ignore-errors-about-missing-feature-static.patch + source = 0028-Enable-and-fix-use-of-iconv.patch + source = 0029-Ignore-failing-pkg-config-test.patch source = 0030-Prevent-qmake-from-messing-static-lib-dependencies.patch - md5sums = 6e1f7f6fb6333eb66e563b175c4e87e9 - md5sums = 59cabe2d0b5646342c6cec93f7ebc074 - md5sums = 9d45eaf425961899c40c76dbd1151204 - md5sums = 60fc8de6d43685fc158ff705891b12ff - md5sums = f8da92ad83e2d0e0ebc6ead7d49dcd62 - md5sums = f4d2daf0e914d7df8ff9ea0db778164c - md5sums = d198fc82d361e5a52f066e20d0f2ac1a - md5sums = b8a9042191146eee8898c19090e6dd79 - md5sums = bcf6b7aa10e04c1093c801d2f2b5722b - md5sums = 50ef8614cb99b72b1e5cd5cb790b089e - md5sums = 381c9f451602c72c9a11512b41a7e725 - md5sums = 6f2986a143d4d3fcbbf5ec6149742896 - md5sums = 398499d79aeb1ccbdc02c4e604035ee9 - md5sums = 94c63b114ee93f3d9892646090dceea2 - md5sums = 01c49b3786ce8852607aeb40482c56ab - md5sums = 8d43ede146c545826b8667f4ebe1a92c - md5sums = 47e13ec0622a3af2d89768cb6c228774 - md5sums = e08a00d918adad4734e56be6f03ba9bc - md5sums = 4808132cbdbc320d2e0dd26033fa245f - md5sums = 92afca193efe77c51fe33c209047d6c5 - md5sums = 75ef72598c4274447b5668c791d019e4 - md5sums = 8eb99eec735bc566847ac692bec14ce6 - md5sums = b22a8b34e4e403256fd9cfeba5fff508 - md5sums = 26c08be34065619f12a15b485c8c2ea3 - md5sums = 360f6a8dae753f3649bb7bea1ca9170f - md5sums = ac4b80a15f9004a8f668b80fb475ddd1 - md5sums = ccec8075e73f445fcf4c600b4b990fee - md5sums = 2a7a504e2b4572bef11855c8a0b2863a - md5sums = 963f27d8f720a91b2345cda9fe0be8cd - md5sums = a12368572b27f714babb720258f7b81e - md5sums = 3aa314937307e172c30258a82dd4ed67 + source = 0031-Hardcode-linker-flags-for-platform-plugins.patch + sha256sums = 267eb2af1a203c087f2113f43b08014d0e2d2cb269295b8602d869a2fad5296c + sha256sums = b4406bba39ee7c8cf74c3b8a98b936b46772ca1798ef6884b7b1574ece80fbdc + sha256sums = 86cf470f1694abf6973f7b0f8e6cb75dd8a58e9335bab075b25229d26064adab + sha256sums = 670b6cd7a6ee49f12ccf4121e997055daec887d080baf0269793b1d0243d1d89 + sha256sums = 878c08a1e9d0c8d639ddbdbc944ac8647ff204e9f078ddd9337737b2b929c2ed + sha256sums = 38533dba16df99074e8c3f5d52bc15fabdbaffe0a56dbed79683c47f08342587 + sha256sums = 5ef3a569f4c53e848750ff655342e92a103abe78495905a5ef47afea9da8d1fb + sha256sums = d21ebc9465a19e01912ebccb365b4f7ecfd3a95787c1de2640f29bdbc161983c + sha256sums = 0622a2e606d9edbea23d3a5724ea9d4ed3958e60296b85134176c3980d590a41 + sha256sums = 90f1347e5c41b9e447c0339715d19e0434a0b58c36fd8405e850190fe17369dc + sha256sums = 6b6ebfdf598658172680e4e83d2c3de24dcbc93233b0f48d5ccbf760d8f59a5c + sha256sums = 11ce05f79174440406d84b38023d81c1fa87034119360fa2f0bd3887429fa694 + sha256sums = c30c558ea413c986aec2ffe86e34dd8e99f96cbc615e3963f711ec1628888114 + sha256sums = b9fbfc213089e3b44ed888f4e628030e78dd84c8030ba7a2a9f79fbf31312934 + sha256sums = 94ebedf699ebc0a5c6fed307eecd3dfabf9f864c696f3cf17bd8462789c1fae2 + sha256sums = df05b0f65dcafede1f83ce190895e6c6f4a22feecb1c5b1a0ba03f4948e56220 + sha256sums = 0acae3adb542d6ea0b405a947adf087826b4971df133b984d9166a9872e5cc98 + sha256sums = bb825226ca1e97cb49c3ac3a0c03a7db9f3e1eca632628d344201fcf9816376d + sha256sums = e74fb8219bf599fbe5fbd1b08ff89d717089f1fa4d9e488a60e6097b212b7391 + sha256sums = cf3f90b69feb98e42ede770828db4538a3dd31dd02b2b15f55ea1743db5868ad + sha256sums = 813cd1c22e3211133337231e1df754b5560159eecf1cf3eef0408d335e186190 + sha256sums = a0feb7b5a9747d6a88058360fc34f8ac8fb3cdeb2b343a5a2b28a88fdabb45b3 + sha256sums = 82f8f1eba6ac63c9a8749e20eb57fad80e92ddd5a58912a60a8c2fad9e83d6eb + sha256sums = 34652aec17d7511815db59b438b0597e52b7f43c19d068e7e417325897a72254 + sha256sums = dcfe2103ace81898960316dd691fae38d05b2b6a79dc0ae0f245ae402f1101a8 + sha256sums = 0682dcc62b44717fa850700cec183cd856ce7335f26884ab15d4d0e7d3543bfe + sha256sums = cecf5ff2916d95ffdbcf60ba3e18297a6107e17e9766a5e4d8b9ae748d99ba52 + sha256sums = 79bc920bb539fc68001b5def07eea3e45eb3d2c6aa3f2a949823236adf8e4633 + sha256sums = 80757f614fe02bfb85d00292d4f84c9f2ab2c39a512c21e956df135f3fbfdd81 + sha256sums = cc46ffc3a2183539aba923fb256045464eaae37a666034172138f4689a5c9bd3 + sha256sums = f0e63e022d1e52b82a7622828b568c57d1422f9726e116902cd2be81fec45da4 + sha256sums = 28b11e63f570891212073b3739a20489304d3c7205ae38471cbd6b15c651fabc pkgname = mingw-w64-qt5-base-dynamic diff --git a/0001-Add-profile-for-cross-compilation-with-mingw-w64.patch b/0001-Add-profile-for-cross-compilation-with-mingw-w64.patch index 70903bda8285..7de494e8ab7b 100644 --- a/0001-Add-profile-for-cross-compilation-with-mingw-w64.patch +++ b/0001-Add-profile-for-cross-compilation-with-mingw-w64.patch @@ -1,7 +1,7 @@ -From eb3e8004e4cb74f021294e1e57dd268af001980e Mon Sep 17 00:00:00 2001 +From 9e46af21edffe2c27d2239ae2133c5a442cd7b43 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Fri, 3 Feb 2017 18:30:51 +0100 -Subject: [PATCH 01/30] Add profile for cross compilation with mingw-w64 +Subject: [PATCH 01/31] Add profile for cross compilation with mingw-w64 --- mkspecs/mingw-w64-g++/qmake.conf | 125 +++++++++++++++++++++++++++ @@ -12,7 +12,7 @@ Subject: [PATCH 01/30] Add profile for cross compilation with mingw-w64 diff --git a/mkspecs/mingw-w64-g++/qmake.conf b/mkspecs/mingw-w64-g++/qmake.conf new file mode 100644 -index 0000000000..6f21ae75d5 +index 0000000000..3908c1a7e2 --- /dev/null +++ b/mkspecs/mingw-w64-g++/qmake.conf @@ -0,0 +1,125 @@ @@ -128,7 +128,7 @@ index 0000000000..6f21ae75d5 +QMAKE_PKG_CONFIG = $${CROSS_COMPILE}pkg-config + +QMAKE_LIBS = -+QMAKE_LIBS_CORE = -lole32 -luuid -lwinmm -lws2_32 -ladvapi32 -lshell32 -luser32 -lkernel32 -lz -lpcre16 ++QMAKE_LIBS_CORE = -lz -lpcre2-16 -lversion -lole32 -luuid -lwinmm -lws2_32 -ladvapi32 -lshell32 -luser32 -lkernel32 +QMAKE_LIBS_GUI = -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lws2_32 -lole32 -luuid -luser32 -ladvapi32 -ljpeg -lpng \ + $$system($${QMAKE_PKG_CONFIG} --static --libs harfbuzz) \ + $$system($${QMAKE_PKG_CONFIG} --static --libs freetype2) @@ -303,5 +303,5 @@ index 0000000000..c5a70b1445 + +#endif // QPLATFORMDEFS_H -- -2.12.1 +2.13.0 diff --git a/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch b/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch index 07436f981c17..36cb845b6384 100644 --- a/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch +++ b/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch @@ -1,7 +1,7 @@ -From 0223c4145ff17cb79e720ed12b24819262aa5353 Mon Sep 17 00:00:00 2001 +From b8a768c9d6b67c09515e927344dc750880fe5150 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 13:36:53 +0200 -Subject: [PATCH 02/30] Ensure GLdouble is defined when using dynamic OpenGL +Subject: [PATCH 02/31] Ensure GLdouble is defined when using dynamic OpenGL FIXME: Not sure whether this is still required --- @@ -9,7 +9,7 @@ FIXME: Not sure whether this is still required 1 file changed, 2 deletions(-) diff --git a/src/gui/opengl/qopenglfunctions.h b/src/gui/opengl/qopenglfunctions.h -index aad48571b3..46f44d8b91 100644 +index 0a5de2c9af..35798a2a28 100644 --- a/src/gui/opengl/qopenglfunctions.h +++ b/src/gui/opengl/qopenglfunctions.h @@ -56,9 +56,7 @@ @@ -23,5 +23,5 @@ index aad48571b3..46f44d8b91 100644 #ifdef Q_ENABLE_OPENGL_FUNCTIONS_DEBUG #include <stdio.h> -- -2.12.1 +2.13.0 diff --git a/0003-Use-external-ANGLE-library.patch b/0003-Use-external-ANGLE-library.patch index 396b5431c77f..6f3508110992 100644 --- a/0003-Use-external-ANGLE-library.patch +++ b/0003-Use-external-ANGLE-library.patch @@ -1,7 +1,7 @@ -From 1ffc87d8805a92fb7666084c656bac46cd276599 Mon Sep 17 00:00:00 2001 +From 7a6384756287b07c0e3a6e18ed07414a7672feee Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 13:41:38 +0200 -Subject: [PATCH 03/30] Use external ANGLE library +Subject: [PATCH 03/31] Use external ANGLE library --- src/gui/Qt5GuiConfigExtras.cmake.in | 4 ++-- @@ -28,7 +28,7 @@ index 07869efd7d..2e32911a64 100644 _qt5_Gui_check_file_exists(${Qt5Gui_EGL_INCLUDE_DIRS}) diff --git a/src/gui/gui.pro b/src/gui/gui.pro -index 5f8cbe2cbe..0ebf6b7281 100644 +index cfdb5e889b..4afb45e592 100644 --- a/src/gui/gui.pro +++ b/src/gui/gui.pro @@ -18,12 +18,6 @@ MODULE_PLUGIN_TYPES = \ @@ -66,11 +66,11 @@ index 718a886809..89965709ed 100644 HEADERS += qgl.h \ qgl_p.h \ diff --git a/src/plugins/platforms/windows/windows.pri b/src/plugins/platforms/windows/windows.pri -index 20e0b81da9..b55847fc69 100644 +index 73677311f5..05a1dc2e6e 100644 --- a/src/plugins/platforms/windows/windows.pri +++ b/src/plugins/platforms/windows/windows.pri -@@ -2,6 +2,7 @@ - LIBS += -lole32 -luser32 -lwinspool -limm32 -lwinmm -loleaut32 +@@ -4,6 +4,7 @@ LIBS += -lole32 -luser32 -lwinspool -limm32 -lwinmm -loleaut32 + QT_FOR_CONFIG += gui qtConfig(opengl):!qtConfig(opengles2):!qtConfig(dynamicgl): LIBS *= -lopengl32 +qtConfig(angle):LIBS += -lGLESv2 -lEGL @@ -78,10 +78,10 @@ index 20e0b81da9..b55847fc69 100644 mingw: LIBS *= -luuid # For the dialog helpers: diff --git a/src/src.pro b/src/src.pro -index 90d7e2b76c..92e89ea39f 100644 +index 43fc06f2e5..4188d4ea6b 100644 --- a/src/src.pro +++ b/src/src.pro -@@ -160,10 +160,6 @@ qtConfig(gui) { +@@ -175,10 +175,6 @@ qtConfig(gui) { SUBDIRS += src_3rdparty_harfbuzzng src_gui.depends += src_3rdparty_harfbuzzng } @@ -93,5 +93,5 @@ index 90d7e2b76c..92e89ea39f 100644 SUBDIRS += src_3rdparty_libpng src_3rdparty_freetype.depends += src_3rdparty_libpng -- -2.12.1 +2.13.0 diff --git a/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch b/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch index 9508bd6c0f6d..763a40571bba 100644 --- a/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch +++ b/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch @@ -1,7 +1,7 @@ -From 447092efb62e94bc69b3899093e1ee10af18d81b Mon Sep 17 00:00:00 2001 +From c815500b1cbe99d31d10fa416d391ebe9f6db56e Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 13:48:51 +0200 -Subject: [PATCH 04/30] Fix too many sections assemler error in OpenGL factory +Subject: [PATCH 04/31] Fix too many sections assemler error in OpenGL factory On x86_64 qopenglversionfunctionsfactory.o exceeds the limit of 32768 sections. @@ -11,7 +11,7 @@ Hence the assembler option -mbig-obj is required. 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/gui/opengl/opengl.pri b/src/gui/opengl/opengl.pri -index 1a1022b3a7..792bdf9e7a 100644 +index 4c778b184e..1dd1755d7f 100644 --- a/src/gui/opengl/opengl.pri +++ b/src/gui/opengl/opengl.pri @@ -3,7 +3,8 @@ @@ -25,5 +25,5 @@ index 1a1022b3a7..792bdf9e7a 100644 HEADERS += opengl/qopengl.h \ opengl/qopengl_p.h \ -- -2.12.1 +2.13.0 diff --git a/0005-Make-sure-.pc-files-are-installed-correctly.patch b/0005-Make-sure-.pc-files-are-installed-correctly.patch index 57bad2288b9a..ae67fc62c39f 100644 --- a/0005-Make-sure-.pc-files-are-installed-correctly.patch +++ b/0005-Make-sure-.pc-files-are-installed-correctly.patch @@ -1,7 +1,7 @@ -From 74be1cdb27c34b149b4b227a8c3107ca49cc254a Mon Sep 17 00:00:00 2001 +From ca3aca842c36f8d69320f5629071d29563b91081 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 13:54:12 +0200 -Subject: [PATCH 05/30] Make sure *.pc files are installed correctly +Subject: [PATCH 05/31] Make sure *.pc files are installed correctly --- qmake/generators/makefile.cpp | 8 ++++++-- @@ -10,10 +10,10 @@ Subject: [PATCH 05/30] 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 4450e619b9..182fe79238 100644 +index c76708285a..fb886e00d2 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp -@@ -3150,7 +3150,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const +@@ -3152,7 +3152,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const } QString @@ -22,7 +22,7 @@ index 4450e619b9..182fe79238 100644 { QString ret = project->first("QMAKE_PKGCONFIG_FILE").toQString(); if (ret.isEmpty()) { -@@ -3175,7 +3175,11 @@ MakefileGenerator::pkgConfigFileName(bool fixify) +@@ -3177,7 +3177,11 @@ MakefileGenerator::pkgConfigFileName(bool fixify) if(fixify) { if(QDir::isRelativePath(ret) && !project->isEmpty("DESTDIR")) ret.prepend(project->first("DESTDIR").toQString()); @@ -36,7 +36,7 @@ index 4450e619b9..182fe79238 100644 return ret; } diff --git a/qmake/generators/makefile.h b/qmake/generators/makefile.h -index 86fec748eb..cbe23d7e3a 100644 +index 4ced3bd121..f7cc3b9e9b 100644 --- a/qmake/generators/makefile.h +++ b/qmake/generators/makefile.h @@ -89,7 +89,7 @@ protected: @@ -49,10 +49,10 @@ index 86fec748eb..cbe23d7e3a 100644 void writePkgConfigFile(); // for pkg-config diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp -index 3c029c8004..caa000ea53 100644 +index 2013698c99..b6b8dda397 100644 --- a/qmake/generators/win32/winmakefile.cpp +++ b/qmake/generators/win32/winmakefile.cpp -@@ -721,7 +721,7 @@ QString Win32MakefileGenerator::defaultInstall(const QString &t) +@@ -724,7 +724,7 @@ QString Win32MakefileGenerator::defaultInstall(const QString &t) } if(!ret.isEmpty()) ret += "\n\t"; @@ -62,5 +62,5 @@ index 3c029c8004..caa000ea53 100644 uninst.append("\n\t"); uninst.append("-$(DEL_FILE) " + escapeFilePath(dst_pc)); -- -2.12.1 +2.13.0 diff --git a/0006-Don-t-add-resource-files-to-LIBS-parameter.patch b/0006-Don-t-add-resource-files-to-LIBS-parameter.patch index 9da2a9dfc3ad..70c17f763d0e 100644 --- a/0006-Don-t-add-resource-files-to-LIBS-parameter.patch +++ b/0006-Don-t-add-resource-files-to-LIBS-parameter.patch @@ -1,7 +1,7 @@ -From fee4dff74c2483c2f4a4d7299e062c366431fc53 Mon Sep 17 00:00:00 2001 +From a0b4f7192c90214a2950382679b259e143dfc4bc Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 13:58:28 +0200 -Subject: [PATCH 06/30] Don't add resource files to LIBS parameter +Subject: [PATCH 06/31] Don't add resource files to LIBS parameter Solves an issue where the generated pkg-config files contained invalid Libs.private references @@ -24,5 +24,5 @@ index 8d5a9a7d0f..d2cf8d9afc 100644 if (project->isActiveConfig("dll")) { QString destDir = ""; -- -2.12.1 +2.13.0 diff --git a/0007-Prevent-debug-library-names-in-pkg-config-files.patch b/0007-Prevent-debug-library-names-in-pkg-config-files.patch index 2b360f341440..a4fa0df0a988 100644 --- a/0007-Prevent-debug-library-names-in-pkg-config-files.patch +++ b/0007-Prevent-debug-library-names-in-pkg-config-files.patch @@ -1,7 +1,7 @@ -From 995313e0795df5500fd84350e80a3f88202b473d Mon Sep 17 00:00:00 2001 +From 6656828260372d7e2e6256fa85e37a830b58260c Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 14:01:14 +0200 -Subject: [PATCH 07/30] Prevent debug library names in pkg-config files +Subject: [PATCH 07/31] Prevent debug library names in pkg-config files qmake generates the pkgconfig .pc files two times, once for the release build and once for the debug build (which we're not actually @@ -15,10 +15,10 @@ 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 182fe79238..a762443fe2 100644 +index fb886e00d2..55e25d596a 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp -@@ -3164,6 +3164,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir) +@@ -3166,6 +3166,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir) if (dot != -1) ret = ret.left(dot); } @@ -29,5 +29,5 @@ index 182fe79238..a762443fe2 100644 QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString(); if(!subdir.isEmpty()) { -- -2.12.1 +2.13.0 diff --git a/0008-Fix-linking-against-shared-static-libpng.patch b/0008-Fix-linking-against-shared-static-libpng.patch index fdc684a5dcad..465da4060937 100644 --- a/0008-Fix-linking-against-shared-static-libpng.patch +++ b/0008-Fix-linking-against-shared-static-libpng.patch @@ -1,26 +1,27 @@ -From f3a39738bcf7560f023bd280017aedaeb756e5c2 Mon Sep 17 00:00:00 2001 +From 4fb07cf7290b97694586f3f30489165f114ca439 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Thu, 26 Jan 2017 17:51:31 +0100 -Subject: [PATCH 08/30] Fix linking against shared/static libpng +Subject: [PATCH 08/31] Fix linking against shared/static libpng +Change-Id: Ic7a0ec9544059b8e647a5d0186f1b88c00911dcf --- src/gui/configure.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/gui/configure.json b/src/gui/configure.json -index 1f5011617c..5006ff5a3a 100644 +index 73e59a7ad9..6dee7d18aa 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json -@@ -161,7 +161,8 @@ +@@ -162,7 +162,8 @@ "sources": [ { "type": "pkgConfig", "args": "libpng" }, { "libs": "-llibpng", "condition": "config.msvc" }, - { "libs": "-lpng", "condition": "!config.msvc" } + { "libs": "-lpng -lz", "condition": "!config.msvc && !features.shared" }, + { "libs": "-lpng", "condition": "!config.msvc && features.shared" } - ] - }, - "mirclient": { + ], + "use": [ + { "lib": "zlib", "condition": "features.system-zlib" } -- -2.12.1 +2.13.0 diff --git a/0009-Fix-linking-against-static-D-Bus.patch b/0009-Fix-linking-against-static-D-Bus.patch index dd755274fc19..ed0ab4f8b162 100644 --- a/0009-Fix-linking-against-static-D-Bus.patch +++ b/0009-Fix-linking-against-static-D-Bus.patch @@ -1,7 +1,7 @@ -From 3379bc4d4d65124ec08aa8dade1b6b2a7b25f61e Mon Sep 17 00:00:00 2001 +From c481c20ed0c454b6e32fd37f6abf99c5bb118a83 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Fri, 3 Feb 2017 19:36:25 +0100 -Subject: [PATCH 09/30] Fix linking against static D-Bus +Subject: [PATCH 09/31] Fix linking against static D-Bus --- config.tests/unix/dbus/dbus.cpp | 4 ++++ @@ -25,10 +25,10 @@ index 295c904400..80d3e9c044 100644 #include <dbus/dbus.h> diff --git a/configure.json b/configure.json -index f774291d22..12714da714 100644 +index 02d5f1a65e..7f005e99f5 100644 --- a/configure.json +++ b/configure.json -@@ -158,12 +158,16 @@ +@@ -159,12 +159,16 @@ "sources": [ { "type": "pkgConfig", "args": "dbus-1 >= 1.2" }, { @@ -62,5 +62,5 @@ index cfc0e12046..65f1397cd6 100644 # include <dbus/dbus.h> #else -- -2.12.1 +2.13.0 diff --git a/0010-Don-t-try-to-use-debug-version-of-D-Bus-library.patch b/0010-Don-t-try-to-use-debug-version-of-D-Bus-library.patch new file mode 100644 index 000000000000..1cca36616b8d --- /dev/null +++ b/0010-Don-t-try-to-use-debug-version-of-D-Bus-library.patch @@ -0,0 +1,29 @@ +From aaf4a548cf6fbe17f0ff11eb370cf7e27ab85221 Mon Sep 17 00:00:00 2001 +From: Martchus <martchus@gmx.net> +Date: Fri, 2 Jun 2017 18:28:10 +0200 +Subject: [PATCH 10/31] Don't try to use debug version of D-Bus library + +Required for a debug build of Qt because mingw-w64-dbus +does not contain debug version + +Change-Id: Ic34e1025fda55f9659e065f5bbe9d51f55420adb +--- + configure.json | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.json b/configure.json +index 7f005e99f5..27b1460f93 100644 +--- a/configure.json ++++ b/configure.json +@@ -165,7 +165,7 @@ + { + "libs": "", + "builds": { +- "debug": "-ldbus-1d", ++ "debug": "-ldbus-1", + "release": "-ldbus-1" + }, + "condition": "config.win32 && features.shared" +-- +2.13.0 + diff --git a/0010-Fix-linking-against-static-freetype2.patch b/0011-Fix-linking-against-static-freetype2.patch index 406fff4bd69e..bfec7c52398b 100644 --- a/0010-Fix-linking-against-static-freetype2.patch +++ b/0011-Fix-linking-against-static-freetype2.patch @@ -1,17 +1,17 @@ -From 24c3bda7db1733545350436d8c2f489be5395650 Mon Sep 17 00:00:00 2001 +From 50aa5c34a1240f86092a90241fba27a332f9003c Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Fri, 3 Feb 2017 20:51:19 +0100 -Subject: [PATCH 10/30] Fix linking against static freetype2 +Subject: [PATCH 11/31] Fix linking against static freetype2 --- src/gui/configure.json | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/gui/configure.json b/src/gui/configure.json -index 5006ff5a3a..6530357be9 100644 +index 6dee7d18aa..d6ed20e5c6 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json -@@ -99,8 +99,11 @@ +@@ -100,8 +100,11 @@ "label": "FreeType", "test": "unix/freetype", "sources": [ @@ -26,5 +26,5 @@ index 5006ff5a3a..6530357be9 100644 }, "fontconfig": { -- -2.12.1 +2.13.0 diff --git a/0011-Fix-linking-against-static-harfbuzz.patch b/0012-Fix-linking-against-static-harfbuzz.patch index a4abc6062191..cab1b3067ec0 100644 --- a/0011-Fix-linking-against-static-harfbuzz.patch +++ b/0012-Fix-linking-against-static-harfbuzz.patch @@ -1,17 +1,17 @@ -From 52c34159dec8c829d1f2928d2c9a56bb7299fbff Mon Sep 17 00:00:00 2001 +From 9bea663dc73c714d606f5acc65a8f84129f1428e Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 14:22:56 +0200 -Subject: [PATCH 11/30] Fix linking against static harfbuzz +Subject: [PATCH 12/31] Fix linking against static harfbuzz --- src/gui/configure.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/gui/configure.json b/src/gui/configure.json -index 6530357be9..c5b9b1542a 100644 +index d6ed20e5c6..8937d38f63 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json -@@ -125,7 +125,11 @@ +@@ -126,7 +126,11 @@ "label": "HarfBuzz", "test": "unix/harfbuzz", "sources": [ @@ -25,5 +25,5 @@ index 6530357be9..c5b9b1542a 100644 }, "imf": { -- -2.12.1 +2.13.0 diff --git a/0012-Fix-linking-against-static-pcre.patch b/0013-Fix-linking-against-static-pcre.patch index d70a5d04dd15..4c4997708c13 100644 --- a/0012-Fix-linking-against-static-pcre.patch +++ b/0013-Fix-linking-against-static-pcre.patch @@ -1,27 +1,28 @@ -From e2c35b81ed48f46c2260ad9e59ff7f50b073e9d4 Mon Sep 17 00:00:00 2001 +From 6db4ce18fb06d080cd2384f1c4a8a2197a8b5434 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 14:24:01 +0200 -Subject: [PATCH 12/30] Fix linking against static pcre +Subject: [PATCH 13/31] Fix linking against static pcre +Change-Id: I3225c6e82dc4d17aef37d4289c16eb7a5ea3c5a1 --- src/corelib/tools/qregularexpression.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/corelib/tools/qregularexpression.cpp b/src/corelib/tools/qregularexpression.cpp -index 4a30daa72c..3d7c811124 100644 +index 88b696f53a..afe444027e 100644 --- a/src/corelib/tools/qregularexpression.cpp +++ b/src/corelib/tools/qregularexpression.cpp -@@ -54,6 +54,10 @@ - #include <QtCore/qatomic.h> +@@ -55,6 +55,10 @@ #include <QtCore/qdatastream.h> + #define PCRE2_CODE_UNIT_WIDTH 16 +#ifdef QT_STATIC +#define PCRE_STATIC ++#define PCRE2_STATIC +#endif -+ - #include <pcre.h> - QT_BEGIN_NAMESPACE + #include <pcre2.h> + -- -2.12.1 +2.13.0 diff --git a/0013-Fix-linking-against-shared-static-MariaDB.patch b/0014-Fix-linking-against-shared-static-MariaDB.patch index ebeac8642293..3bfd5ad64fe1 100644 --- a/0013-Fix-linking-against-shared-static-MariaDB.patch +++ b/0014-Fix-linking-against-shared-static-MariaDB.patch @@ -1,26 +1,27 @@ -From 889ea99f62dd010c168cce6b18f0d49fb2a48203 Mon Sep 17 00:00:00 2001 +From ea1df506321d35a9f8a648ea98642b034b7ace48 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 18:56:55 +0200 -Subject: [PATCH 13/30] Fix linking against shared/static MariaDB +Subject: [PATCH 14/31] Fix linking against shared/static MariaDB +Change-Id: I9722c154d845f288a2d4d1ab14a014066b28819b --- src/sql/configure.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/sql/configure.json b/src/sql/configure.json -index 96c82e84f9..fce948026f 100644 +index 49444c7e5f..d162d7bc09 100644 --- a/src/sql/configure.json +++ b/src/sql/configure.json -@@ -58,6 +58,9 @@ +@@ -57,6 +57,9 @@ "label": "MySQL", "test": "unix/mysql", "sources": [ + { "libs": "-lmariadbclient -lssl -lcrypto -lgdi32 -lws2_32 -lpthread -lz -lm", "condition": "config.win32 && !features.shared" }, + { "libs": "-Wl,-Bdynamic -lmariadb -Wl,-Bstatic", "condition": "config.win32 && !features.shared" }, + { "libs": "-lmariadb", "condition": "config.win32 && features.shared" }, - { "type": "mysqlConfig", "query": "--libs_r" }, - { "type": "mysqlConfig", "query": "--libs" }, - { "libs": "-lmysqlclient_r", "condition": "!config.win32" }, + { "type": "mysqlConfig", "query": "--libs_r", "cleanlibs": true }, + { "type": "mysqlConfig", "query": "--libs", "cleanlibs": true }, + { "type": "mysqlConfig", "query": "--libs_r", "cleanlibs": false }, -- -2.12.1 +2.13.0 diff --git a/0014-Fix-linking-against-shared-static-PostgreSQL.patch b/0015-Fix-linking-against-shared-static-PostgreSQL.patch index 88dba2748e77..f626887c5e4f 100644 --- a/0014-Fix-linking-against-shared-static-PostgreSQL.patch +++ b/0015-Fix-linking-against-shared-static-PostgreSQL.patch @@ -1,17 +1,17 @@ -From 953ca26efa1cb2e86a958c52ce737ada0078e1a3 Mon Sep 17 00:00:00 2001 +From cb4fbac9533065928a6c839da4675c60cb7fe6c0 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 18:58:25 +0200 -Subject: [PATCH 14/30] Fix linking against shared/static PostgreSQL +Subject: [PATCH 15/31] Fix linking against shared/static PostgreSQL --- src/sql/configure.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/sql/configure.json b/src/sql/configure.json -index fce948026f..f560c191fd 100644 +index d162d7bc09..0f86b23f22 100644 --- a/src/sql/configure.json +++ b/src/sql/configure.json -@@ -72,9 +72,10 @@ +@@ -73,9 +73,10 @@ "label": "PostgreSQL", "test": "unix/psql", "sources": [ @@ -25,5 +25,5 @@ index fce948026f..f560c191fd 100644 ] }, -- -2.12.1 +2.13.0 diff --git a/0015-Rename-qtmain-to-qt5main.patch b/0016-Rename-qtmain-to-qt5main.patch index 365bfef9cb37..325b6aa4c867 100644 --- a/0015-Rename-qtmain-to-qt5main.patch +++ b/0016-Rename-qtmain-to-qt5main.patch @@ -1,7 +1,7 @@ -From e81d865a144c5c12ea1b93922a8c27f676aad531 Mon Sep 17 00:00:00 2001 +From f0f623ebdc7e578047212feac62044e08aaf08cb Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 14:25:40 +0200 -Subject: [PATCH 15/30] Rename qtmain to qt5main +Subject: [PATCH 16/31] Rename qtmain to qt5main Prevents conflict with mingw-w64-qt4 package --- @@ -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 1099e14b17..ed9b82fba9 100644 +index bb5083c925..146e83ae67 100644 --- a/mkspecs/features/create_cmake.prf +++ b/mkspecs/features/create_cmake.prf @@ -225,8 +225,8 @@ mac { @@ -52,5 +52,5 @@ index 4140ae48de..9ae73db74b 100644 CONFIG += static -- -2.12.1 +2.13.0 diff --git a/0016-Build-dynamic-host-libraries.patch b/0017-Build-dynamic-host-libraries.patch index 4c21300392b7..a3295074cc84 100644 --- a/0016-Build-dynamic-host-libraries.patch +++ b/0017-Build-dynamic-host-libraries.patch @@ -1,17 +1,20 @@ -From b91bb54e98627bd92ff740ed547d52febb3523d4 Mon Sep 17 00:00:00 2001 +From bd8345de18a4ad2bdcc17710c69c09ad2f81c83f Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 14:27:28 +0200 -Subject: [PATCH 16/30] Build dynamic host libraries +Subject: [PATCH 17/31] Build dynamic host libraries -For better accordance with Arch Linux packaging -standards +This came initially from Fedora, not sure whether +it makes sense to keep it. Regular Arch package +uses static lib as intended by upstream. + +Change-Id: I91a3613955c656fb0d262ccb9b2529350bab032b --- mkspecs/features/qt_module.prf | 2 +- src/tools/bootstrap-dbus/bootstrap-dbus.pro | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf -index 31d628596c..360c99ac73 100644 +index 36f632e8ca..2deec56866 100644 --- a/mkspecs/features/qt_module.prf +++ b/mkspecs/features/qt_module.prf @@ -24,7 +24,7 @@ requires(!$$skip) @@ -34,5 +37,5 @@ index c3ed27d979..30d2114aa1 100644 -INSTALLS = lib +INSTALLS += lib -- -2.12.1 +2.13.0 diff --git a/0017-Enable-rpath-for-build-tools.patch b/0018-Enable-rpath-for-build-tools.patch index 0569dcf602ff..375b390777eb 100644 --- a/0017-Enable-rpath-for-build-tools.patch +++ b/0018-Enable-rpath-for-build-tools.patch @@ -1,11 +1,13 @@ -From 0e79722e8c8162f87b2b765932d3507de2f20a88 Mon Sep 17 00:00:00 2001 +From 905438dce78dd9fb08692b81bfbed4caa30fd23e Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 17:59:27 +0200 -Subject: [PATCH 17/30] Enable rpath for build tools +Subject: [PATCH 18/31] Enable rpath for build tools -- Required because library various tools depend on (libQt5Bootstrap.so) resides +- Required because various tools depend on libQt5Bootstrap.so which resides in folder /usr/${_arch}/lib - Can't use regular lib dir because it would conflict with the native package + +Change-Id: I9808062a66406cdec7446a75150b40b2f30038c7 --- mkspecs/features/qt_app.prf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) @@ -31,5 +33,5 @@ index cb84ae0da8..8d9471ed0a 100644 INSTALLS += target -- -2.12.1 +2.13.0 diff --git a/0018-Use-system-zlib-for-build-tools.patch b/0019-Use-system-zlib-for-build-tools.patch index fa5e84029545..5494df70e64f 100644 --- a/0018-Use-system-zlib-for-build-tools.patch +++ b/0019-Use-system-zlib-for-build-tools.patch @@ -1,17 +1,17 @@ -From 510f64af3d51b140e18cbf026cbfd4990ba973d5 Mon Sep 17 00:00:00 2001 +From aa62a2156a564f8125d3dfdac08124673d123016 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 18:04:42 +0200 -Subject: [PATCH 18/30] Use system zlib for build tools +Subject: [PATCH 19/31] Use system zlib for build tools --- src/tools/bootstrap/bootstrap.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro -index d51f9e98a4..2242b7c4f1 100644 +index 521dd5f0f2..eb8cb4770c 100644 --- a/src/tools/bootstrap/bootstrap.pro +++ b/src/tools/bootstrap/bootstrap.pro -@@ -127,7 +127,7 @@ macx { +@@ -129,7 +129,7 @@ macx { ../../corelib/io/qstandardpaths_win.cpp } @@ -21,5 +21,5 @@ index d51f9e98a4..2242b7c4f1 100644 } else { CONFIG += no_core_dep -- -2.12.1 +2.13.0 diff --git a/0019-Disable-determing-default-include-and-lib-dirs-at-qm.patch b/0020-Disable-determing-default-include-and-lib-dirs-at-qm.patch index 7658ac08ebca..709f57226f81 100644 --- a/0019-Disable-determing-default-include-and-lib-dirs-at-qm.patch +++ b/0020-Disable-determing-default-include-and-lib-dirs-at-qm.patch @@ -1,7 +1,7 @@ -From 12e64d649d5a01b4f878778aa6c183ceb51b28e7 Mon Sep 17 00:00:00 2001 +From 7d3b433e7a103e2f26cf183e1d9910b4d33a97ec Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 18:20:25 +0200 -Subject: [PATCH 19/30] Disable determing default include and lib dirs at qmake +Subject: [PATCH 20/31] Disable determing default include and lib dirs at qmake time when building with mingw-w64 --- @@ -9,10 +9,10 @@ Subject: [PATCH 19/30] Disable determing default include and lib dirs at qmake 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkspecs/features/toolchain.prf b/mkspecs/features/toolchain.prf -index 3f266dd2a4..258d374ee0 100644 +index 46a9c5707a..e82383f9ff 100644 --- a/mkspecs/features/toolchain.prf +++ b/mkspecs/features/toolchain.prf -@@ -13,7 +13,7 @@ isEmpty(QMAKE_DEFAULT_INCDIRS):!host_build { +@@ -21,7 +21,7 @@ isEmpty($${target_prefix}.INCDIRS) { # # Get default include and library paths from compiler # @@ -22,5 +22,5 @@ index 3f266dd2a4..258d374ee0 100644 cmd_prefix = "LC_ALL=C" cmd_suffix = "</dev/null >/dev/null" -- -2.12.1 +2.13.0 diff --git a/0020-Use-.dll.a-as-import-lib-extension.patch b/0021-Use-.dll.a-as-import-lib-extension.patch index 2bd780737818..0ac7e1a2e3d9 100644 --- a/0020-Use-.dll.a-as-import-lib-extension.patch +++ b/0021-Use-.dll.a-as-import-lib-extension.patch @@ -1,7 +1,7 @@ -From cea6744e8b23c780033c4e5a2f51fdb0bd60153c Mon Sep 17 00:00:00 2001 +From 7ccfcf6a364c00f5ec0204b4614ae78dd2296c0e Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 18:26:18 +0200 -Subject: [PATCH 20/30] Use *.dll.a as import lib extension +Subject: [PATCH 21/31] Use *.dll.a as import lib extension The variables used here are provided by mingw-w64 specific mkspec @@ -11,7 +11,7 @@ mingw-w64 specific mkspec 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf -index ed9b82fba9..461a7fdff5 100644 +index 146e83ae67..15fc070008 100644 --- a/mkspecs/features/create_cmake.prf +++ b/mkspecs/features/create_cmake.prf @@ -236,8 +236,9 @@ mac { @@ -27,7 +27,7 @@ index ed9b82fba9..461a7fdff5 100644 } else { CMAKE_WINMAIN_FILE_LOCATION_DEBUG = qtmain$${QT_LIBINFIX}d.lib diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp -index caa000ea53..e6338546bb 100644 +index b6b8dda397..d9388e8518 100644 --- a/qmake/generators/win32/winmakefile.cpp +++ b/qmake/generators/win32/winmakefile.cpp @@ -80,10 +80,14 @@ Win32MakefileGenerator::parseLibFlag(const ProString &flag, ProString *arg) @@ -64,5 +64,5 @@ index caa000ea53..e6338546bb 100644 + project->first("QMAKE_EXTENSION_SHLIB")); project->values("TARGET").first() = project->first("QMAKE_PREFIX_SHLIB") + project->first("TARGET"); -- -2.12.1 +2.13.0 diff --git a/0021-Merge-shared-and-static-library-trees.patch b/0022-Merge-shared-and-static-library-trees.patch index c89977019ea3..4133f4b116e9 100644 --- a/0021-Merge-shared-and-static-library-trees.patch +++ b/0022-Merge-shared-and-static-library-trees.patch @@ -1,9 +1,11 @@ -From 7d8372b48046631d93ea260649d29a023fe29b01 Mon Sep 17 00:00:00 2001 +From 842da3facc0a4e3269d391b57bd1207a796b8628 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 18:45:08 +0200 -Subject: [PATCH 21/30] Merge shared and static library trees +Subject: [PATCH 22/31] Merge shared and static library trees Allow installation of shared and static build in the same prefix + +Change-Id: Ie60ddbe967cb553d5d92d5a706398a1e7385344a --- configure.pri | 7 +++++++ mkspecs/features/default_post.prf | 11 +++++++++++ @@ -13,13 +15,13 @@ Allow installation of shared and static build in the same prefix 5 files changed, 47 insertions(+), 6 deletions(-) diff --git a/configure.pri b/configure.pri -index 19719736a9..0c4b8ebbf8 100644 +index be1b166080..9a5c6cb30d 100644 --- a/configure.pri +++ b/configure.pri -@@ -555,3 +555,10 @@ QMAKE_POST_CONFIGURE += \ +@@ -1181,3 +1181,10 @@ defineTest(createConfigStatus) { - # load and process input from configure.sh/.exe - include($$shadowed($$PWD)/config.tests/configure.cfg) + QMAKE_POST_CONFIGURE += \ + "createConfigStatus()" + +# merge shared and static library trees +contains(CONFIG, static) { @@ -28,7 +30,7 @@ index 19719736a9..0c4b8ebbf8 100644 + QT_CONFIG -= shared +} diff --git a/mkspecs/features/default_post.prf b/mkspecs/features/default_post.prf -index e7e9a5bd87..72305ad9b8 100644 +index d6caf870f7..7bff3d32ba 100644 --- a/mkspecs/features/default_post.prf +++ b/mkspecs/features/default_post.prf @@ -1,5 +1,16 @@ @@ -49,10 +51,10 @@ index e7e9a5bd87..72305ad9b8 100644 !have_target:!force_qt: CONFIG -= qt diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf -index 98f794c485..1799622edd 100644 +index 3ccbbe7061..20b02d5ca9 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf -@@ -152,6 +152,21 @@ for(ever) { +@@ -255,6 +255,21 @@ for(ever) { !isEmpty(MODULE_WINRT_CAPABILITIES_DEVICE): \ WINRT_MANIFEST.capabilities_device_default += $$MODULE_WINRT_CAPABILITIES_DEVICE } @@ -97,10 +99,10 @@ index 51ea3a8321..275e080ae4 100644 QMAKE_EXT_YACC = .y diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp -index a762443fe2..8ac3a0f647 100644 +index 55e25d596a..990d10a286 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp -@@ -3167,6 +3167,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir) +@@ -3169,6 +3169,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir) if (project->isActiveConfig("debug")) { ret += "d"; } @@ -110,7 +112,7 @@ index a762443fe2..8ac3a0f647 100644 ret += Option::pkgcfg_ext; QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString(); if(!subdir.isEmpty()) { -@@ -3340,9 +3343,9 @@ MakefileGenerator::writePkgConfigFile() +@@ -3342,9 +3345,9 @@ MakefileGenerator::writePkgConfigFile() t << endl; // requires @@ -124,5 +126,5 @@ index a762443fe2..8ac3a0f647 100644 t << endl; -- -2.12.1 +2.13.0 diff --git a/0022-Allow-usage-of-static-version-with-CMake.patch b/0023-Allow-usage-of-static-version-with-CMake.patch index 5136f3e873eb..2f79e89bbd96 100644 --- a/0022-Allow-usage-of-static-version-with-CMake.patch +++ b/0023-Allow-usage-of-static-version-with-CMake.patch @@ -1,25 +1,27 @@ -From 1c1935b0d6e6685181880f6d591677ed49b0695e Mon Sep 17 00:00:00 2001 +From 884534d5a74833a3666e1d34a30a9ea600a92df4 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 18:32:00 +0200 -Subject: [PATCH 22/30] Allow usage of static version with CMake +Subject: [PATCH 23/31] Allow usage of static version with CMake - Fix plugin detection and various details - Allow selecting between dynamic and static Qt versions installed in the same prefix - Use eg. find_package(Qt5Core) for dynamic version - and eg. find_package(StaticQt5Core) for static version + +Change-Id: Idf2d3ab8e3581910f59d9727ef6b48e105729463 --- mkspecs/features/create_cmake.prf | 85 +++-- - .../features/data/cmake/Qt5BasicConfig.cmake.in | 358 ++++++++++++++------- + .../features/data/cmake/Qt5BasicConfig.cmake.in | 372 ++++++++++++++------- .../features/data/cmake/Qt5PluginTarget.cmake.in | 30 +- qmake/generators/makefile.cpp | 7 + - src/corelib/Qt5CoreConfigExtras.cmake.in | 37 ++- + src/corelib/Qt5CoreConfigExtras.cmake.in | 30 +- src/gui/Qt5GuiConfigExtras.cmake.in | 12 +- src/testlib/Qt5TestConfigExtras.cmake.in | 4 + - 7 files changed, 372 insertions(+), 161 deletions(-) + 7 files changed, 372 insertions(+), 168 deletions(-) diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf -index 461a7fdff5..c4afc5251b 100644 +index 15fc070008..0914532f54 100644 --- a/mkspecs/features/create_cmake.prf +++ b/mkspecs/features/create_cmake.prf @@ -38,7 +38,8 @@ split_incpath { @@ -222,7 +224,7 @@ index 461a7fdff5..c4afc5251b 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 d2358cae4b..6365d0f9ff 100644 +index 4f342d67d7..908f7f59a7 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]\") @@ -446,16 +448,20 @@ index d2358cae4b..6365d0f9ff 100644 !!ENDIF // TEMPLATE != aux set(_Qt5$${CMAKE_MODULE_NAME}_MODULE_DEPENDENCIES \"$${CMAKE_MODULE_DEPS}\") -@@ -167,7 +225,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -166,10 +224,10 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) + endif() !!ENDIF +- set(Qt5$${CMAKE_MODULE_NAME}_OWN_PRIVATE_INCLUDE_DIRS ${Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS}) ++ set($${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_OWN_PRIVATE_INCLUDE_DIRS ${Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS}) + set(_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_REQUIRED) - if (Qt5$${CMAKE_MODULE_NAME}_FIND_REQUIRED) + if ($${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_FIND_REQUIRED) set(_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_REQUIRED REQUIRED) endif() set(_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_QUIET) -@@ -175,17 +233,17 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -177,17 +235,17 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) set(_Qt5$${CMAKE_MODULE_NAME}_DEPENDENCIES_FIND_QUIET QUIET) endif() set(_Qt5$${CMAKE_MODULE_NAME}_FIND_VERSION_EXACT) @@ -477,7 +483,7 @@ index d2358cae4b..6365d0f9ff 100644 $$VERSION ${_Qt5$${CMAKE_MODULE_NAME}_FIND_VERSION_EXACT} ${_Qt5$${CMAKE_MODULE_NAME}_DEPENDENCIES_FIND_QUIET} ${_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_REQUIRED} -@@ -193,28 +251,32 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -195,28 +253,32 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) ) endif() @@ -522,7 +528,7 @@ index d2358cae4b..6365d0f9ff 100644 !!IF !isEmpty(CMAKE_INTERFACE_QT5_MODULE_DEPS) if (NOT CMAKE_VERSION VERSION_LESS 3.0.0) -@@ -223,81 +285,179 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -225,28 +287,124 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) !!ENDIF !!IF !isEmpty(CMAKE_STATIC_TYPE) @@ -647,6 +653,36 @@ index d2358cae4b..6365d0f9ff 100644 + endforeach() + endif() + set(_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIRS_EXIST TRUE) +- foreach (_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIR ${Qt5$${CMAKE_MODULE_NAME}_OWN_PRIVATE_INCLUDE_DIRS}) ++ foreach (_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIR ${$${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_OWN_PRIVATE_INCLUDE_DIRS}) + if (NOT EXISTS ${_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIR}) + set(_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIRS_EXIST FALSE) + endif() +@@ -254,9 +412,9 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) + + if (_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIRS_EXIST + AND NOT CMAKE_VERSION VERSION_LESS 3.0.0 ) +- add_library(Qt5::$${CMAKE_MODULE_NAME}Private INTERFACE IMPORTED) +- set_property(TARGET Qt5::$${CMAKE_MODULE_NAME}Private PROPERTY +- INTERFACE_INCLUDE_DIRECTORIES ${Qt5$${CMAKE_MODULE_NAME}_OWN_PRIVATE_INCLUDE_DIRS} ++ add_library($${VAR_PREFIX}Qt5::$${CMAKE_MODULE_NAME}Private INTERFACE IMPORTED) ++ set_property(TARGET $${VAR_PREFIX}Qt5::$${CMAKE_MODULE_NAME}Private PROPERTY ++ INTERFACE_INCLUDE_DIRECTORIES ${$${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_OWN_PRIVATE_INCLUDE_DIRS} + ) + set(_Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS) + foreach(dep ${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}) +@@ -264,66 +422,68 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) + list(APPEND _Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS ${dep}Private) + endif() + endforeach() +- set_property(TARGET Qt5::$${CMAKE_MODULE_NAME}Private PROPERTY +- INTERFACE_LINK_LIBRARIES Qt5::$${CMAKE_MODULE_NAME} ${_Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS} ++ set_property(TARGET $${VAR_PREFIX}Qt5::$${CMAKE_MODULE_NAME}Private PROPERTY ++ INTERFACE_LINK_LIBRARIES $${VAR_PREFIX}Qt5::$${CMAKE_MODULE_NAME} ${_Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS} + ) + endif() + !!IF !equals(TEMPLATE, aux) !!IF !isEmpty(CMAKE_RELEASE_TYPE) -!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) @@ -727,7 +763,7 @@ index d2358cae4b..6365d0f9ff 100644 if (EXISTS !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" -@@ -310,9 +470,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -336,9 +496,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) !!ELSE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) !!ENDIF @@ -741,7 +777,7 @@ index d2358cae4b..6365d0f9ff 100644 !!ENDIF // CMAKE_RELEASE_TYPE !!ENDIF // CMAKE_FIND_OTHER_LIBRARY_BUILD -@@ -323,37 +485,17 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -349,37 +511,17 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) ) !!ENDIF // TEMPLATE != aux @@ -827,7 +863,7 @@ index 5baf0fdb10..54345e4117 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 8ac3a0f647..ed4a1f5c30 100644 +index 990d10a286..35cb7d927a 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -998,6 +998,13 @@ MakefileGenerator::writePrlFile(QTextStream &t) @@ -845,7 +881,7 @@ index 8ac3a0f647..ed4a1f5c30 100644 } diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in -index 545b9a3d1e..fd5c947b5f 100644 +index 545b9a3d1e..42a3c557aa 100644 --- a/src/corelib/Qt5CoreConfigExtras.cmake.in +++ b/src/corelib/Qt5CoreConfigExtras.cmake.in @@ -1,4 +1,10 @@ @@ -932,17 +968,6 @@ index 545b9a3d1e..fd5c947b5f 100644 IMPORTED_LINK_INTERFACE_LIBRARIES_${_config} $<$<AND:${_isExe},${_isWin32},${_isNotExcluded},${_isPolicyNEW}>:Qt5::WinMain> ) -@@ -188,3 +194,10 @@ get_filename_component(_Qt5CoreConfigDir ${CMAKE_CURRENT_LIST_FILE} PATH) - set(_Qt5CTestMacros \"${_Qt5CoreConfigDir}/Qt5CTestMacros.cmake\") - - _qt5_Core_check_file_exists(${_Qt5CTestMacros}) -+ -+!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) -+set(_isExe $<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>) -+# INTERFACE_LINK_LIBRARIES is used to pass a linker flag '-static' and library ws2_32 -+set_target_properties(${IMPORTED_TARGET_NAME} PROPERTIES \"INTERFACE_LINK_LIBRARIES\" \"$<${_isExe}:-static;ws2_32>\") -+unset(_isExe) -+!!ENDIF diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in index 2e32911a64..31567d7da2 100644 --- a/src/gui/Qt5GuiConfigExtras.cmake.in @@ -994,5 +1019,5 @@ index 2a575958ae..8312c90fd1 100644 INTERFACE_COMPILE_DEFINITIONS QT_TESTCASE_BUILDDIR=\\\"\${CMAKE_BINARY_DIR}\\\" ) -- -2.12.1 +2.13.0 diff --git a/0024-Adjust-linker-flags-for-static-build-with-cmake-ming.patch b/0024-Adjust-linker-flags-for-static-build-with-cmake-ming.patch new file mode 100644 index 000000000000..d5a1d718ffcc --- /dev/null +++ b/0024-Adjust-linker-flags-for-static-build-with-cmake-ming.patch @@ -0,0 +1,29 @@ +From 1f6fc1094a08c20ac78cc75e6667693676d10907 Mon Sep 17 00:00:00 2001 +From: Martchus <martchus@gmx.net> +Date: Fri, 2 Jun 2017 16:42:07 +0200 +Subject: [PATCH 24/31] Adjust linker flags for static build with + cmake/mingw-w64 + +Change-Id: I33b88976d8f5ce87ce431a6f422fe87785bf5b8d +--- + src/corelib/Qt5CoreConfigExtras.cmake.in | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in +index 42a3c557aa..fd5c947b5f 100644 +--- a/src/corelib/Qt5CoreConfigExtras.cmake.in ++++ b/src/corelib/Qt5CoreConfigExtras.cmake.in +@@ -194,3 +194,10 @@ get_filename_component(_Qt5CoreConfigDir ${CMAKE_CURRENT_LIST_FILE} PATH) + set(_Qt5CTestMacros \"${_Qt5CoreConfigDir}/Qt5CTestMacros.cmake\") + + _qt5_Core_check_file_exists(${_Qt5CTestMacros}) ++ ++!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) ++set(_isExe $<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>) ++# INTERFACE_LINK_LIBRARIES is used to pass a linker flag '-static' and library ws2_32 ++set_target_properties(${IMPORTED_TARGET_NAME} PROPERTIES \"INTERFACE_LINK_LIBRARIES\" \"$<${_isExe}:-static;ws2_32>\") ++unset(_isExe) ++!!ENDIF +-- +2.13.0 + diff --git a/0024-Fix-qt5_wrap_ui-macro.patch b/0024-Fix-qt5_wrap_ui-macro.patch deleted file mode 100644 index 05415808aa84..000000000000 --- a/0024-Fix-qt5_wrap_ui-macro.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 3e3e4a59ab80c311d4158369d456287123151286 Mon Sep 17 00:00:00 2001 -From: Martchus <martchus@gmx.net> -Date: Sun, 4 Dec 2016 20:35:47 +0100 -Subject: [PATCH 24/30] Fix qt5_wrap_ui() macro - -See https://github.com/Martchus/PKGBUILDs/issues/11 ---- - src/widgets/Qt5WidgetsMacros.cmake | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/widgets/Qt5WidgetsMacros.cmake b/src/widgets/Qt5WidgetsMacros.cmake -index f5e7b7f050..18d120f0c7 100644 ---- a/src/widgets/Qt5WidgetsMacros.cmake -+++ b/src/widgets/Qt5WidgetsMacros.cmake -@@ -55,8 +55,9 @@ function(QT5_WRAP_UI outfiles ) - get_filename_component(outfile ${it} NAME_WE) - get_filename_component(infile ${it} ABSOLUTE) - set(outfile ${CMAKE_CURRENT_BINARY_DIR}/ui_${outfile}.h) -+ get_target_property(UIC_LOC ${Qt5Widgets_UIC_EXECUTABLE} IMPORTED_LOCATION) - add_custom_command(OUTPUT ${outfile} -- COMMAND ${Qt5Widgets_UIC_EXECUTABLE} -+ COMMAND ${UIC_LOC} - ARGS ${ui_options} -o ${outfile} ${infile} - MAIN_DEPENDENCY ${infile} VERBATIM) - list(APPEND ${outfiles} ${outfile}) --- -2.12.1 - diff --git a/0023-Use-correct-pkg-config-static-flag.patch b/0025-Use-correct-pkg-config-static-flag.patch index 220e3c6a08c0..2e9ea114433e 100644 --- a/0023-Use-correct-pkg-config-static-flag.patch +++ b/0025-Use-correct-pkg-config-static-flag.patch @@ -1,17 +1,17 @@ -From 2d7fb7169cfeed0c95a703b58fa7ec2412ba5daf Mon Sep 17 00:00:00 2001 +From 8cfdb2fc2573a49866ab98ce66e4473f4512dfb9 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 18:50:21 +0200 -Subject: [PATCH 23/30] Use correct pkg-config --static flag +Subject: [PATCH 25/31] Use correct pkg-config --static flag --- configure.pri | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configure.pri b/configure.pri -index 0c4b8ebbf8..8afb893e88 100644 +index 9a5c6cb30d..f8b1e3a1ab 100644 --- a/configure.pri +++ b/configure.pri -@@ -138,6 +138,9 @@ defineTest(qtConfTest_detectPkgConfig) { +@@ -311,6 +311,9 @@ defineTest(qtConfTest_detectPkgConfig) { qtLog("Found pkg-config from path: $$pkgConfig") } } @@ -22,5 +22,5 @@ index 0c4b8ebbf8..8afb893e88 100644 $$qtConfEvaluate("features.cross_compile") { # cross compiling, check that pkg-config is set up sanely -- -2.12.1 +2.13.0 diff --git a/0026-Fix-macro-invoking-moc-rcc-and-uic.patch b/0026-Fix-macro-invoking-moc-rcc-and-uic.patch new file mode 100644 index 000000000000..1d7dd0613527 --- /dev/null +++ b/0026-Fix-macro-invoking-moc-rcc-and-uic.patch @@ -0,0 +1,74 @@ +From 27d8249c25041e18ae3168a733d34208b42f436d Mon Sep 17 00:00:00 2001 +From: Martchus <martchus@gmx.net> +Date: Sun, 4 Dec 2016 20:35:47 +0100 +Subject: [PATCH 26/31] Fix macro invoking moc, rcc and uic + +* Otherwise the arguments aren't passed correctly leading to errors like + ``` + [ 3%] Generating qca_core.moc + moc: Too many input files specified: 'Qt5::moc' '/build/qca-qt5/src/qca-2.1.3/include/QtCrypto/qca_safetimer.h' + ``` +* Just a workaround, not sure what is causing the issue (maybe a CMake bug?) +* See https://github.com/Martchus/PKGBUILDs/issues/11 + +Change-Id: I6fde86d0a3ade37b4376604a1eb6d5723eda8b4c +--- + src/corelib/Qt5CoreMacros.cmake | 9 ++++++--- + src/widgets/Qt5WidgetsMacros.cmake | 3 ++- + 2 files changed, 8 insertions(+), 4 deletions(-) + +diff --git a/src/corelib/Qt5CoreMacros.cmake b/src/corelib/Qt5CoreMacros.cmake +index 489bc75511..c980f4220d 100644 +--- a/src/corelib/Qt5CoreMacros.cmake ++++ b/src/corelib/Qt5CoreMacros.cmake +@@ -132,8 +132,9 @@ function(QT5_CREATE_MOC_COMMAND infile outfile moc_flags moc_options moc_target + endif() + + set(_moc_extra_parameters_file @${_moc_parameters_file}) ++ get_target_property(MOC_LOC ${Qt5Core_MOC_EXECUTABLE} IMPORTED_LOCATION) + add_custom_command(OUTPUT ${outfile} +- COMMAND ${Qt5Core_MOC_EXECUTABLE} ${_moc_extra_parameters_file} ++ COMMAND ${MOC_LOC} ${_moc_extra_parameters_file} + DEPENDS ${infile} ${moc_depends} + ${_moc_working_dir} + VERBATIM) +@@ -251,8 +252,9 @@ function(QT5_ADD_BINARY_RESOURCES target ) + set(rc_depends ${rc_depends} ${_rc_depends}) + endforeach() + ++ get_target_property(RCC_LOC ${Qt5Core_RCC_EXECUTABLE} IMPORTED_LOCATION) + add_custom_command(OUTPUT ${rcc_destination} +- COMMAND ${Qt5Core_RCC_EXECUTABLE} ++ COMMAND ${RCC_LOC} + ARGS ${rcc_options} --binary --name ${target} --output ${rcc_destination} ${infiles} + DEPENDS ${rc_depends} ${out_depends} VERBATIM) + +@@ -284,8 +286,9 @@ function(QT5_ADD_RESOURCES outfiles ) + + _QT5_PARSE_QRC_FILE(${infile} _out_depends _rc_depends) + ++ get_target_property(MOC_LOC ${Qt5Core_RCC_EXECUTABLE} IMPORTED_LOCATION) + add_custom_command(OUTPUT ${outfile} +- COMMAND ${Qt5Core_RCC_EXECUTABLE} ++ COMMAND ${MOC_LOC} + ARGS ${rcc_options} --name ${outfilename} --output ${outfile} ${infile} + MAIN_DEPENDENCY ${infile} + DEPENDS ${_rc_depends} "${out_depends}" VERBATIM) +diff --git a/src/widgets/Qt5WidgetsMacros.cmake b/src/widgets/Qt5WidgetsMacros.cmake +index f5e7b7f050..18d120f0c7 100644 +--- a/src/widgets/Qt5WidgetsMacros.cmake ++++ b/src/widgets/Qt5WidgetsMacros.cmake +@@ -55,8 +55,9 @@ function(QT5_WRAP_UI outfiles ) + get_filename_component(outfile ${it} NAME_WE) + get_filename_component(infile ${it} ABSOLUTE) + set(outfile ${CMAKE_CURRENT_BINARY_DIR}/ui_${outfile}.h) ++ get_target_property(UIC_LOC ${Qt5Widgets_UIC_EXECUTABLE} IMPORTED_LOCATION) + add_custom_command(OUTPUT ${outfile} +- COMMAND ${Qt5Widgets_UIC_EXECUTABLE} ++ COMMAND ${UIC_LOC} + ARGS ${ui_options} -o ${outfile} ${infile} + MAIN_DEPENDENCY ${infile} VERBATIM) + list(APPEND ${outfiles} ${outfile}) +-- +2.13.0 + diff --git a/0025-Ignore-errors-about-missing-feature-static.patch b/0027-Ignore-errors-about-missing-feature-static.patch index d36f4fe0f15a..b4614e6123b6 100644 --- a/0025-Ignore-errors-about-missing-feature-static.patch +++ b/0027-Ignore-errors-about-missing-feature-static.patch @@ -1,7 +1,7 @@ -From 989341ca2c6ab8a256503dacc32ac49a37b9b0cd Mon Sep 17 00:00:00 2001 +From 3d7baa02c957207beffa3e2d4b936a6a6c5cc19b Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Wed, 25 Jan 2017 20:59:54 +0100 -Subject: [PATCH 25/30] Ignore errors about missing feature static +Subject: [PATCH 27/31] Ignore errors about missing feature static Not sure why this error occurs, let's hope for the best --- @@ -10,10 +10,10 @@ Not sure why this error occurs, let's hope for the best 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mkspecs/features/qt_build_config.prf b/mkspecs/features/qt_build_config.prf -index 3762c14f98..a58200a297 100644 +index 150d2b2cc3..d93d24cce5 100644 --- a/mkspecs/features/qt_build_config.prf +++ b/mkspecs/features/qt_build_config.prf -@@ -132,5 +132,5 @@ defineTest(qtConfig) { +@@ -135,5 +135,5 @@ defineTest(qtConfig) { contains(QT.$${module}.disabled_features, $$1): \ return(false) } @@ -21,10 +21,10 @@ index 3762c14f98..a58200a297 100644 + !equals($$1, "static"): error("Could not find feature $${1}.") } diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf -index 999cd18154..6bf08ea583 100644 +index c00fdb73f8..d4d5599433 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf -@@ -349,5 +349,5 @@ defineTest(qtConfig) { +@@ -351,5 +351,5 @@ defineTest(qtConfig) { contains(QT.$${module}.disabled_features, $$1): \ return(false) } @@ -32,5 +32,5 @@ index 999cd18154..6bf08ea583 100644 + !equals($$1, "static"): error("Could not find feature $${1}.") } -- -2.12.1 +2.13.0 diff --git a/0026-Enable-and-fix-use-of-iconv.patch b/0028-Enable-and-fix-use-of-iconv.patch index a70cb3818e8f..eeada98dcaaf 100644 --- a/0026-Enable-and-fix-use-of-iconv.patch +++ b/0028-Enable-and-fix-use-of-iconv.patch @@ -1,7 +1,7 @@ -From c8710fe0122cc6847fb11944b657f814872954b5 Mon Sep 17 00:00:00 2001 +From 63a1e37e442e61f9d65e340e6602ad732ad26bdf Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Wed, 25 Jan 2017 21:08:20 +0100 -Subject: [PATCH 26/30] Enable and fix use of iconv +Subject: [PATCH 28/31] Enable and fix use of iconv Change-Id: I5f0ab27afca0800dec11c7af74d196190820ae5c --- @@ -24,10 +24,10 @@ index 1276311e08..993a12c7ee 100644 size_t inbytes, outbytes; iconv(x, &inp, &inbytes, &outp, &outbytes); diff --git a/src/corelib/codecs/qiconvcodec.cpp b/src/corelib/codecs/qiconvcodec.cpp -index e4fb359f2c..771b1fa9f2 100644 +index d6362b6fbc..4da4546a24 100644 --- a/src/corelib/codecs/qiconvcodec.cpp +++ b/src/corelib/codecs/qiconvcodec.cpp -@@ -50,7 +50,6 @@ QT_REQUIRE_CONFIG(iconv); +@@ -49,7 +49,6 @@ QT_REQUIRE_CONFIG(iconv); #include <errno.h> #include <locale.h> #include <stdio.h> @@ -35,7 +35,7 @@ index e4fb359f2c..771b1fa9f2 100644 // unistd.h is needed for the _XOPEN_UNIX macro #include <unistd.h> -@@ -183,7 +182,7 @@ QString QIconvCodec::convertToUnicode(const char* chars, int len, ConverterState +@@ -182,7 +181,7 @@ QString QIconvCodec::convertToUnicode(const char* chars, int len, ConverterState 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 @@ -44,7 +44,7 @@ index e4fb359f2c..771b1fa9f2 100644 // GNU doesn't disagree with POSIX :/ const char *inBytes = chars; #else -@@ -282,7 +281,7 @@ static bool setByteOrder(iconv_t cd) +@@ -281,7 +280,7 @@ static bool setByteOrder(iconv_t cd) size_t outBytesLeft = sizeof buf; size_t inBytesLeft = sizeof bom; @@ -53,7 +53,7 @@ index e4fb359f2c..771b1fa9f2 100644 const char **inBytesPtr = const_cast<const char **>(&inBytes); #else char **inBytesPtr = &inBytes; -@@ -304,7 +303,7 @@ QByteArray QIconvCodec::convertFromUnicode(const QChar *uc, int len, ConverterSt +@@ -303,7 +302,7 @@ QByteArray QIconvCodec::convertFromUnicode(const QChar *uc, int len, ConverterSt char *outBytes; size_t inBytesLeft; @@ -63,10 +63,10 @@ index e4fb359f2c..771b1fa9f2 100644 #else char **inBytesPtr = &inBytes; diff --git a/src/corelib/configure.json b/src/corelib/configure.json -index 0d1954c3a8..32bbe92f57 100644 +index c6c5c93ddb..62c75f37ab 100644 --- a/src/corelib/configure.json +++ b/src/corelib/configure.json -@@ -263,9 +263,9 @@ +@@ -256,9 +256,9 @@ }, "gnu-libiconv": { "label": "GNU iconv", @@ -79,5 +79,5 @@ index 0d1954c3a8..32bbe92f57 100644 }, "icu": { -- -2.12.1 +2.13.0 diff --git a/0028-Include-uiviewsettingsinterop.h-correctly.patch b/0028-Include-uiviewsettingsinterop.h-correctly.patch deleted file mode 100644 index 7cbf06140718..000000000000 --- a/0028-Include-uiviewsettingsinterop.h-correctly.patch +++ /dev/null @@ -1,25 +0,0 @@ -From f598982149077d0cd9aeb51efe47116f3598b8eb Mon Sep 17 00:00:00 2001 -From: Martchus <martchus@gmx.net> -Date: Wed, 25 Jan 2017 23:41:16 +0100 -Subject: [PATCH 28/30] Include uiviewsettingsinterop.h correctly - ---- - src/plugins/platforms/windows/qwin10helpers.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/plugins/platforms/windows/qwin10helpers.cpp b/src/plugins/platforms/windows/qwin10helpers.cpp -index 977bbfd11b..12cccd124b 100644 ---- a/src/plugins/platforms/windows/qwin10helpers.cpp -+++ b/src/plugins/platforms/windows/qwin10helpers.cpp -@@ -57,7 +57,7 @@ - #endif - - #ifdef HAS_UI_VIEW_SETTINGS_INTEROP --# include <UIViewSettingsInterop.h> -+# include <uiviewsettingsinterop.h> - #endif - - #ifndef HAS_UI_VIEW_SETTINGS_INTEROP --- -2.12.1 - diff --git a/0029-Hardcode-linker-flags-for-libqwindows.dll.patch b/0029-Hardcode-linker-flags-for-libqwindows.dll.patch deleted file mode 100644 index 56059692f042..000000000000 --- a/0029-Hardcode-linker-flags-for-libqwindows.dll.patch +++ /dev/null @@ -1,45 +0,0 @@ -From d73ee96c1fcaab9351d7e8471f2d9c1a0d842377 Mon Sep 17 00:00:00 2001 -From: Martchus <martchus@gmx.net> -Date: Wed, 25 Jan 2017 23:42:30 +0100 -Subject: [PATCH 29/30] Hardcode linker flags for libqwindows.dll - -Otherwise incorrect order of libs leads to linker -errors ---- - src/plugins/platforms/windows/windows.pro | 19 +++++++++++++++---- - 1 file changed, 15 insertions(+), 4 deletions(-) - -diff --git a/src/plugins/platforms/windows/windows.pro b/src/plugins/platforms/windows/windows.pro -index 23168c10dc..e27cf1a248 100644 ---- a/src/plugins/platforms/windows/windows.pro -+++ b/src/plugins/platforms/windows/windows.pro -@@ -1,11 +1,22 @@ - TARGET = qwindows - - QT += \ -- core-private gui-private \ -- eventdispatcher_support-private accessibility_support-private \ -- fontdatabase_support-private theme_support-private -+ core-private gui-private - --LIBS += -lgdi32 -ldwmapi -+# Fix linker error when building libqwindows.dll by specifying linker flags for -+# required modules manually (otherwise order is messed) -+LIBS += \ -+ -lQt5EventDispatcherSupport \ -+ -lQt5AccessibilitySupport \ -+ -lQt5FontDatabaseSupport \ -+ -lQt5ThemeSupport \ -+ -lfreetype -lole32 -lgdi32 -ldwmapi -+# However, this workaround leads to the necessity of specifying include dirs manually -+INCLUDEPATH += \ -+ $$QT_SOURCE_TREE/include/QtEventDispatcherSupport/5.8.0 \ -+ $$QT_SOURCE_TREE/include/QtAccessibilitySupport/5.8.0 \ -+ $$QT_SOURCE_TREE/include/QtFontDatabaseSupport/5.8.0 \ -+ $$QT_SOURCE_TREE/include/QtThemeSupport/5.8.0 - - include(windows.pri) - --- -2.12.1 - diff --git a/0027-Ignore-failing-pkg-config-test.patch b/0029-Ignore-failing-pkg-config-test.patch index 3e72c18cce4e..9b3cafb839b8 100644 --- a/0027-Ignore-failing-pkg-config-test.patch +++ b/0029-Ignore-failing-pkg-config-test.patch @@ -1,7 +1,7 @@ -From 64db0066305a86a66cc304174052de639607d10c Mon Sep 17 00:00:00 2001 +From e738cb4ecf057ce65d86e861de11df919227d421 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Wed, 25 Jan 2017 21:08:48 +0100 -Subject: [PATCH 27/30] Ignore failing pkg-config test +Subject: [PATCH 29/31] Ignore failing pkg-config test Didn't investigate why it fails, let's hope for the best --- @@ -9,10 +9,10 @@ Didn't investigate why it fails, let's hope for the best 1 file changed, 1 deletion(-) diff --git a/configure.json b/configure.json -index 12714da714..adc54e439c 100644 +index 27b1460f93..7fca07351e 100644 --- a/configure.json +++ b/configure.json -@@ -472,7 +472,6 @@ +@@ -515,7 +515,6 @@ "pkg-config": { "label": "Using pkg-config", "autoDetect": "!config.darwin && !config.win32", @@ -21,5 +21,5 @@ index 12714da714..adc54e439c 100644 "publicFeature", { "type": "publicQtConfig", "negative": true }, -- -2.12.1 +2.13.0 diff --git a/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch b/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch index cefd4b32e7c6..2509ae16306a 100644 --- a/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch +++ b/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch @@ -1,7 +1,7 @@ -From cf89985a2417df8e4519cab3824b239269792e57 Mon Sep 17 00:00:00 2001 +From 9ef6d62307288a6a1656aee01835b4c368678e55 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Tue, 7 Feb 2017 18:25:28 +0100 -Subject: [PATCH 30/30] Prevent qmake from messing static lib dependencies +Subject: [PATCH 30/31] Prevent qmake from messing static lib dependencies In particular, it messes resolving cyclic dependency between static freetype2 and harfbuzz @@ -11,10 +11,10 @@ static freetype2 and harfbuzz 2 files changed, 6 insertions(+) diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp -index 349dcd2f40..f6d3d1fa29 100644 +index 20318f120c..d113216f55 100644 --- a/qmake/generators/unix/unixmake.cpp +++ b/qmake/generators/unix/unixmake.cpp -@@ -394,6 +394,9 @@ UnixMakefileGenerator::fixLibFlag(const ProString &lib) +@@ -410,6 +410,9 @@ UnixMakefileGenerator::fixLibFlag(const ProString &lib) bool UnixMakefileGenerator::findLibraries(bool linkPrl, bool mergeLflags) { @@ -25,7 +25,7 @@ index 349dcd2f40..f6d3d1fa29 100644 int libidx = 0, fwidx = 0; for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS")) diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp -index e6338546bb..2407d26a5a 100644 +index d9388e8518..090c576bc6 100644 --- a/qmake/generators/win32/winmakefile.cpp +++ b/qmake/generators/win32/winmakefile.cpp @@ -87,6 +87,9 @@ Win32MakefileGenerator::findLibraries(bool linkPrl, bool mergeLflags) @@ -39,5 +39,5 @@ index e6338546bb..2407d26a5a 100644 static const char * const lflags[] = { "QMAKE_LIBS", "QMAKE_LIBS_PRIVATE", 0 }; for (int i = 0; lflags[i]; i++) { -- -2.12.1 +2.13.0 diff --git a/0031-Hardcode-linker-flags-for-platform-plugins.patch b/0031-Hardcode-linker-flags-for-platform-plugins.patch new file mode 100644 index 000000000000..612dc4d7a554 --- /dev/null +++ b/0031-Hardcode-linker-flags-for-platform-plugins.patch @@ -0,0 +1,101 @@ +From 7f5e0ffbc26a67ba4bc3c0868fdd492641846a23 Mon Sep 17 00:00:00 2001 +From: Martchus <martchus@gmx.net> +Date: Wed, 25 Jan 2017 23:42:30 +0100 +Subject: [PATCH 31/31] Hardcode linker flags for platform plugins + +Otherwise incorrect order of libs leads to errors +when building libqminimal.dll, libqoffscreen.dll +and libqwindows.dll + +Change-Id: I594ddcc15599c63bb8ac5e998f59c4561a18eb26 +--- + src/plugins/platforms/minimal/minimal.pro | 15 +++++++++++++-- + src/plugins/platforms/offscreen/offscreen.pro | 14 ++++++++++++-- + src/plugins/platforms/windows/windows.pro | 19 +++++++++++++++---- + 3 files changed, 40 insertions(+), 8 deletions(-) + +diff --git a/src/plugins/platforms/minimal/minimal.pro b/src/plugins/platforms/minimal/minimal.pro +index 8cfb68824e..c3fd4c73f2 100644 +--- a/src/plugins/platforms/minimal/minimal.pro ++++ b/src/plugins/platforms/minimal/minimal.pro +@@ -1,8 +1,19 @@ + TARGET = qminimal + + QT += \ +- core-private gui-private \ +- eventdispatcher_support-private fontdatabase_support-private ++ core-private gui-private ++ ++# Fix linker error when building libqminimal.dll by specifying linker flags for ++# required modules manually (otherwise order is messed) ++LIBS += \ ++ -lQt5EventDispatcherSupport \ ++ -lQt5FontDatabaseSupport \ ++ -lfreetype -lole32 -lgdi32 -luuid ++# However, this workaround leads to the necessity of specifying include dirs manually ++INCLUDEPATH += \ ++ $$QT_SOURCE_TREE/include/QtEventDispatcherSupport/5.9.0 \ ++ $$QT_SOURCE_TREE/include/QtFontDatabaseSupport/5.9.0 ++ + + DEFINES += QT_NO_FOREACH + +diff --git a/src/plugins/platforms/offscreen/offscreen.pro b/src/plugins/platforms/offscreen/offscreen.pro +index 6652cefd86..03c30f4a96 100644 +--- a/src/plugins/platforms/offscreen/offscreen.pro ++++ b/src/plugins/platforms/offscreen/offscreen.pro +@@ -1,8 +1,18 @@ + TARGET = qoffscreen + + QT += \ +- core-private gui-private \ +- eventdispatcher_support-private fontdatabase_support-private ++ core-private gui-private ++ ++# Fix linker error when building libqoffscreen.dll by specifying linker flags for ++# required modules manually (otherwise order is messed) ++LIBS += \ ++ -lQt5EventDispatcherSupport \ ++ -lQt5FontDatabaseSupport \ ++ -lfreetype -lole32 -lgdi32 -luuid ++# However, this workaround leads to the necessity of specifying include dirs manually ++INCLUDEPATH += \ ++ $$QT_SOURCE_TREE/include/QtEventDispatcherSupport/5.9.0 \ ++ $$QT_SOURCE_TREE/include/QtFontDatabaseSupport/5.9.0 + + DEFINES += QT_NO_FOREACH + +diff --git a/src/plugins/platforms/windows/windows.pro b/src/plugins/platforms/windows/windows.pro +index 23168c10dc..07d0f16a88 100644 +--- a/src/plugins/platforms/windows/windows.pro ++++ b/src/plugins/platforms/windows/windows.pro +@@ -1,11 +1,22 @@ + TARGET = qwindows + + QT += \ +- core-private gui-private \ +- eventdispatcher_support-private accessibility_support-private \ +- fontdatabase_support-private theme_support-private ++ core-private gui-private + +-LIBS += -lgdi32 -ldwmapi ++# Fix linker error when building libqwindows.dll by specifying linker flags for ++# required modules manually (otherwise order is messed) ++LIBS += \ ++ -lQt5EventDispatcherSupport \ ++ -lQt5AccessibilitySupport \ ++ -lQt5FontDatabaseSupport \ ++ -lQt5ThemeSupport \ ++ -lfreetype -lole32 -lgdi32 -ldwmapi ++# However, this workaround leads to the necessity of specifying include dirs manually ++INCLUDEPATH += \ ++ $$QT_SOURCE_TREE/include/QtEventDispatcherSupport/5.9.0 \ ++ $$QT_SOURCE_TREE/include/QtAccessibilitySupport/5.9.0 \ ++ $$QT_SOURCE_TREE/include/QtFontDatabaseSupport/5.9.0 \ ++ $$QT_SOURCE_TREE/include/QtThemeSupport/5.9.0 + + include(windows.pri) + +-- +2.13.0 + @@ -77,16 +77,16 @@ isNoOpenGL() { } pkgname=mingw-w64-qt5-base-dynamic -pkgver=5.8.0 -pkgrel=2 +pkgver=5.9.0 +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') url='https://www.qt.io/' license=('GPL3' 'LGPL3' 'FDL' 'custom') depends=('mingw-w64-crt' 'mingw-w64-zlib' 'mingw-w64-libjpeg-turbo' 'mingw-w64-sqlite' - 'mingw-w64-libpng' 'mingw-w64-openssl' 'mingw-w64-dbus' 'mingw-w64-harfbuzz' - 'mingw-w64-pcre') + 'mingw-w64-libpng' 'mingw-w64-openssl-1.0' 'mingw-w64-dbus' 'mingw-w64-harfbuzz' + 'mingw-w64-pcre2') groups=('mingw-w64-qt5') optdepends=('mingw-w64-postgresql: PostgreSQL support' 'mingw-w64-mariadb-connector-c: MySQL support') makedepends=('mingw-w64-gcc' 'mingw-w64-postgresql' 'mingw-w64-mariadb-connector-c' 'mingw-w64-pkg-config') @@ -102,61 +102,62 @@ source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/sub '0007-Prevent-debug-library-names-in-pkg-config-files.patch' '0008-Fix-linking-against-shared-static-libpng.patch' '0009-Fix-linking-against-static-D-Bus.patch' - '0010-Fix-linking-against-static-freetype2.patch' - '0011-Fix-linking-against-static-harfbuzz.patch' - '0012-Fix-linking-against-static-pcre.patch' - '0013-Fix-linking-against-shared-static-MariaDB.patch' - '0014-Fix-linking-against-shared-static-PostgreSQL.patch' - '0015-Rename-qtmain-to-qt5main.patch' - '0016-Build-dynamic-host-libraries.patch' - '0017-Enable-rpath-for-build-tools.patch' - '0018-Use-system-zlib-for-build-tools.patch' - '0019-Disable-determing-default-include-and-lib-dirs-at-qm.patch' - '0020-Use-.dll.a-as-import-lib-extension.patch' - '0021-Merge-shared-and-static-library-trees.patch' - '0022-Allow-usage-of-static-version-with-CMake.patch' - '0023-Use-correct-pkg-config-static-flag.patch' - '0024-Fix-qt5_wrap_ui-macro.patch' - '0025-Ignore-errors-about-missing-feature-static.patch' - '0026-Enable-and-fix-use-of-iconv.patch' - '0027-Ignore-failing-pkg-config-test.patch' - '0028-Include-uiviewsettingsinterop.h-correctly.patch' - '0029-Hardcode-linker-flags-for-libqwindows.dll.patch' - '0030-Prevent-qmake-from-messing-static-lib-dependencies.patch') -md5sums=('6e1f7f6fb6333eb66e563b175c4e87e9' - '59cabe2d0b5646342c6cec93f7ebc074' - '9d45eaf425961899c40c76dbd1151204' - '60fc8de6d43685fc158ff705891b12ff' - 'f8da92ad83e2d0e0ebc6ead7d49dcd62' - 'f4d2daf0e914d7df8ff9ea0db778164c' - 'd198fc82d361e5a52f066e20d0f2ac1a' - 'b8a9042191146eee8898c19090e6dd79' - 'bcf6b7aa10e04c1093c801d2f2b5722b' - '50ef8614cb99b72b1e5cd5cb790b089e' - '381c9f451602c72c9a11512b41a7e725' - '6f2986a143d4d3fcbbf5ec6149742896' - '398499d79aeb1ccbdc02c4e604035ee9' - '94c63b114ee93f3d9892646090dceea2' - '01c49b3786ce8852607aeb40482c56ab' - '8d43ede146c545826b8667f4ebe1a92c' - '47e13ec0622a3af2d89768cb6c228774' - 'e08a00d918adad4734e56be6f03ba9bc' - '4808132cbdbc320d2e0dd26033fa245f' - '92afca193efe77c51fe33c209047d6c5' - '75ef72598c4274447b5668c791d019e4' - '8eb99eec735bc566847ac692bec14ce6' - 'b22a8b34e4e403256fd9cfeba5fff508' - '26c08be34065619f12a15b485c8c2ea3' - '360f6a8dae753f3649bb7bea1ca9170f' - 'ac4b80a15f9004a8f668b80fb475ddd1' - 'ccec8075e73f445fcf4c600b4b990fee' - '2a7a504e2b4572bef11855c8a0b2863a' - '963f27d8f720a91b2345cda9fe0be8cd' - 'a12368572b27f714babb720258f7b81e' - '3aa314937307e172c30258a82dd4ed67') + '0010-Don-t-try-to-use-debug-version-of-D-Bus-library.patch' + '0011-Fix-linking-against-static-freetype2.patch' + '0012-Fix-linking-against-static-harfbuzz.patch' + '0013-Fix-linking-against-static-pcre.patch' + '0014-Fix-linking-against-shared-static-MariaDB.patch' + '0015-Fix-linking-against-shared-static-PostgreSQL.patch' + '0016-Rename-qtmain-to-qt5main.patch' + '0017-Build-dynamic-host-libraries.patch' + '0018-Enable-rpath-for-build-tools.patch' + '0019-Use-system-zlib-for-build-tools.patch' + '0020-Disable-determing-default-include-and-lib-dirs-at-qm.patch' + '0021-Use-.dll.a-as-import-lib-extension.patch' + '0022-Merge-shared-and-static-library-trees.patch' + '0023-Allow-usage-of-static-version-with-CMake.patch' + '0024-Adjust-linker-flags-for-static-build-with-cmake-ming.patch' + '0025-Use-correct-pkg-config-static-flag.patch' + '0026-Fix-macro-invoking-moc-rcc-and-uic.patch' + '0027-Ignore-errors-about-missing-feature-static.patch' + '0028-Enable-and-fix-use-of-iconv.patch' + '0029-Ignore-failing-pkg-config-test.patch' + '0030-Prevent-qmake-from-messing-static-lib-dependencies.patch' + '0031-Hardcode-linker-flags-for-platform-plugins.patch') +sha256sums=('267eb2af1a203c087f2113f43b08014d0e2d2cb269295b8602d869a2fad5296c' + 'b4406bba39ee7c8cf74c3b8a98b936b46772ca1798ef6884b7b1574ece80fbdc' + '86cf470f1694abf6973f7b0f8e6cb75dd8a58e9335bab075b25229d26064adab' + '670b6cd7a6ee49f12ccf4121e997055daec887d080baf0269793b1d0243d1d89' + '878c08a1e9d0c8d639ddbdbc944ac8647ff204e9f078ddd9337737b2b929c2ed' + '38533dba16df99074e8c3f5d52bc15fabdbaffe0a56dbed79683c47f08342587' + '5ef3a569f4c53e848750ff655342e92a103abe78495905a5ef47afea9da8d1fb' + 'd21ebc9465a19e01912ebccb365b4f7ecfd3a95787c1de2640f29bdbc161983c' + '0622a2e606d9edbea23d3a5724ea9d4ed3958e60296b85134176c3980d590a41' + '90f1347e5c41b9e447c0339715d19e0434a0b58c36fd8405e850190fe17369dc' + '6b6ebfdf598658172680e4e83d2c3de24dcbc93233b0f48d5ccbf760d8f59a5c' + '11ce05f79174440406d84b38023d81c1fa87034119360fa2f0bd3887429fa694' + 'c30c558ea413c986aec2ffe86e34dd8e99f96cbc615e3963f711ec1628888114' + 'b9fbfc213089e3b44ed888f4e628030e78dd84c8030ba7a2a9f79fbf31312934' + '94ebedf699ebc0a5c6fed307eecd3dfabf9f864c696f3cf17bd8462789c1fae2' + 'df05b0f65dcafede1f83ce190895e6c6f4a22feecb1c5b1a0ba03f4948e56220' + '0acae3adb542d6ea0b405a947adf087826b4971df133b984d9166a9872e5cc98' + 'bb825226ca1e97cb49c3ac3a0c03a7db9f3e1eca632628d344201fcf9816376d' + 'e74fb8219bf599fbe5fbd1b08ff89d717089f1fa4d9e488a60e6097b212b7391' + 'cf3f90b69feb98e42ede770828db4538a3dd31dd02b2b15f55ea1743db5868ad' + '813cd1c22e3211133337231e1df754b5560159eecf1cf3eef0408d335e186190' + 'a0feb7b5a9747d6a88058360fc34f8ac8fb3cdeb2b343a5a2b28a88fdabb45b3' + '82f8f1eba6ac63c9a8749e20eb57fad80e92ddd5a58912a60a8c2fad9e83d6eb' + '34652aec17d7511815db59b438b0597e52b7f43c19d068e7e417325897a72254' + 'dcfe2103ace81898960316dd691fae38d05b2b6a79dc0ae0f245ae402f1101a8' + '0682dcc62b44717fa850700cec183cd856ce7335f26884ab15d4d0e7d3543bfe' + 'cecf5ff2916d95ffdbcf60ba3e18297a6107e17e9766a5e4d8b9ae748d99ba52' + '79bc920bb539fc68001b5def07eea3e45eb3d2c6aa3f2a949823236adf8e4633' + '80757f614fe02bfb85d00292d4f84c9f2ab2c39a512c21e956df135f3fbfdd81' + 'cc46ffc3a2183539aba923fb256045464eaae37a666034172138f4689a5c9bd3' + 'f0e63e022d1e52b82a7622828b568c57d1422f9726e116902cd2be81fec45da4' + '28b11e63f570891212073b3739a20489304d3c7205ae38471cbd6b15c651fabc') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' -#_architectures='x86_64-w64-mingw32 i686-w64-mingw32' isStatic && depends+=(${pkgname%-static}) if isANGLE; then @@ -220,6 +221,9 @@ build() { unset PKG_CONFIG_PATH for _arch in ${_architectures}; do + echo "INCLUDEPATH += /usr/${_arch}/include/openssl-1.0" >> src/network/network.pro + export OPENSSL_LIBS='-L/usr/${_arch}/lib/openssl-1.0 -lssl -lcrypto' + # Phonon is disabled for now because we lack the directx headers # FIXME: check whether this is still the case |