From 1eb6962af3393cc9b53da0c45ea1a622d9fe2b20 Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 19 Apr 2017 18:09:52 +0200 Subject: [PATCH] mingw-w64-qt5: Fix macros invoking moc/rcc Workaround for same problem as in https://github.com/Martchus/PKGBUILDs/issues/11 just for moc and rcc --- ...for-cross-compilation-with-mingw-w64.patch | 2 +- ...is-defined-when-using-dynamic-OpenGL.patch | 2 +- .../0003-Use-external-ANGLE-library.patch | 2 +- ...tions-assemler-error-in-OpenGL-facto.patch | 2 +- ...re-.pc-files-are-installed-correctly.patch | 2 +- ...add-resource-files-to-LIBS-parameter.patch | 2 +- ...ug-library-names-in-pkg-config-files.patch | 2 +- ...linking-against-shared-static-libpng.patch | 2 +- ...009-Fix-linking-against-static-D-Bus.patch | 2 +- ...Fix-linking-against-static-freetype2.patch | 2 +- ...-Fix-linking-against-static-harfbuzz.patch | 2 +- ...0012-Fix-linking-against-static-pcre.patch | 2 +- ...inking-against-shared-static-MariaDB.patch | 2 +- ...ing-against-shared-static-PostgreSQL.patch | 2 +- .../0015-Rename-qtmain-to-qt5main.patch | 2 +- .../0016-Build-dynamic-host-libraries.patch | 2 +- .../0017-Enable-rpath-for-build-tools.patch | 2 +- ...0018-Use-system-zlib-for-build-tools.patch | 2 +- ...g-default-include-and-lib-dirs-at-qm.patch | 2 +- ...0-Use-.dll.a-as-import-lib-extension.patch | 2 +- ...erge-shared-and-static-library-trees.patch | 2 +- ...w-usage-of-static-version-with-CMake.patch | 2 +- ...3-Use-correct-pkg-config-static-flag.patch | 2 +- ...4-Fix-macro-invoking-moc-rcc-and-uic.patch | 74 +++++++++++++++++++ .../0024-Fix-qt5_wrap_ui-macro.patch | 28 ------- ...-errors-about-missing-feature-static.patch | 4 +- .../0026-Enable-and-fix-use-of-iconv.patch | 4 +- .../0027-Ignore-failing-pkg-config-test.patch | 4 +- ...de-uiviewsettingsinterop.h-correctly.patch | 4 +- ...ode-linker-flags-for-libqwindows.dll.patch | 4 +- ...from-messing-static-lib-dependencies.patch | 4 +- qt5-base/mingw-w64-angle/PKGBUILD | 64 ++++++++-------- ...for-cross-compilation-with-mingw-w64.patch | 2 +- ...is-defined-when-using-dynamic-OpenGL.patch | 2 +- .../0003-Use-external-ANGLE-library.patch | 2 +- ...tions-assemler-error-in-OpenGL-facto.patch | 2 +- ...re-.pc-files-are-installed-correctly.patch | 2 +- ...add-resource-files-to-LIBS-parameter.patch | 2 +- ...ug-library-names-in-pkg-config-files.patch | 2 +- ...linking-against-shared-static-libpng.patch | 2 +- ...009-Fix-linking-against-static-D-Bus.patch | 2 +- ...Fix-linking-against-static-freetype2.patch | 2 +- ...-Fix-linking-against-static-harfbuzz.patch | 2 +- ...0012-Fix-linking-against-static-pcre.patch | 2 +- ...inking-against-shared-static-MariaDB.patch | 2 +- ...ing-against-shared-static-PostgreSQL.patch | 2 +- .../0015-Rename-qtmain-to-qt5main.patch | 2 +- .../0016-Build-dynamic-host-libraries.patch | 2 +- .../0017-Enable-rpath-for-build-tools.patch | 2 +- ...0018-Use-system-zlib-for-build-tools.patch | 2 +- ...g-default-include-and-lib-dirs-at-qm.patch | 2 +- ...0-Use-.dll.a-as-import-lib-extension.patch | 2 +- ...erge-shared-and-static-library-trees.patch | 2 +- ...w-usage-of-static-version-with-CMake.patch | 2 +- ...3-Use-correct-pkg-config-static-flag.patch | 2 +- ...4-Fix-macro-invoking-moc-rcc-and-uic.patch | 74 +++++++++++++++++++ .../0024-Fix-qt5_wrap_ui-macro.patch | 28 ------- ...-errors-about-missing-feature-static.patch | 4 +- .../0026-Enable-and-fix-use-of-iconv.patch | 4 +- .../0027-Ignore-failing-pkg-config-test.patch | 4 +- ...de-uiviewsettingsinterop.h-correctly.patch | 4 +- ...ode-linker-flags-for-libqwindows.dll.patch | 4 +- ...from-messing-static-lib-dependencies.patch | 4 +- qt5-base/mingw-w64-dynamic/PKGBUILD | 64 ++++++++-------- ...for-cross-compilation-with-mingw-w64.patch | 2 +- ...is-defined-when-using-dynamic-OpenGL.patch | 2 +- .../0003-Use-external-ANGLE-library.patch | 2 +- ...tions-assemler-error-in-OpenGL-facto.patch | 2 +- ...re-.pc-files-are-installed-correctly.patch | 2 +- ...add-resource-files-to-LIBS-parameter.patch | 2 +- ...ug-library-names-in-pkg-config-files.patch | 2 +- ...linking-against-shared-static-libpng.patch | 2 +- ...009-Fix-linking-against-static-D-Bus.patch | 2 +- ...Fix-linking-against-static-freetype2.patch | 2 +- ...-Fix-linking-against-static-harfbuzz.patch | 2 +- ...0012-Fix-linking-against-static-pcre.patch | 2 +- ...inking-against-shared-static-MariaDB.patch | 2 +- ...ing-against-shared-static-PostgreSQL.patch | 2 +- .../0015-Rename-qtmain-to-qt5main.patch | 2 +- .../0016-Build-dynamic-host-libraries.patch | 2 +- .../0017-Enable-rpath-for-build-tools.patch | 2 +- ...0018-Use-system-zlib-for-build-tools.patch | 2 +- ...g-default-include-and-lib-dirs-at-qm.patch | 2 +- ...0-Use-.dll.a-as-import-lib-extension.patch | 2 +- ...erge-shared-and-static-library-trees.patch | 2 +- ...w-usage-of-static-version-with-CMake.patch | 2 +- ...3-Use-correct-pkg-config-static-flag.patch | 2 +- ...4-Fix-macro-invoking-moc-rcc-and-uic.patch | 74 +++++++++++++++++++ .../0024-Fix-qt5_wrap_ui-macro.patch | 28 ------- ...-errors-about-missing-feature-static.patch | 4 +- .../0026-Enable-and-fix-use-of-iconv.patch | 4 +- .../0027-Ignore-failing-pkg-config-test.patch | 4 +- ...de-uiviewsettingsinterop.h-correctly.patch | 4 +- ...ode-linker-flags-for-libqwindows.dll.patch | 4 +- ...from-messing-static-lib-dependencies.patch | 4 +- qt5-base/mingw-w64-static/PKGBUILD | 64 ++++++++-------- ...for-cross-compilation-with-mingw-w64.patch | 2 +- ...is-defined-when-using-dynamic-OpenGL.patch | 2 +- .../0003-Use-external-ANGLE-library.patch | 2 +- ...tions-assemler-error-in-OpenGL-facto.patch | 2 +- ...re-.pc-files-are-installed-correctly.patch | 2 +- ...add-resource-files-to-LIBS-parameter.patch | 2 +- ...ug-library-names-in-pkg-config-files.patch | 2 +- ...linking-against-shared-static-libpng.patch | 2 +- ...009-Fix-linking-against-static-D-Bus.patch | 2 +- ...Fix-linking-against-static-freetype2.patch | 2 +- ...-Fix-linking-against-static-harfbuzz.patch | 2 +- ...0012-Fix-linking-against-static-pcre.patch | 2 +- ...inking-against-shared-static-MariaDB.patch | 2 +- ...ing-against-shared-static-PostgreSQL.patch | 2 +- .../0015-Rename-qtmain-to-qt5main.patch | 2 +- .../0016-Build-dynamic-host-libraries.patch | 2 +- .../0017-Enable-rpath-for-build-tools.patch | 2 +- ...0018-Use-system-zlib-for-build-tools.patch | 2 +- ...g-default-include-and-lib-dirs-at-qm.patch | 2 +- ...0-Use-.dll.a-as-import-lib-extension.patch | 2 +- ...erge-shared-and-static-library-trees.patch | 2 +- ...w-usage-of-static-version-with-CMake.patch | 2 +- ...3-Use-correct-pkg-config-static-flag.patch | 2 +- ...4-Fix-macro-invoking-moc-rcc-and-uic.patch | 74 +++++++++++++++++++ .../0024-Fix-qt5_wrap_ui-macro.patch | 28 ------- ...-errors-about-missing-feature-static.patch | 4 +- .../0026-Enable-and-fix-use-of-iconv.patch | 4 +- .../0027-Ignore-failing-pkg-config-test.patch | 4 +- ...de-uiviewsettingsinterop.h-correctly.patch | 4 +- ...ode-linker-flags-for-libqwindows.dll.patch | 4 +- ...from-messing-static-lib-dependencies.patch | 4 +- qt5-base/mingw-w64/PKGBUILD | 64 ++++++++-------- 128 files changed, 564 insertions(+), 380 deletions(-) create mode 100644 qt5-base/mingw-w64-angle/0024-Fix-macro-invoking-moc-rcc-and-uic.patch delete mode 100644 qt5-base/mingw-w64-angle/0024-Fix-qt5_wrap_ui-macro.patch create mode 100644 qt5-base/mingw-w64-dynamic/0024-Fix-macro-invoking-moc-rcc-and-uic.patch delete mode 100644 qt5-base/mingw-w64-dynamic/0024-Fix-qt5_wrap_ui-macro.patch create mode 100644 qt5-base/mingw-w64-static/0024-Fix-macro-invoking-moc-rcc-and-uic.patch delete mode 100644 qt5-base/mingw-w64-static/0024-Fix-qt5_wrap_ui-macro.patch create mode 100644 qt5-base/mingw-w64/0024-Fix-macro-invoking-moc-rcc-and-uic.patch delete mode 100644 qt5-base/mingw-w64/0024-Fix-qt5_wrap_ui-macro.patch diff --git a/qt5-base/mingw-w64-angle/0001-Add-profile-for-cross-compilation-with-mingw-w64.patch b/qt5-base/mingw-w64-angle/0001-Add-profile-for-cross-compilation-with-mingw-w64.patch index 70903bda..1fead784 100644 --- a/qt5-base/mingw-w64-angle/0001-Add-profile-for-cross-compilation-with-mingw-w64.patch +++ b/qt5-base/mingw-w64-angle/0001-Add-profile-for-cross-compilation-with-mingw-w64.patch @@ -303,5 +303,5 @@ index 0000000000..c5a70b1445 + +#endif // QPLATFORMDEFS_H -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64-angle/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch b/qt5-base/mingw-w64-angle/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch index 07436f98..4f11faf5 100644 --- a/qt5-base/mingw-w64-angle/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch +++ b/qt5-base/mingw-w64-angle/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch @@ -23,5 +23,5 @@ index aad48571b3..46f44d8b91 100644 #ifdef Q_ENABLE_OPENGL_FUNCTIONS_DEBUG #include -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64-angle/0003-Use-external-ANGLE-library.patch b/qt5-base/mingw-w64-angle/0003-Use-external-ANGLE-library.patch index 396b5431..bd80d9b2 100644 --- a/qt5-base/mingw-w64-angle/0003-Use-external-ANGLE-library.patch +++ b/qt5-base/mingw-w64-angle/0003-Use-external-ANGLE-library.patch @@ -93,5 +93,5 @@ index 90d7e2b76c..92e89ea39f 100644 SUBDIRS += src_3rdparty_libpng src_3rdparty_freetype.depends += src_3rdparty_libpng -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64-angle/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch b/qt5-base/mingw-w64-angle/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch index 9508bd6c..71cc1428 100644 --- a/qt5-base/mingw-w64-angle/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch +++ b/qt5-base/mingw-w64-angle/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch @@ -25,5 +25,5 @@ index 1a1022b3a7..792bdf9e7a 100644 HEADERS += opengl/qopengl.h \ opengl/qopengl_p.h \ -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64-angle/0005-Make-sure-.pc-files-are-installed-correctly.patch b/qt5-base/mingw-w64-angle/0005-Make-sure-.pc-files-are-installed-correctly.patch index 57bad228..59de23d3 100644 --- a/qt5-base/mingw-w64-angle/0005-Make-sure-.pc-files-are-installed-correctly.patch +++ b/qt5-base/mingw-w64-angle/0005-Make-sure-.pc-files-are-installed-correctly.patch @@ -62,5 +62,5 @@ index 3c029c8004..caa000ea53 100644 uninst.append("\n\t"); uninst.append("-$(DEL_FILE) " + escapeFilePath(dst_pc)); -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64-angle/0006-Don-t-add-resource-files-to-LIBS-parameter.patch b/qt5-base/mingw-w64-angle/0006-Don-t-add-resource-files-to-LIBS-parameter.patch index 9da2a9df..401d5045 100644 --- a/qt5-base/mingw-w64-angle/0006-Don-t-add-resource-files-to-LIBS-parameter.patch +++ b/qt5-base/mingw-w64-angle/0006-Don-t-add-resource-files-to-LIBS-parameter.patch @@ -24,5 +24,5 @@ index 8d5a9a7d0f..d2cf8d9afc 100644 if (project->isActiveConfig("dll")) { QString destDir = ""; -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64-angle/0007-Prevent-debug-library-names-in-pkg-config-files.patch b/qt5-base/mingw-w64-angle/0007-Prevent-debug-library-names-in-pkg-config-files.patch index 2b360f34..a4266bab 100644 --- a/qt5-base/mingw-w64-angle/0007-Prevent-debug-library-names-in-pkg-config-files.patch +++ b/qt5-base/mingw-w64-angle/0007-Prevent-debug-library-names-in-pkg-config-files.patch @@ -29,5 +29,5 @@ index 182fe79238..a762443fe2 100644 QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString(); if(!subdir.isEmpty()) { -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64-angle/0008-Fix-linking-against-shared-static-libpng.patch b/qt5-base/mingw-w64-angle/0008-Fix-linking-against-shared-static-libpng.patch index fdc684a5..048bcd46 100644 --- a/qt5-base/mingw-w64-angle/0008-Fix-linking-against-shared-static-libpng.patch +++ b/qt5-base/mingw-w64-angle/0008-Fix-linking-against-shared-static-libpng.patch @@ -22,5 +22,5 @@ index 1f5011617c..5006ff5a3a 100644 }, "mirclient": { -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64-angle/0009-Fix-linking-against-static-D-Bus.patch b/qt5-base/mingw-w64-angle/0009-Fix-linking-against-static-D-Bus.patch index dd755274..cb456399 100644 --- a/qt5-base/mingw-w64-angle/0009-Fix-linking-against-static-D-Bus.patch +++ b/qt5-base/mingw-w64-angle/0009-Fix-linking-against-static-D-Bus.patch @@ -62,5 +62,5 @@ index cfc0e12046..65f1397cd6 100644 # include #else -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64-angle/0010-Fix-linking-against-static-freetype2.patch b/qt5-base/mingw-w64-angle/0010-Fix-linking-against-static-freetype2.patch index 406fff4b..bc76d2c4 100644 --- a/qt5-base/mingw-w64-angle/0010-Fix-linking-against-static-freetype2.patch +++ b/qt5-base/mingw-w64-angle/0010-Fix-linking-against-static-freetype2.patch @@ -26,5 +26,5 @@ index 5006ff5a3a..6530357be9 100644 }, "fontconfig": { -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64-angle/0011-Fix-linking-against-static-harfbuzz.patch b/qt5-base/mingw-w64-angle/0011-Fix-linking-against-static-harfbuzz.patch index a4abc606..cc8dfe77 100644 --- a/qt5-base/mingw-w64-angle/0011-Fix-linking-against-static-harfbuzz.patch +++ b/qt5-base/mingw-w64-angle/0011-Fix-linking-against-static-harfbuzz.patch @@ -25,5 +25,5 @@ index 6530357be9..c5b9b1542a 100644 }, "imf": { -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64-angle/0012-Fix-linking-against-static-pcre.patch b/qt5-base/mingw-w64-angle/0012-Fix-linking-against-static-pcre.patch index d70a5d04..3bdc9e16 100644 --- a/qt5-base/mingw-w64-angle/0012-Fix-linking-against-static-pcre.patch +++ b/qt5-base/mingw-w64-angle/0012-Fix-linking-against-static-pcre.patch @@ -23,5 +23,5 @@ index 4a30daa72c..3d7c811124 100644 QT_BEGIN_NAMESPACE -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64-angle/0013-Fix-linking-against-shared-static-MariaDB.patch b/qt5-base/mingw-w64-angle/0013-Fix-linking-against-shared-static-MariaDB.patch index ebeac864..867f5a16 100644 --- a/qt5-base/mingw-w64-angle/0013-Fix-linking-against-shared-static-MariaDB.patch +++ b/qt5-base/mingw-w64-angle/0013-Fix-linking-against-shared-static-MariaDB.patch @@ -22,5 +22,5 @@ index 96c82e84f9..fce948026f 100644 { "type": "mysqlConfig", "query": "--libs" }, { "libs": "-lmysqlclient_r", "condition": "!config.win32" }, -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64-angle/0014-Fix-linking-against-shared-static-PostgreSQL.patch b/qt5-base/mingw-w64-angle/0014-Fix-linking-against-shared-static-PostgreSQL.patch index 88dba274..9b23c4fd 100644 --- a/qt5-base/mingw-w64-angle/0014-Fix-linking-against-shared-static-PostgreSQL.patch +++ b/qt5-base/mingw-w64-angle/0014-Fix-linking-against-shared-static-PostgreSQL.patch @@ -25,5 +25,5 @@ index fce948026f..f560c191fd 100644 ] }, -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64-angle/0015-Rename-qtmain-to-qt5main.patch b/qt5-base/mingw-w64-angle/0015-Rename-qtmain-to-qt5main.patch index 365bfef9..1c56e39f 100644 --- a/qt5-base/mingw-w64-angle/0015-Rename-qtmain-to-qt5main.patch +++ b/qt5-base/mingw-w64-angle/0015-Rename-qtmain-to-qt5main.patch @@ -52,5 +52,5 @@ index 4140ae48de..9ae73db74b 100644 CONFIG += static -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64-angle/0016-Build-dynamic-host-libraries.patch b/qt5-base/mingw-w64-angle/0016-Build-dynamic-host-libraries.patch index 4c213003..075e2bee 100644 --- a/qt5-base/mingw-w64-angle/0016-Build-dynamic-host-libraries.patch +++ b/qt5-base/mingw-w64-angle/0016-Build-dynamic-host-libraries.patch @@ -34,5 +34,5 @@ index c3ed27d979..30d2114aa1 100644 -INSTALLS = lib +INSTALLS += lib -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64-angle/0017-Enable-rpath-for-build-tools.patch b/qt5-base/mingw-w64-angle/0017-Enable-rpath-for-build-tools.patch index 0569dcf6..7ffb0c48 100644 --- a/qt5-base/mingw-w64-angle/0017-Enable-rpath-for-build-tools.patch +++ b/qt5-base/mingw-w64-angle/0017-Enable-rpath-for-build-tools.patch @@ -31,5 +31,5 @@ index cb84ae0da8..8d9471ed0a 100644 INSTALLS += target -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64-angle/0018-Use-system-zlib-for-build-tools.patch b/qt5-base/mingw-w64-angle/0018-Use-system-zlib-for-build-tools.patch index fa5e8402..a8a975cd 100644 --- a/qt5-base/mingw-w64-angle/0018-Use-system-zlib-for-build-tools.patch +++ b/qt5-base/mingw-w64-angle/0018-Use-system-zlib-for-build-tools.patch @@ -21,5 +21,5 @@ index d51f9e98a4..2242b7c4f1 100644 } else { CONFIG += no_core_dep -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64-angle/0019-Disable-determing-default-include-and-lib-dirs-at-qm.patch b/qt5-base/mingw-w64-angle/0019-Disable-determing-default-include-and-lib-dirs-at-qm.patch index 7658ac08..65a16fca 100644 --- a/qt5-base/mingw-w64-angle/0019-Disable-determing-default-include-and-lib-dirs-at-qm.patch +++ b/qt5-base/mingw-w64-angle/0019-Disable-determing-default-include-and-lib-dirs-at-qm.patch @@ -22,5 +22,5 @@ index 3f266dd2a4..258d374ee0 100644 cmd_prefix = "LC_ALL=C" cmd_suffix = "/dev/null" -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64-angle/0020-Use-.dll.a-as-import-lib-extension.patch b/qt5-base/mingw-w64-angle/0020-Use-.dll.a-as-import-lib-extension.patch index 2bd78073..30669b9d 100644 --- a/qt5-base/mingw-w64-angle/0020-Use-.dll.a-as-import-lib-extension.patch +++ b/qt5-base/mingw-w64-angle/0020-Use-.dll.a-as-import-lib-extension.patch @@ -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.12.2 diff --git a/qt5-base/mingw-w64-angle/0021-Merge-shared-and-static-library-trees.patch b/qt5-base/mingw-w64-angle/0021-Merge-shared-and-static-library-trees.patch index c8997701..d1bd1366 100644 --- a/qt5-base/mingw-w64-angle/0021-Merge-shared-and-static-library-trees.patch +++ b/qt5-base/mingw-w64-angle/0021-Merge-shared-and-static-library-trees.patch @@ -124,5 +124,5 @@ index a762443fe2..8ac3a0f647 100644 t << endl; -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64-angle/0022-Allow-usage-of-static-version-with-CMake.patch b/qt5-base/mingw-w64-angle/0022-Allow-usage-of-static-version-with-CMake.patch index 5136f3e8..ff7cf9ab 100644 --- a/qt5-base/mingw-w64-angle/0022-Allow-usage-of-static-version-with-CMake.patch +++ b/qt5-base/mingw-w64-angle/0022-Allow-usage-of-static-version-with-CMake.patch @@ -994,5 +994,5 @@ index 2a575958ae..8312c90fd1 100644 INTERFACE_COMPILE_DEFINITIONS QT_TESTCASE_BUILDDIR=\\\"\${CMAKE_BINARY_DIR}\\\" ) -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64-angle/0023-Use-correct-pkg-config-static-flag.patch b/qt5-base/mingw-w64-angle/0023-Use-correct-pkg-config-static-flag.patch index 220e3c6a..a0931266 100644 --- a/qt5-base/mingw-w64-angle/0023-Use-correct-pkg-config-static-flag.patch +++ b/qt5-base/mingw-w64-angle/0023-Use-correct-pkg-config-static-flag.patch @@ -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.12.2 diff --git a/qt5-base/mingw-w64-angle/0024-Fix-macro-invoking-moc-rcc-and-uic.patch b/qt5-base/mingw-w64-angle/0024-Fix-macro-invoking-moc-rcc-and-uic.patch new file mode 100644 index 00000000..86ba3a7d --- /dev/null +++ b/qt5-base/mingw-w64-angle/0024-Fix-macro-invoking-moc-rcc-and-uic.patch @@ -0,0 +1,74 @@ +From 4c840dc66e4506e27cbc967e8b236f77132d8eeb Mon Sep 17 00:00:00 2001 +From: Martchus +Date: Sun, 4 Dec 2016 20:35:47 +0100 +Subject: [PATCH 24/30] 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 23909c9f3f..0fa0f187cd 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.12.2 + diff --git a/qt5-base/mingw-w64-angle/0024-Fix-qt5_wrap_ui-macro.patch b/qt5-base/mingw-w64-angle/0024-Fix-qt5_wrap_ui-macro.patch deleted file mode 100644 index 05415808..00000000 --- a/qt5-base/mingw-w64-angle/0024-Fix-qt5_wrap_ui-macro.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 3e3e4a59ab80c311d4158369d456287123151286 Mon Sep 17 00:00:00 2001 -From: Martchus -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/qt5-base/mingw-w64-angle/0025-Ignore-errors-about-missing-feature-static.patch b/qt5-base/mingw-w64-angle/0025-Ignore-errors-about-missing-feature-static.patch index d36f4fe0..3052af4b 100644 --- a/qt5-base/mingw-w64-angle/0025-Ignore-errors-about-missing-feature-static.patch +++ b/qt5-base/mingw-w64-angle/0025-Ignore-errors-about-missing-feature-static.patch @@ -1,4 +1,4 @@ -From 989341ca2c6ab8a256503dacc32ac49a37b9b0cd Mon Sep 17 00:00:00 2001 +From d66dd7d23bc3586779e23297ae61cefe2c69e9fb Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 20:59:54 +0100 Subject: [PATCH 25/30] Ignore errors about missing feature static @@ -32,5 +32,5 @@ index 999cd18154..6bf08ea583 100644 + !equals($$1, "static"): error("Could not find feature $${1}.") } -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64-angle/0026-Enable-and-fix-use-of-iconv.patch b/qt5-base/mingw-w64-angle/0026-Enable-and-fix-use-of-iconv.patch index a70cb381..7987797a 100644 --- a/qt5-base/mingw-w64-angle/0026-Enable-and-fix-use-of-iconv.patch +++ b/qt5-base/mingw-w64-angle/0026-Enable-and-fix-use-of-iconv.patch @@ -1,4 +1,4 @@ -From c8710fe0122cc6847fb11944b657f814872954b5 Mon Sep 17 00:00:00 2001 +From f1909b3049c85c990da430b5842edcd2060e7529 Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 21:08:20 +0100 Subject: [PATCH 26/30] Enable and fix use of iconv @@ -79,5 +79,5 @@ index 0d1954c3a8..32bbe92f57 100644 }, "icu": { -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64-angle/0027-Ignore-failing-pkg-config-test.patch b/qt5-base/mingw-w64-angle/0027-Ignore-failing-pkg-config-test.patch index 3e72c18c..c0e63335 100644 --- a/qt5-base/mingw-w64-angle/0027-Ignore-failing-pkg-config-test.patch +++ b/qt5-base/mingw-w64-angle/0027-Ignore-failing-pkg-config-test.patch @@ -1,4 +1,4 @@ -From 64db0066305a86a66cc304174052de639607d10c Mon Sep 17 00:00:00 2001 +From 180c51b31bfb37355eb63d2ce7b375d242533c1e Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 21:08:48 +0100 Subject: [PATCH 27/30] Ignore failing pkg-config test @@ -21,5 +21,5 @@ index 12714da714..adc54e439c 100644 "publicFeature", { "type": "publicQtConfig", "negative": true }, -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64-angle/0028-Include-uiviewsettingsinterop.h-correctly.patch b/qt5-base/mingw-w64-angle/0028-Include-uiviewsettingsinterop.h-correctly.patch index 7cbf0614..68403556 100644 --- a/qt5-base/mingw-w64-angle/0028-Include-uiviewsettingsinterop.h-correctly.patch +++ b/qt5-base/mingw-w64-angle/0028-Include-uiviewsettingsinterop.h-correctly.patch @@ -1,4 +1,4 @@ -From f598982149077d0cd9aeb51efe47116f3598b8eb Mon Sep 17 00:00:00 2001 +From 101d2b3b5317ca5fab2dfead3982c37fe9682e94 Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 23:41:16 +0100 Subject: [PATCH 28/30] Include uiviewsettingsinterop.h correctly @@ -21,5 +21,5 @@ index 977bbfd11b..12cccd124b 100644 #ifndef HAS_UI_VIEW_SETTINGS_INTEROP -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64-angle/0029-Hardcode-linker-flags-for-libqwindows.dll.patch b/qt5-base/mingw-w64-angle/0029-Hardcode-linker-flags-for-libqwindows.dll.patch index 56059692..ebae87d7 100644 --- a/qt5-base/mingw-w64-angle/0029-Hardcode-linker-flags-for-libqwindows.dll.patch +++ b/qt5-base/mingw-w64-angle/0029-Hardcode-linker-flags-for-libqwindows.dll.patch @@ -1,4 +1,4 @@ -From d73ee96c1fcaab9351d7e8471f2d9c1a0d842377 Mon Sep 17 00:00:00 2001 +From bff29dca9fb69fd29dc4b741652429cbdfb4bf50 Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 23:42:30 +0100 Subject: [PATCH 29/30] Hardcode linker flags for libqwindows.dll @@ -41,5 +41,5 @@ index 23168c10dc..e27cf1a248 100644 include(windows.pri) -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64-angle/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch b/qt5-base/mingw-w64-angle/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch index cefd4b32..98d0fbec 100644 --- a/qt5-base/mingw-w64-angle/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch +++ b/qt5-base/mingw-w64-angle/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch @@ -1,4 +1,4 @@ -From cf89985a2417df8e4519cab3824b239269792e57 Mon Sep 17 00:00:00 2001 +From 8409e69154755c1f8a23fcf4321e76a36342c79e Mon Sep 17 00:00:00 2001 From: Martchus Date: Tue, 7 Feb 2017 18:25:28 +0100 Subject: [PATCH 30/30] Prevent qmake from messing static lib dependencies @@ -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.12.2 diff --git a/qt5-base/mingw-w64-angle/PKGBUILD b/qt5-base/mingw-w64-angle/PKGBUILD index bc956ac0..2d1a5bc7 100644 --- a/qt5-base/mingw-w64-angle/PKGBUILD +++ b/qt5-base/mingw-w64-angle/PKGBUILD @@ -78,7 +78,7 @@ isNoOpenGL() { pkgname=mingw-w64-qt5-base-angle pkgver=5.8.0 -pkgrel=2 +pkgrel=3 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') @@ -116,7 +116,7 @@ source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/sub '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' + '0024-Fix-macro-invoking-moc-rcc-and-uic.patch' '0025-Ignore-errors-about-missing-feature-static.patch' '0026-Enable-and-fix-use-of-iconv.patch' '0027-Ignore-failing-pkg-config-test.patch' @@ -124,36 +124,36 @@ source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/sub '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') + '4f725d3b11329b38e25fed9a1d1d279a' + '6ae90af85ee7212f2097b2e92b0e2c46' + 'bdb2c93fa4e688274691ea8ec2b10907' + '1189a3a1d90a9dfb8b20b2fc92c74cf2' + 'ca7340bab827ae3cb85aadafcb4be783' + '4b1d4a6f45e6ff63e478b77b0bc07138' + '76aa0757e329d49c2d243cf13ebfc991' + '1a4c3201cc8d2096588cdf939f6c4e3a' + '6e9bf21df1c032c2ded111949d6888fa' + '517e525e61777652cc9cc378f53aa75e' + 'c67f73e3ae3f52df548aac14093406b8' + '86eee18e0c8dd0f94155eca48f175a0e' + 'd58a065a408ee7c9831c80de91f5c8af' + 'fc73e39c859b19ee98065305399ae2e2' + '2bc4f40aaac5e62b4e01c7dc1d8a381b' + '1f460216b0074e5deded85f5eb64c0db' + 'e1658603a165f388bc260a70d39d6114' + '8eecb292d3ae281967d2f586f64b1959' + '3ae4ad36bb37cc0793b96c10b98603c0' + '1825be44a99982893849bf12c9c2edbf' + 'a41c9d756c465adf98acedbdf81d3b74' + 'c48cad72d59cc19a48193e5911c84c1c' + '5576070ff3b7263eb0ea61e8ab50017f' + '64f175bb799575f52d26a99924015895' + '450767e45637a132c457b59b365efd8c' + 'd5526f9f6d0e315d5526ad1a7420f35a' + '67f0dcc84e59685dc38eb81097f5df23' + 'f81f75d41c1a9b5421ff090625325405' + '25e7218e60b52eef70c6e9596d844c07' + '5952dd9939639d144f28acc768cff946') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' #_architectures='x86_64-w64-mingw32 i686-w64-mingw32' diff --git a/qt5-base/mingw-w64-dynamic/0001-Add-profile-for-cross-compilation-with-mingw-w64.patch b/qt5-base/mingw-w64-dynamic/0001-Add-profile-for-cross-compilation-with-mingw-w64.patch index 70903bda..1fead784 100644 --- a/qt5-base/mingw-w64-dynamic/0001-Add-profile-for-cross-compilation-with-mingw-w64.patch +++ b/qt5-base/mingw-w64-dynamic/0001-Add-profile-for-cross-compilation-with-mingw-w64.patch @@ -303,5 +303,5 @@ index 0000000000..c5a70b1445 + +#endif // QPLATFORMDEFS_H -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64-dynamic/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch b/qt5-base/mingw-w64-dynamic/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch index 07436f98..4f11faf5 100644 --- a/qt5-base/mingw-w64-dynamic/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch +++ b/qt5-base/mingw-w64-dynamic/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch @@ -23,5 +23,5 @@ index aad48571b3..46f44d8b91 100644 #ifdef Q_ENABLE_OPENGL_FUNCTIONS_DEBUG #include -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64-dynamic/0003-Use-external-ANGLE-library.patch b/qt5-base/mingw-w64-dynamic/0003-Use-external-ANGLE-library.patch index 396b5431..bd80d9b2 100644 --- a/qt5-base/mingw-w64-dynamic/0003-Use-external-ANGLE-library.patch +++ b/qt5-base/mingw-w64-dynamic/0003-Use-external-ANGLE-library.patch @@ -93,5 +93,5 @@ index 90d7e2b76c..92e89ea39f 100644 SUBDIRS += src_3rdparty_libpng src_3rdparty_freetype.depends += src_3rdparty_libpng -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64-dynamic/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch b/qt5-base/mingw-w64-dynamic/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch index 9508bd6c..71cc1428 100644 --- a/qt5-base/mingw-w64-dynamic/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch +++ b/qt5-base/mingw-w64-dynamic/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch @@ -25,5 +25,5 @@ index 1a1022b3a7..792bdf9e7a 100644 HEADERS += opengl/qopengl.h \ opengl/qopengl_p.h \ -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64-dynamic/0005-Make-sure-.pc-files-are-installed-correctly.patch b/qt5-base/mingw-w64-dynamic/0005-Make-sure-.pc-files-are-installed-correctly.patch index 57bad228..59de23d3 100644 --- a/qt5-base/mingw-w64-dynamic/0005-Make-sure-.pc-files-are-installed-correctly.patch +++ b/qt5-base/mingw-w64-dynamic/0005-Make-sure-.pc-files-are-installed-correctly.patch @@ -62,5 +62,5 @@ index 3c029c8004..caa000ea53 100644 uninst.append("\n\t"); uninst.append("-$(DEL_FILE) " + escapeFilePath(dst_pc)); -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64-dynamic/0006-Don-t-add-resource-files-to-LIBS-parameter.patch b/qt5-base/mingw-w64-dynamic/0006-Don-t-add-resource-files-to-LIBS-parameter.patch index 9da2a9df..401d5045 100644 --- a/qt5-base/mingw-w64-dynamic/0006-Don-t-add-resource-files-to-LIBS-parameter.patch +++ b/qt5-base/mingw-w64-dynamic/0006-Don-t-add-resource-files-to-LIBS-parameter.patch @@ -24,5 +24,5 @@ index 8d5a9a7d0f..d2cf8d9afc 100644 if (project->isActiveConfig("dll")) { QString destDir = ""; -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64-dynamic/0007-Prevent-debug-library-names-in-pkg-config-files.patch b/qt5-base/mingw-w64-dynamic/0007-Prevent-debug-library-names-in-pkg-config-files.patch index 2b360f34..a4266bab 100644 --- a/qt5-base/mingw-w64-dynamic/0007-Prevent-debug-library-names-in-pkg-config-files.patch +++ b/qt5-base/mingw-w64-dynamic/0007-Prevent-debug-library-names-in-pkg-config-files.patch @@ -29,5 +29,5 @@ index 182fe79238..a762443fe2 100644 QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString(); if(!subdir.isEmpty()) { -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64-dynamic/0008-Fix-linking-against-shared-static-libpng.patch b/qt5-base/mingw-w64-dynamic/0008-Fix-linking-against-shared-static-libpng.patch index fdc684a5..048bcd46 100644 --- a/qt5-base/mingw-w64-dynamic/0008-Fix-linking-against-shared-static-libpng.patch +++ b/qt5-base/mingw-w64-dynamic/0008-Fix-linking-against-shared-static-libpng.patch @@ -22,5 +22,5 @@ index 1f5011617c..5006ff5a3a 100644 }, "mirclient": { -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64-dynamic/0009-Fix-linking-against-static-D-Bus.patch b/qt5-base/mingw-w64-dynamic/0009-Fix-linking-against-static-D-Bus.patch index dd755274..cb456399 100644 --- a/qt5-base/mingw-w64-dynamic/0009-Fix-linking-against-static-D-Bus.patch +++ b/qt5-base/mingw-w64-dynamic/0009-Fix-linking-against-static-D-Bus.patch @@ -62,5 +62,5 @@ index cfc0e12046..65f1397cd6 100644 # include #else -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64-dynamic/0010-Fix-linking-against-static-freetype2.patch b/qt5-base/mingw-w64-dynamic/0010-Fix-linking-against-static-freetype2.patch index 406fff4b..bc76d2c4 100644 --- a/qt5-base/mingw-w64-dynamic/0010-Fix-linking-against-static-freetype2.patch +++ b/qt5-base/mingw-w64-dynamic/0010-Fix-linking-against-static-freetype2.patch @@ -26,5 +26,5 @@ index 5006ff5a3a..6530357be9 100644 }, "fontconfig": { -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64-dynamic/0011-Fix-linking-against-static-harfbuzz.patch b/qt5-base/mingw-w64-dynamic/0011-Fix-linking-against-static-harfbuzz.patch index a4abc606..cc8dfe77 100644 --- a/qt5-base/mingw-w64-dynamic/0011-Fix-linking-against-static-harfbuzz.patch +++ b/qt5-base/mingw-w64-dynamic/0011-Fix-linking-against-static-harfbuzz.patch @@ -25,5 +25,5 @@ index 6530357be9..c5b9b1542a 100644 }, "imf": { -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64-dynamic/0012-Fix-linking-against-static-pcre.patch b/qt5-base/mingw-w64-dynamic/0012-Fix-linking-against-static-pcre.patch index d70a5d04..3bdc9e16 100644 --- a/qt5-base/mingw-w64-dynamic/0012-Fix-linking-against-static-pcre.patch +++ b/qt5-base/mingw-w64-dynamic/0012-Fix-linking-against-static-pcre.patch @@ -23,5 +23,5 @@ index 4a30daa72c..3d7c811124 100644 QT_BEGIN_NAMESPACE -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64-dynamic/0013-Fix-linking-against-shared-static-MariaDB.patch b/qt5-base/mingw-w64-dynamic/0013-Fix-linking-against-shared-static-MariaDB.patch index ebeac864..867f5a16 100644 --- a/qt5-base/mingw-w64-dynamic/0013-Fix-linking-against-shared-static-MariaDB.patch +++ b/qt5-base/mingw-w64-dynamic/0013-Fix-linking-against-shared-static-MariaDB.patch @@ -22,5 +22,5 @@ index 96c82e84f9..fce948026f 100644 { "type": "mysqlConfig", "query": "--libs" }, { "libs": "-lmysqlclient_r", "condition": "!config.win32" }, -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64-dynamic/0014-Fix-linking-against-shared-static-PostgreSQL.patch b/qt5-base/mingw-w64-dynamic/0014-Fix-linking-against-shared-static-PostgreSQL.patch index 88dba274..9b23c4fd 100644 --- a/qt5-base/mingw-w64-dynamic/0014-Fix-linking-against-shared-static-PostgreSQL.patch +++ b/qt5-base/mingw-w64-dynamic/0014-Fix-linking-against-shared-static-PostgreSQL.patch @@ -25,5 +25,5 @@ index fce948026f..f560c191fd 100644 ] }, -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64-dynamic/0015-Rename-qtmain-to-qt5main.patch b/qt5-base/mingw-w64-dynamic/0015-Rename-qtmain-to-qt5main.patch index 365bfef9..1c56e39f 100644 --- a/qt5-base/mingw-w64-dynamic/0015-Rename-qtmain-to-qt5main.patch +++ b/qt5-base/mingw-w64-dynamic/0015-Rename-qtmain-to-qt5main.patch @@ -52,5 +52,5 @@ index 4140ae48de..9ae73db74b 100644 CONFIG += static -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64-dynamic/0016-Build-dynamic-host-libraries.patch b/qt5-base/mingw-w64-dynamic/0016-Build-dynamic-host-libraries.patch index 4c213003..075e2bee 100644 --- a/qt5-base/mingw-w64-dynamic/0016-Build-dynamic-host-libraries.patch +++ b/qt5-base/mingw-w64-dynamic/0016-Build-dynamic-host-libraries.patch @@ -34,5 +34,5 @@ index c3ed27d979..30d2114aa1 100644 -INSTALLS = lib +INSTALLS += lib -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64-dynamic/0017-Enable-rpath-for-build-tools.patch b/qt5-base/mingw-w64-dynamic/0017-Enable-rpath-for-build-tools.patch index 0569dcf6..7ffb0c48 100644 --- a/qt5-base/mingw-w64-dynamic/0017-Enable-rpath-for-build-tools.patch +++ b/qt5-base/mingw-w64-dynamic/0017-Enable-rpath-for-build-tools.patch @@ -31,5 +31,5 @@ index cb84ae0da8..8d9471ed0a 100644 INSTALLS += target -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64-dynamic/0018-Use-system-zlib-for-build-tools.patch b/qt5-base/mingw-w64-dynamic/0018-Use-system-zlib-for-build-tools.patch index fa5e8402..a8a975cd 100644 --- a/qt5-base/mingw-w64-dynamic/0018-Use-system-zlib-for-build-tools.patch +++ b/qt5-base/mingw-w64-dynamic/0018-Use-system-zlib-for-build-tools.patch @@ -21,5 +21,5 @@ index d51f9e98a4..2242b7c4f1 100644 } else { CONFIG += no_core_dep -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64-dynamic/0019-Disable-determing-default-include-and-lib-dirs-at-qm.patch b/qt5-base/mingw-w64-dynamic/0019-Disable-determing-default-include-and-lib-dirs-at-qm.patch index 7658ac08..65a16fca 100644 --- a/qt5-base/mingw-w64-dynamic/0019-Disable-determing-default-include-and-lib-dirs-at-qm.patch +++ b/qt5-base/mingw-w64-dynamic/0019-Disable-determing-default-include-and-lib-dirs-at-qm.patch @@ -22,5 +22,5 @@ index 3f266dd2a4..258d374ee0 100644 cmd_prefix = "LC_ALL=C" cmd_suffix = "/dev/null" -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64-dynamic/0020-Use-.dll.a-as-import-lib-extension.patch b/qt5-base/mingw-w64-dynamic/0020-Use-.dll.a-as-import-lib-extension.patch index 2bd78073..30669b9d 100644 --- a/qt5-base/mingw-w64-dynamic/0020-Use-.dll.a-as-import-lib-extension.patch +++ b/qt5-base/mingw-w64-dynamic/0020-Use-.dll.a-as-import-lib-extension.patch @@ -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.12.2 diff --git a/qt5-base/mingw-w64-dynamic/0021-Merge-shared-and-static-library-trees.patch b/qt5-base/mingw-w64-dynamic/0021-Merge-shared-and-static-library-trees.patch index c8997701..d1bd1366 100644 --- a/qt5-base/mingw-w64-dynamic/0021-Merge-shared-and-static-library-trees.patch +++ b/qt5-base/mingw-w64-dynamic/0021-Merge-shared-and-static-library-trees.patch @@ -124,5 +124,5 @@ index a762443fe2..8ac3a0f647 100644 t << endl; -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64-dynamic/0022-Allow-usage-of-static-version-with-CMake.patch b/qt5-base/mingw-w64-dynamic/0022-Allow-usage-of-static-version-with-CMake.patch index 5136f3e8..ff7cf9ab 100644 --- a/qt5-base/mingw-w64-dynamic/0022-Allow-usage-of-static-version-with-CMake.patch +++ b/qt5-base/mingw-w64-dynamic/0022-Allow-usage-of-static-version-with-CMake.patch @@ -994,5 +994,5 @@ index 2a575958ae..8312c90fd1 100644 INTERFACE_COMPILE_DEFINITIONS QT_TESTCASE_BUILDDIR=\\\"\${CMAKE_BINARY_DIR}\\\" ) -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64-dynamic/0023-Use-correct-pkg-config-static-flag.patch b/qt5-base/mingw-w64-dynamic/0023-Use-correct-pkg-config-static-flag.patch index 220e3c6a..a0931266 100644 --- a/qt5-base/mingw-w64-dynamic/0023-Use-correct-pkg-config-static-flag.patch +++ b/qt5-base/mingw-w64-dynamic/0023-Use-correct-pkg-config-static-flag.patch @@ -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.12.2 diff --git a/qt5-base/mingw-w64-dynamic/0024-Fix-macro-invoking-moc-rcc-and-uic.patch b/qt5-base/mingw-w64-dynamic/0024-Fix-macro-invoking-moc-rcc-and-uic.patch new file mode 100644 index 00000000..86ba3a7d --- /dev/null +++ b/qt5-base/mingw-w64-dynamic/0024-Fix-macro-invoking-moc-rcc-and-uic.patch @@ -0,0 +1,74 @@ +From 4c840dc66e4506e27cbc967e8b236f77132d8eeb Mon Sep 17 00:00:00 2001 +From: Martchus +Date: Sun, 4 Dec 2016 20:35:47 +0100 +Subject: [PATCH 24/30] 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 23909c9f3f..0fa0f187cd 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.12.2 + diff --git a/qt5-base/mingw-w64-dynamic/0024-Fix-qt5_wrap_ui-macro.patch b/qt5-base/mingw-w64-dynamic/0024-Fix-qt5_wrap_ui-macro.patch deleted file mode 100644 index 05415808..00000000 --- a/qt5-base/mingw-w64-dynamic/0024-Fix-qt5_wrap_ui-macro.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 3e3e4a59ab80c311d4158369d456287123151286 Mon Sep 17 00:00:00 2001 -From: Martchus -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/qt5-base/mingw-w64-dynamic/0025-Ignore-errors-about-missing-feature-static.patch b/qt5-base/mingw-w64-dynamic/0025-Ignore-errors-about-missing-feature-static.patch index d36f4fe0..3052af4b 100644 --- a/qt5-base/mingw-w64-dynamic/0025-Ignore-errors-about-missing-feature-static.patch +++ b/qt5-base/mingw-w64-dynamic/0025-Ignore-errors-about-missing-feature-static.patch @@ -1,4 +1,4 @@ -From 989341ca2c6ab8a256503dacc32ac49a37b9b0cd Mon Sep 17 00:00:00 2001 +From d66dd7d23bc3586779e23297ae61cefe2c69e9fb Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 20:59:54 +0100 Subject: [PATCH 25/30] Ignore errors about missing feature static @@ -32,5 +32,5 @@ index 999cd18154..6bf08ea583 100644 + !equals($$1, "static"): error("Could not find feature $${1}.") } -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64-dynamic/0026-Enable-and-fix-use-of-iconv.patch b/qt5-base/mingw-w64-dynamic/0026-Enable-and-fix-use-of-iconv.patch index a70cb381..7987797a 100644 --- a/qt5-base/mingw-w64-dynamic/0026-Enable-and-fix-use-of-iconv.patch +++ b/qt5-base/mingw-w64-dynamic/0026-Enable-and-fix-use-of-iconv.patch @@ -1,4 +1,4 @@ -From c8710fe0122cc6847fb11944b657f814872954b5 Mon Sep 17 00:00:00 2001 +From f1909b3049c85c990da430b5842edcd2060e7529 Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 21:08:20 +0100 Subject: [PATCH 26/30] Enable and fix use of iconv @@ -79,5 +79,5 @@ index 0d1954c3a8..32bbe92f57 100644 }, "icu": { -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64-dynamic/0027-Ignore-failing-pkg-config-test.patch b/qt5-base/mingw-w64-dynamic/0027-Ignore-failing-pkg-config-test.patch index 3e72c18c..c0e63335 100644 --- a/qt5-base/mingw-w64-dynamic/0027-Ignore-failing-pkg-config-test.patch +++ b/qt5-base/mingw-w64-dynamic/0027-Ignore-failing-pkg-config-test.patch @@ -1,4 +1,4 @@ -From 64db0066305a86a66cc304174052de639607d10c Mon Sep 17 00:00:00 2001 +From 180c51b31bfb37355eb63d2ce7b375d242533c1e Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 21:08:48 +0100 Subject: [PATCH 27/30] Ignore failing pkg-config test @@ -21,5 +21,5 @@ index 12714da714..adc54e439c 100644 "publicFeature", { "type": "publicQtConfig", "negative": true }, -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64-dynamic/0028-Include-uiviewsettingsinterop.h-correctly.patch b/qt5-base/mingw-w64-dynamic/0028-Include-uiviewsettingsinterop.h-correctly.patch index 7cbf0614..68403556 100644 --- a/qt5-base/mingw-w64-dynamic/0028-Include-uiviewsettingsinterop.h-correctly.patch +++ b/qt5-base/mingw-w64-dynamic/0028-Include-uiviewsettingsinterop.h-correctly.patch @@ -1,4 +1,4 @@ -From f598982149077d0cd9aeb51efe47116f3598b8eb Mon Sep 17 00:00:00 2001 +From 101d2b3b5317ca5fab2dfead3982c37fe9682e94 Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 23:41:16 +0100 Subject: [PATCH 28/30] Include uiviewsettingsinterop.h correctly @@ -21,5 +21,5 @@ index 977bbfd11b..12cccd124b 100644 #ifndef HAS_UI_VIEW_SETTINGS_INTEROP -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64-dynamic/0029-Hardcode-linker-flags-for-libqwindows.dll.patch b/qt5-base/mingw-w64-dynamic/0029-Hardcode-linker-flags-for-libqwindows.dll.patch index 56059692..ebae87d7 100644 --- a/qt5-base/mingw-w64-dynamic/0029-Hardcode-linker-flags-for-libqwindows.dll.patch +++ b/qt5-base/mingw-w64-dynamic/0029-Hardcode-linker-flags-for-libqwindows.dll.patch @@ -1,4 +1,4 @@ -From d73ee96c1fcaab9351d7e8471f2d9c1a0d842377 Mon Sep 17 00:00:00 2001 +From bff29dca9fb69fd29dc4b741652429cbdfb4bf50 Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 23:42:30 +0100 Subject: [PATCH 29/30] Hardcode linker flags for libqwindows.dll @@ -41,5 +41,5 @@ index 23168c10dc..e27cf1a248 100644 include(windows.pri) -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64-dynamic/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch b/qt5-base/mingw-w64-dynamic/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch index cefd4b32..98d0fbec 100644 --- a/qt5-base/mingw-w64-dynamic/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch +++ b/qt5-base/mingw-w64-dynamic/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch @@ -1,4 +1,4 @@ -From cf89985a2417df8e4519cab3824b239269792e57 Mon Sep 17 00:00:00 2001 +From 8409e69154755c1f8a23fcf4321e76a36342c79e Mon Sep 17 00:00:00 2001 From: Martchus Date: Tue, 7 Feb 2017 18:25:28 +0100 Subject: [PATCH 30/30] Prevent qmake from messing static lib dependencies @@ -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.12.2 diff --git a/qt5-base/mingw-w64-dynamic/PKGBUILD b/qt5-base/mingw-w64-dynamic/PKGBUILD index 421eedb8..00af0dc2 100644 --- a/qt5-base/mingw-w64-dynamic/PKGBUILD +++ b/qt5-base/mingw-w64-dynamic/PKGBUILD @@ -78,7 +78,7 @@ isNoOpenGL() { pkgname=mingw-w64-qt5-base-dynamic pkgver=5.8.0 -pkgrel=2 +pkgrel=3 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') @@ -116,7 +116,7 @@ source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/sub '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' + '0024-Fix-macro-invoking-moc-rcc-and-uic.patch' '0025-Ignore-errors-about-missing-feature-static.patch' '0026-Enable-and-fix-use-of-iconv.patch' '0027-Ignore-failing-pkg-config-test.patch' @@ -124,36 +124,36 @@ source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/sub '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') + '4f725d3b11329b38e25fed9a1d1d279a' + '6ae90af85ee7212f2097b2e92b0e2c46' + 'bdb2c93fa4e688274691ea8ec2b10907' + '1189a3a1d90a9dfb8b20b2fc92c74cf2' + 'ca7340bab827ae3cb85aadafcb4be783' + '4b1d4a6f45e6ff63e478b77b0bc07138' + '76aa0757e329d49c2d243cf13ebfc991' + '1a4c3201cc8d2096588cdf939f6c4e3a' + '6e9bf21df1c032c2ded111949d6888fa' + '517e525e61777652cc9cc378f53aa75e' + 'c67f73e3ae3f52df548aac14093406b8' + '86eee18e0c8dd0f94155eca48f175a0e' + 'd58a065a408ee7c9831c80de91f5c8af' + 'fc73e39c859b19ee98065305399ae2e2' + '2bc4f40aaac5e62b4e01c7dc1d8a381b' + '1f460216b0074e5deded85f5eb64c0db' + 'e1658603a165f388bc260a70d39d6114' + '8eecb292d3ae281967d2f586f64b1959' + '3ae4ad36bb37cc0793b96c10b98603c0' + '1825be44a99982893849bf12c9c2edbf' + 'a41c9d756c465adf98acedbdf81d3b74' + 'c48cad72d59cc19a48193e5911c84c1c' + '5576070ff3b7263eb0ea61e8ab50017f' + '64f175bb799575f52d26a99924015895' + '450767e45637a132c457b59b365efd8c' + 'd5526f9f6d0e315d5526ad1a7420f35a' + '67f0dcc84e59685dc38eb81097f5df23' + 'f81f75d41c1a9b5421ff090625325405' + '25e7218e60b52eef70c6e9596d844c07' + '5952dd9939639d144f28acc768cff946') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' #_architectures='x86_64-w64-mingw32 i686-w64-mingw32' diff --git a/qt5-base/mingw-w64-static/0001-Add-profile-for-cross-compilation-with-mingw-w64.patch b/qt5-base/mingw-w64-static/0001-Add-profile-for-cross-compilation-with-mingw-w64.patch index 70903bda..1fead784 100644 --- a/qt5-base/mingw-w64-static/0001-Add-profile-for-cross-compilation-with-mingw-w64.patch +++ b/qt5-base/mingw-w64-static/0001-Add-profile-for-cross-compilation-with-mingw-w64.patch @@ -303,5 +303,5 @@ index 0000000000..c5a70b1445 + +#endif // QPLATFORMDEFS_H -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64-static/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch b/qt5-base/mingw-w64-static/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch index 07436f98..4f11faf5 100644 --- a/qt5-base/mingw-w64-static/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch +++ b/qt5-base/mingw-w64-static/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch @@ -23,5 +23,5 @@ index aad48571b3..46f44d8b91 100644 #ifdef Q_ENABLE_OPENGL_FUNCTIONS_DEBUG #include -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64-static/0003-Use-external-ANGLE-library.patch b/qt5-base/mingw-w64-static/0003-Use-external-ANGLE-library.patch index 396b5431..bd80d9b2 100644 --- a/qt5-base/mingw-w64-static/0003-Use-external-ANGLE-library.patch +++ b/qt5-base/mingw-w64-static/0003-Use-external-ANGLE-library.patch @@ -93,5 +93,5 @@ index 90d7e2b76c..92e89ea39f 100644 SUBDIRS += src_3rdparty_libpng src_3rdparty_freetype.depends += src_3rdparty_libpng -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64-static/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch b/qt5-base/mingw-w64-static/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch index 9508bd6c..71cc1428 100644 --- a/qt5-base/mingw-w64-static/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch +++ b/qt5-base/mingw-w64-static/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch @@ -25,5 +25,5 @@ index 1a1022b3a7..792bdf9e7a 100644 HEADERS += opengl/qopengl.h \ opengl/qopengl_p.h \ -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64-static/0005-Make-sure-.pc-files-are-installed-correctly.patch b/qt5-base/mingw-w64-static/0005-Make-sure-.pc-files-are-installed-correctly.patch index 57bad228..59de23d3 100644 --- a/qt5-base/mingw-w64-static/0005-Make-sure-.pc-files-are-installed-correctly.patch +++ b/qt5-base/mingw-w64-static/0005-Make-sure-.pc-files-are-installed-correctly.patch @@ -62,5 +62,5 @@ index 3c029c8004..caa000ea53 100644 uninst.append("\n\t"); uninst.append("-$(DEL_FILE) " + escapeFilePath(dst_pc)); -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64-static/0006-Don-t-add-resource-files-to-LIBS-parameter.patch b/qt5-base/mingw-w64-static/0006-Don-t-add-resource-files-to-LIBS-parameter.patch index 9da2a9df..401d5045 100644 --- a/qt5-base/mingw-w64-static/0006-Don-t-add-resource-files-to-LIBS-parameter.patch +++ b/qt5-base/mingw-w64-static/0006-Don-t-add-resource-files-to-LIBS-parameter.patch @@ -24,5 +24,5 @@ index 8d5a9a7d0f..d2cf8d9afc 100644 if (project->isActiveConfig("dll")) { QString destDir = ""; -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64-static/0007-Prevent-debug-library-names-in-pkg-config-files.patch b/qt5-base/mingw-w64-static/0007-Prevent-debug-library-names-in-pkg-config-files.patch index 2b360f34..a4266bab 100644 --- a/qt5-base/mingw-w64-static/0007-Prevent-debug-library-names-in-pkg-config-files.patch +++ b/qt5-base/mingw-w64-static/0007-Prevent-debug-library-names-in-pkg-config-files.patch @@ -29,5 +29,5 @@ index 182fe79238..a762443fe2 100644 QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString(); if(!subdir.isEmpty()) { -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64-static/0008-Fix-linking-against-shared-static-libpng.patch b/qt5-base/mingw-w64-static/0008-Fix-linking-against-shared-static-libpng.patch index fdc684a5..048bcd46 100644 --- a/qt5-base/mingw-w64-static/0008-Fix-linking-against-shared-static-libpng.patch +++ b/qt5-base/mingw-w64-static/0008-Fix-linking-against-shared-static-libpng.patch @@ -22,5 +22,5 @@ index 1f5011617c..5006ff5a3a 100644 }, "mirclient": { -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64-static/0009-Fix-linking-against-static-D-Bus.patch b/qt5-base/mingw-w64-static/0009-Fix-linking-against-static-D-Bus.patch index dd755274..cb456399 100644 --- a/qt5-base/mingw-w64-static/0009-Fix-linking-against-static-D-Bus.patch +++ b/qt5-base/mingw-w64-static/0009-Fix-linking-against-static-D-Bus.patch @@ -62,5 +62,5 @@ index cfc0e12046..65f1397cd6 100644 # include #else -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64-static/0010-Fix-linking-against-static-freetype2.patch b/qt5-base/mingw-w64-static/0010-Fix-linking-against-static-freetype2.patch index 406fff4b..bc76d2c4 100644 --- a/qt5-base/mingw-w64-static/0010-Fix-linking-against-static-freetype2.patch +++ b/qt5-base/mingw-w64-static/0010-Fix-linking-against-static-freetype2.patch @@ -26,5 +26,5 @@ index 5006ff5a3a..6530357be9 100644 }, "fontconfig": { -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64-static/0011-Fix-linking-against-static-harfbuzz.patch b/qt5-base/mingw-w64-static/0011-Fix-linking-against-static-harfbuzz.patch index a4abc606..cc8dfe77 100644 --- a/qt5-base/mingw-w64-static/0011-Fix-linking-against-static-harfbuzz.patch +++ b/qt5-base/mingw-w64-static/0011-Fix-linking-against-static-harfbuzz.patch @@ -25,5 +25,5 @@ index 6530357be9..c5b9b1542a 100644 }, "imf": { -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64-static/0012-Fix-linking-against-static-pcre.patch b/qt5-base/mingw-w64-static/0012-Fix-linking-against-static-pcre.patch index d70a5d04..3bdc9e16 100644 --- a/qt5-base/mingw-w64-static/0012-Fix-linking-against-static-pcre.patch +++ b/qt5-base/mingw-w64-static/0012-Fix-linking-against-static-pcre.patch @@ -23,5 +23,5 @@ index 4a30daa72c..3d7c811124 100644 QT_BEGIN_NAMESPACE -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64-static/0013-Fix-linking-against-shared-static-MariaDB.patch b/qt5-base/mingw-w64-static/0013-Fix-linking-against-shared-static-MariaDB.patch index ebeac864..867f5a16 100644 --- a/qt5-base/mingw-w64-static/0013-Fix-linking-against-shared-static-MariaDB.patch +++ b/qt5-base/mingw-w64-static/0013-Fix-linking-against-shared-static-MariaDB.patch @@ -22,5 +22,5 @@ index 96c82e84f9..fce948026f 100644 { "type": "mysqlConfig", "query": "--libs" }, { "libs": "-lmysqlclient_r", "condition": "!config.win32" }, -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64-static/0014-Fix-linking-against-shared-static-PostgreSQL.patch b/qt5-base/mingw-w64-static/0014-Fix-linking-against-shared-static-PostgreSQL.patch index 88dba274..9b23c4fd 100644 --- a/qt5-base/mingw-w64-static/0014-Fix-linking-against-shared-static-PostgreSQL.patch +++ b/qt5-base/mingw-w64-static/0014-Fix-linking-against-shared-static-PostgreSQL.patch @@ -25,5 +25,5 @@ index fce948026f..f560c191fd 100644 ] }, -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64-static/0015-Rename-qtmain-to-qt5main.patch b/qt5-base/mingw-w64-static/0015-Rename-qtmain-to-qt5main.patch index 365bfef9..1c56e39f 100644 --- a/qt5-base/mingw-w64-static/0015-Rename-qtmain-to-qt5main.patch +++ b/qt5-base/mingw-w64-static/0015-Rename-qtmain-to-qt5main.patch @@ -52,5 +52,5 @@ index 4140ae48de..9ae73db74b 100644 CONFIG += static -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64-static/0016-Build-dynamic-host-libraries.patch b/qt5-base/mingw-w64-static/0016-Build-dynamic-host-libraries.patch index 4c213003..075e2bee 100644 --- a/qt5-base/mingw-w64-static/0016-Build-dynamic-host-libraries.patch +++ b/qt5-base/mingw-w64-static/0016-Build-dynamic-host-libraries.patch @@ -34,5 +34,5 @@ index c3ed27d979..30d2114aa1 100644 -INSTALLS = lib +INSTALLS += lib -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64-static/0017-Enable-rpath-for-build-tools.patch b/qt5-base/mingw-w64-static/0017-Enable-rpath-for-build-tools.patch index 0569dcf6..7ffb0c48 100644 --- a/qt5-base/mingw-w64-static/0017-Enable-rpath-for-build-tools.patch +++ b/qt5-base/mingw-w64-static/0017-Enable-rpath-for-build-tools.patch @@ -31,5 +31,5 @@ index cb84ae0da8..8d9471ed0a 100644 INSTALLS += target -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64-static/0018-Use-system-zlib-for-build-tools.patch b/qt5-base/mingw-w64-static/0018-Use-system-zlib-for-build-tools.patch index fa5e8402..a8a975cd 100644 --- a/qt5-base/mingw-w64-static/0018-Use-system-zlib-for-build-tools.patch +++ b/qt5-base/mingw-w64-static/0018-Use-system-zlib-for-build-tools.patch @@ -21,5 +21,5 @@ index d51f9e98a4..2242b7c4f1 100644 } else { CONFIG += no_core_dep -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64-static/0019-Disable-determing-default-include-and-lib-dirs-at-qm.patch b/qt5-base/mingw-w64-static/0019-Disable-determing-default-include-and-lib-dirs-at-qm.patch index 7658ac08..65a16fca 100644 --- a/qt5-base/mingw-w64-static/0019-Disable-determing-default-include-and-lib-dirs-at-qm.patch +++ b/qt5-base/mingw-w64-static/0019-Disable-determing-default-include-and-lib-dirs-at-qm.patch @@ -22,5 +22,5 @@ index 3f266dd2a4..258d374ee0 100644 cmd_prefix = "LC_ALL=C" cmd_suffix = "/dev/null" -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64-static/0020-Use-.dll.a-as-import-lib-extension.patch b/qt5-base/mingw-w64-static/0020-Use-.dll.a-as-import-lib-extension.patch index 2bd78073..30669b9d 100644 --- a/qt5-base/mingw-w64-static/0020-Use-.dll.a-as-import-lib-extension.patch +++ b/qt5-base/mingw-w64-static/0020-Use-.dll.a-as-import-lib-extension.patch @@ -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.12.2 diff --git a/qt5-base/mingw-w64-static/0021-Merge-shared-and-static-library-trees.patch b/qt5-base/mingw-w64-static/0021-Merge-shared-and-static-library-trees.patch index c8997701..d1bd1366 100644 --- a/qt5-base/mingw-w64-static/0021-Merge-shared-and-static-library-trees.patch +++ b/qt5-base/mingw-w64-static/0021-Merge-shared-and-static-library-trees.patch @@ -124,5 +124,5 @@ index a762443fe2..8ac3a0f647 100644 t << endl; -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64-static/0022-Allow-usage-of-static-version-with-CMake.patch b/qt5-base/mingw-w64-static/0022-Allow-usage-of-static-version-with-CMake.patch index 5136f3e8..ff7cf9ab 100644 --- a/qt5-base/mingw-w64-static/0022-Allow-usage-of-static-version-with-CMake.patch +++ b/qt5-base/mingw-w64-static/0022-Allow-usage-of-static-version-with-CMake.patch @@ -994,5 +994,5 @@ index 2a575958ae..8312c90fd1 100644 INTERFACE_COMPILE_DEFINITIONS QT_TESTCASE_BUILDDIR=\\\"\${CMAKE_BINARY_DIR}\\\" ) -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64-static/0023-Use-correct-pkg-config-static-flag.patch b/qt5-base/mingw-w64-static/0023-Use-correct-pkg-config-static-flag.patch index 220e3c6a..a0931266 100644 --- a/qt5-base/mingw-w64-static/0023-Use-correct-pkg-config-static-flag.patch +++ b/qt5-base/mingw-w64-static/0023-Use-correct-pkg-config-static-flag.patch @@ -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.12.2 diff --git a/qt5-base/mingw-w64-static/0024-Fix-macro-invoking-moc-rcc-and-uic.patch b/qt5-base/mingw-w64-static/0024-Fix-macro-invoking-moc-rcc-and-uic.patch new file mode 100644 index 00000000..86ba3a7d --- /dev/null +++ b/qt5-base/mingw-w64-static/0024-Fix-macro-invoking-moc-rcc-and-uic.patch @@ -0,0 +1,74 @@ +From 4c840dc66e4506e27cbc967e8b236f77132d8eeb Mon Sep 17 00:00:00 2001 +From: Martchus +Date: Sun, 4 Dec 2016 20:35:47 +0100 +Subject: [PATCH 24/30] 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 23909c9f3f..0fa0f187cd 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.12.2 + diff --git a/qt5-base/mingw-w64-static/0024-Fix-qt5_wrap_ui-macro.patch b/qt5-base/mingw-w64-static/0024-Fix-qt5_wrap_ui-macro.patch deleted file mode 100644 index 05415808..00000000 --- a/qt5-base/mingw-w64-static/0024-Fix-qt5_wrap_ui-macro.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 3e3e4a59ab80c311d4158369d456287123151286 Mon Sep 17 00:00:00 2001 -From: Martchus -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/qt5-base/mingw-w64-static/0025-Ignore-errors-about-missing-feature-static.patch b/qt5-base/mingw-w64-static/0025-Ignore-errors-about-missing-feature-static.patch index d36f4fe0..3052af4b 100644 --- a/qt5-base/mingw-w64-static/0025-Ignore-errors-about-missing-feature-static.patch +++ b/qt5-base/mingw-w64-static/0025-Ignore-errors-about-missing-feature-static.patch @@ -1,4 +1,4 @@ -From 989341ca2c6ab8a256503dacc32ac49a37b9b0cd Mon Sep 17 00:00:00 2001 +From d66dd7d23bc3586779e23297ae61cefe2c69e9fb Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 20:59:54 +0100 Subject: [PATCH 25/30] Ignore errors about missing feature static @@ -32,5 +32,5 @@ index 999cd18154..6bf08ea583 100644 + !equals($$1, "static"): error("Could not find feature $${1}.") } -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64-static/0026-Enable-and-fix-use-of-iconv.patch b/qt5-base/mingw-w64-static/0026-Enable-and-fix-use-of-iconv.patch index a70cb381..7987797a 100644 --- a/qt5-base/mingw-w64-static/0026-Enable-and-fix-use-of-iconv.patch +++ b/qt5-base/mingw-w64-static/0026-Enable-and-fix-use-of-iconv.patch @@ -1,4 +1,4 @@ -From c8710fe0122cc6847fb11944b657f814872954b5 Mon Sep 17 00:00:00 2001 +From f1909b3049c85c990da430b5842edcd2060e7529 Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 21:08:20 +0100 Subject: [PATCH 26/30] Enable and fix use of iconv @@ -79,5 +79,5 @@ index 0d1954c3a8..32bbe92f57 100644 }, "icu": { -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64-static/0027-Ignore-failing-pkg-config-test.patch b/qt5-base/mingw-w64-static/0027-Ignore-failing-pkg-config-test.patch index 3e72c18c..c0e63335 100644 --- a/qt5-base/mingw-w64-static/0027-Ignore-failing-pkg-config-test.patch +++ b/qt5-base/mingw-w64-static/0027-Ignore-failing-pkg-config-test.patch @@ -1,4 +1,4 @@ -From 64db0066305a86a66cc304174052de639607d10c Mon Sep 17 00:00:00 2001 +From 180c51b31bfb37355eb63d2ce7b375d242533c1e Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 21:08:48 +0100 Subject: [PATCH 27/30] Ignore failing pkg-config test @@ -21,5 +21,5 @@ index 12714da714..adc54e439c 100644 "publicFeature", { "type": "publicQtConfig", "negative": true }, -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64-static/0028-Include-uiviewsettingsinterop.h-correctly.patch b/qt5-base/mingw-w64-static/0028-Include-uiviewsettingsinterop.h-correctly.patch index 7cbf0614..68403556 100644 --- a/qt5-base/mingw-w64-static/0028-Include-uiviewsettingsinterop.h-correctly.patch +++ b/qt5-base/mingw-w64-static/0028-Include-uiviewsettingsinterop.h-correctly.patch @@ -1,4 +1,4 @@ -From f598982149077d0cd9aeb51efe47116f3598b8eb Mon Sep 17 00:00:00 2001 +From 101d2b3b5317ca5fab2dfead3982c37fe9682e94 Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 23:41:16 +0100 Subject: [PATCH 28/30] Include uiviewsettingsinterop.h correctly @@ -21,5 +21,5 @@ index 977bbfd11b..12cccd124b 100644 #ifndef HAS_UI_VIEW_SETTINGS_INTEROP -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64-static/0029-Hardcode-linker-flags-for-libqwindows.dll.patch b/qt5-base/mingw-w64-static/0029-Hardcode-linker-flags-for-libqwindows.dll.patch index 56059692..ebae87d7 100644 --- a/qt5-base/mingw-w64-static/0029-Hardcode-linker-flags-for-libqwindows.dll.patch +++ b/qt5-base/mingw-w64-static/0029-Hardcode-linker-flags-for-libqwindows.dll.patch @@ -1,4 +1,4 @@ -From d73ee96c1fcaab9351d7e8471f2d9c1a0d842377 Mon Sep 17 00:00:00 2001 +From bff29dca9fb69fd29dc4b741652429cbdfb4bf50 Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 23:42:30 +0100 Subject: [PATCH 29/30] Hardcode linker flags for libqwindows.dll @@ -41,5 +41,5 @@ index 23168c10dc..e27cf1a248 100644 include(windows.pri) -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64-static/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch b/qt5-base/mingw-w64-static/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch index cefd4b32..98d0fbec 100644 --- a/qt5-base/mingw-w64-static/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch +++ b/qt5-base/mingw-w64-static/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch @@ -1,4 +1,4 @@ -From cf89985a2417df8e4519cab3824b239269792e57 Mon Sep 17 00:00:00 2001 +From 8409e69154755c1f8a23fcf4321e76a36342c79e Mon Sep 17 00:00:00 2001 From: Martchus Date: Tue, 7 Feb 2017 18:25:28 +0100 Subject: [PATCH 30/30] Prevent qmake from messing static lib dependencies @@ -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.12.2 diff --git a/qt5-base/mingw-w64-static/PKGBUILD b/qt5-base/mingw-w64-static/PKGBUILD index e0c31faf..481cd641 100644 --- a/qt5-base/mingw-w64-static/PKGBUILD +++ b/qt5-base/mingw-w64-static/PKGBUILD @@ -78,7 +78,7 @@ isNoOpenGL() { pkgname=mingw-w64-qt5-base-static pkgver=5.8.0 -pkgrel=2 +pkgrel=3 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') @@ -116,7 +116,7 @@ source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/sub '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' + '0024-Fix-macro-invoking-moc-rcc-and-uic.patch' '0025-Ignore-errors-about-missing-feature-static.patch' '0026-Enable-and-fix-use-of-iconv.patch' '0027-Ignore-failing-pkg-config-test.patch' @@ -124,36 +124,36 @@ source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/sub '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') + '4f725d3b11329b38e25fed9a1d1d279a' + '6ae90af85ee7212f2097b2e92b0e2c46' + 'bdb2c93fa4e688274691ea8ec2b10907' + '1189a3a1d90a9dfb8b20b2fc92c74cf2' + 'ca7340bab827ae3cb85aadafcb4be783' + '4b1d4a6f45e6ff63e478b77b0bc07138' + '76aa0757e329d49c2d243cf13ebfc991' + '1a4c3201cc8d2096588cdf939f6c4e3a' + '6e9bf21df1c032c2ded111949d6888fa' + '517e525e61777652cc9cc378f53aa75e' + 'c67f73e3ae3f52df548aac14093406b8' + '86eee18e0c8dd0f94155eca48f175a0e' + 'd58a065a408ee7c9831c80de91f5c8af' + 'fc73e39c859b19ee98065305399ae2e2' + '2bc4f40aaac5e62b4e01c7dc1d8a381b' + '1f460216b0074e5deded85f5eb64c0db' + 'e1658603a165f388bc260a70d39d6114' + '8eecb292d3ae281967d2f586f64b1959' + '3ae4ad36bb37cc0793b96c10b98603c0' + '1825be44a99982893849bf12c9c2edbf' + 'a41c9d756c465adf98acedbdf81d3b74' + 'c48cad72d59cc19a48193e5911c84c1c' + '5576070ff3b7263eb0ea61e8ab50017f' + '64f175bb799575f52d26a99924015895' + '450767e45637a132c457b59b365efd8c' + 'd5526f9f6d0e315d5526ad1a7420f35a' + '67f0dcc84e59685dc38eb81097f5df23' + 'f81f75d41c1a9b5421ff090625325405' + '25e7218e60b52eef70c6e9596d844c07' + '5952dd9939639d144f28acc768cff946') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' #_architectures='x86_64-w64-mingw32 i686-w64-mingw32' diff --git a/qt5-base/mingw-w64/0001-Add-profile-for-cross-compilation-with-mingw-w64.patch b/qt5-base/mingw-w64/0001-Add-profile-for-cross-compilation-with-mingw-w64.patch index 70903bda..1fead784 100644 --- a/qt5-base/mingw-w64/0001-Add-profile-for-cross-compilation-with-mingw-w64.patch +++ b/qt5-base/mingw-w64/0001-Add-profile-for-cross-compilation-with-mingw-w64.patch @@ -303,5 +303,5 @@ index 0000000000..c5a70b1445 + +#endif // QPLATFORMDEFS_H -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch b/qt5-base/mingw-w64/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch index 07436f98..4f11faf5 100644 --- a/qt5-base/mingw-w64/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch +++ b/qt5-base/mingw-w64/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch @@ -23,5 +23,5 @@ index aad48571b3..46f44d8b91 100644 #ifdef Q_ENABLE_OPENGL_FUNCTIONS_DEBUG #include -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64/0003-Use-external-ANGLE-library.patch b/qt5-base/mingw-w64/0003-Use-external-ANGLE-library.patch index 396b5431..bd80d9b2 100644 --- a/qt5-base/mingw-w64/0003-Use-external-ANGLE-library.patch +++ b/qt5-base/mingw-w64/0003-Use-external-ANGLE-library.patch @@ -93,5 +93,5 @@ index 90d7e2b76c..92e89ea39f 100644 SUBDIRS += src_3rdparty_libpng src_3rdparty_freetype.depends += src_3rdparty_libpng -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch b/qt5-base/mingw-w64/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch index 9508bd6c..71cc1428 100644 --- a/qt5-base/mingw-w64/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch +++ b/qt5-base/mingw-w64/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch @@ -25,5 +25,5 @@ index 1a1022b3a7..792bdf9e7a 100644 HEADERS += opengl/qopengl.h \ opengl/qopengl_p.h \ -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64/0005-Make-sure-.pc-files-are-installed-correctly.patch b/qt5-base/mingw-w64/0005-Make-sure-.pc-files-are-installed-correctly.patch index 57bad228..59de23d3 100644 --- a/qt5-base/mingw-w64/0005-Make-sure-.pc-files-are-installed-correctly.patch +++ b/qt5-base/mingw-w64/0005-Make-sure-.pc-files-are-installed-correctly.patch @@ -62,5 +62,5 @@ index 3c029c8004..caa000ea53 100644 uninst.append("\n\t"); uninst.append("-$(DEL_FILE) " + escapeFilePath(dst_pc)); -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64/0006-Don-t-add-resource-files-to-LIBS-parameter.patch b/qt5-base/mingw-w64/0006-Don-t-add-resource-files-to-LIBS-parameter.patch index 9da2a9df..401d5045 100644 --- a/qt5-base/mingw-w64/0006-Don-t-add-resource-files-to-LIBS-parameter.patch +++ b/qt5-base/mingw-w64/0006-Don-t-add-resource-files-to-LIBS-parameter.patch @@ -24,5 +24,5 @@ index 8d5a9a7d0f..d2cf8d9afc 100644 if (project->isActiveConfig("dll")) { QString destDir = ""; -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64/0007-Prevent-debug-library-names-in-pkg-config-files.patch b/qt5-base/mingw-w64/0007-Prevent-debug-library-names-in-pkg-config-files.patch index 2b360f34..a4266bab 100644 --- a/qt5-base/mingw-w64/0007-Prevent-debug-library-names-in-pkg-config-files.patch +++ b/qt5-base/mingw-w64/0007-Prevent-debug-library-names-in-pkg-config-files.patch @@ -29,5 +29,5 @@ index 182fe79238..a762443fe2 100644 QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString(); if(!subdir.isEmpty()) { -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64/0008-Fix-linking-against-shared-static-libpng.patch b/qt5-base/mingw-w64/0008-Fix-linking-against-shared-static-libpng.patch index fdc684a5..048bcd46 100644 --- a/qt5-base/mingw-w64/0008-Fix-linking-against-shared-static-libpng.patch +++ b/qt5-base/mingw-w64/0008-Fix-linking-against-shared-static-libpng.patch @@ -22,5 +22,5 @@ index 1f5011617c..5006ff5a3a 100644 }, "mirclient": { -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64/0009-Fix-linking-against-static-D-Bus.patch b/qt5-base/mingw-w64/0009-Fix-linking-against-static-D-Bus.patch index dd755274..cb456399 100644 --- a/qt5-base/mingw-w64/0009-Fix-linking-against-static-D-Bus.patch +++ b/qt5-base/mingw-w64/0009-Fix-linking-against-static-D-Bus.patch @@ -62,5 +62,5 @@ index cfc0e12046..65f1397cd6 100644 # include #else -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64/0010-Fix-linking-against-static-freetype2.patch b/qt5-base/mingw-w64/0010-Fix-linking-against-static-freetype2.patch index 406fff4b..bc76d2c4 100644 --- a/qt5-base/mingw-w64/0010-Fix-linking-against-static-freetype2.patch +++ b/qt5-base/mingw-w64/0010-Fix-linking-against-static-freetype2.patch @@ -26,5 +26,5 @@ index 5006ff5a3a..6530357be9 100644 }, "fontconfig": { -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64/0011-Fix-linking-against-static-harfbuzz.patch b/qt5-base/mingw-w64/0011-Fix-linking-against-static-harfbuzz.patch index a4abc606..cc8dfe77 100644 --- a/qt5-base/mingw-w64/0011-Fix-linking-against-static-harfbuzz.patch +++ b/qt5-base/mingw-w64/0011-Fix-linking-against-static-harfbuzz.patch @@ -25,5 +25,5 @@ index 6530357be9..c5b9b1542a 100644 }, "imf": { -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64/0012-Fix-linking-against-static-pcre.patch b/qt5-base/mingw-w64/0012-Fix-linking-against-static-pcre.patch index d70a5d04..3bdc9e16 100644 --- a/qt5-base/mingw-w64/0012-Fix-linking-against-static-pcre.patch +++ b/qt5-base/mingw-w64/0012-Fix-linking-against-static-pcre.patch @@ -23,5 +23,5 @@ index 4a30daa72c..3d7c811124 100644 QT_BEGIN_NAMESPACE -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64/0013-Fix-linking-against-shared-static-MariaDB.patch b/qt5-base/mingw-w64/0013-Fix-linking-against-shared-static-MariaDB.patch index ebeac864..867f5a16 100644 --- a/qt5-base/mingw-w64/0013-Fix-linking-against-shared-static-MariaDB.patch +++ b/qt5-base/mingw-w64/0013-Fix-linking-against-shared-static-MariaDB.patch @@ -22,5 +22,5 @@ index 96c82e84f9..fce948026f 100644 { "type": "mysqlConfig", "query": "--libs" }, { "libs": "-lmysqlclient_r", "condition": "!config.win32" }, -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64/0014-Fix-linking-against-shared-static-PostgreSQL.patch b/qt5-base/mingw-w64/0014-Fix-linking-against-shared-static-PostgreSQL.patch index 88dba274..9b23c4fd 100644 --- a/qt5-base/mingw-w64/0014-Fix-linking-against-shared-static-PostgreSQL.patch +++ b/qt5-base/mingw-w64/0014-Fix-linking-against-shared-static-PostgreSQL.patch @@ -25,5 +25,5 @@ index fce948026f..f560c191fd 100644 ] }, -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64/0015-Rename-qtmain-to-qt5main.patch b/qt5-base/mingw-w64/0015-Rename-qtmain-to-qt5main.patch index 365bfef9..1c56e39f 100644 --- a/qt5-base/mingw-w64/0015-Rename-qtmain-to-qt5main.patch +++ b/qt5-base/mingw-w64/0015-Rename-qtmain-to-qt5main.patch @@ -52,5 +52,5 @@ index 4140ae48de..9ae73db74b 100644 CONFIG += static -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64/0016-Build-dynamic-host-libraries.patch b/qt5-base/mingw-w64/0016-Build-dynamic-host-libraries.patch index 4c213003..075e2bee 100644 --- a/qt5-base/mingw-w64/0016-Build-dynamic-host-libraries.patch +++ b/qt5-base/mingw-w64/0016-Build-dynamic-host-libraries.patch @@ -34,5 +34,5 @@ index c3ed27d979..30d2114aa1 100644 -INSTALLS = lib +INSTALLS += lib -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64/0017-Enable-rpath-for-build-tools.patch b/qt5-base/mingw-w64/0017-Enable-rpath-for-build-tools.patch index 0569dcf6..7ffb0c48 100644 --- a/qt5-base/mingw-w64/0017-Enable-rpath-for-build-tools.patch +++ b/qt5-base/mingw-w64/0017-Enable-rpath-for-build-tools.patch @@ -31,5 +31,5 @@ index cb84ae0da8..8d9471ed0a 100644 INSTALLS += target -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64/0018-Use-system-zlib-for-build-tools.patch b/qt5-base/mingw-w64/0018-Use-system-zlib-for-build-tools.patch index fa5e8402..a8a975cd 100644 --- a/qt5-base/mingw-w64/0018-Use-system-zlib-for-build-tools.patch +++ b/qt5-base/mingw-w64/0018-Use-system-zlib-for-build-tools.patch @@ -21,5 +21,5 @@ index d51f9e98a4..2242b7c4f1 100644 } else { CONFIG += no_core_dep -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64/0019-Disable-determing-default-include-and-lib-dirs-at-qm.patch b/qt5-base/mingw-w64/0019-Disable-determing-default-include-and-lib-dirs-at-qm.patch index 7658ac08..65a16fca 100644 --- a/qt5-base/mingw-w64/0019-Disable-determing-default-include-and-lib-dirs-at-qm.patch +++ b/qt5-base/mingw-w64/0019-Disable-determing-default-include-and-lib-dirs-at-qm.patch @@ -22,5 +22,5 @@ index 3f266dd2a4..258d374ee0 100644 cmd_prefix = "LC_ALL=C" cmd_suffix = "/dev/null" -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64/0020-Use-.dll.a-as-import-lib-extension.patch b/qt5-base/mingw-w64/0020-Use-.dll.a-as-import-lib-extension.patch index 2bd78073..30669b9d 100644 --- a/qt5-base/mingw-w64/0020-Use-.dll.a-as-import-lib-extension.patch +++ b/qt5-base/mingw-w64/0020-Use-.dll.a-as-import-lib-extension.patch @@ -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.12.2 diff --git a/qt5-base/mingw-w64/0021-Merge-shared-and-static-library-trees.patch b/qt5-base/mingw-w64/0021-Merge-shared-and-static-library-trees.patch index c8997701..d1bd1366 100644 --- a/qt5-base/mingw-w64/0021-Merge-shared-and-static-library-trees.patch +++ b/qt5-base/mingw-w64/0021-Merge-shared-and-static-library-trees.patch @@ -124,5 +124,5 @@ index a762443fe2..8ac3a0f647 100644 t << endl; -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64/0022-Allow-usage-of-static-version-with-CMake.patch b/qt5-base/mingw-w64/0022-Allow-usage-of-static-version-with-CMake.patch index 5136f3e8..ff7cf9ab 100644 --- a/qt5-base/mingw-w64/0022-Allow-usage-of-static-version-with-CMake.patch +++ b/qt5-base/mingw-w64/0022-Allow-usage-of-static-version-with-CMake.patch @@ -994,5 +994,5 @@ index 2a575958ae..8312c90fd1 100644 INTERFACE_COMPILE_DEFINITIONS QT_TESTCASE_BUILDDIR=\\\"\${CMAKE_BINARY_DIR}\\\" ) -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64/0023-Use-correct-pkg-config-static-flag.patch b/qt5-base/mingw-w64/0023-Use-correct-pkg-config-static-flag.patch index 220e3c6a..a0931266 100644 --- a/qt5-base/mingw-w64/0023-Use-correct-pkg-config-static-flag.patch +++ b/qt5-base/mingw-w64/0023-Use-correct-pkg-config-static-flag.patch @@ -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.12.2 diff --git a/qt5-base/mingw-w64/0024-Fix-macro-invoking-moc-rcc-and-uic.patch b/qt5-base/mingw-w64/0024-Fix-macro-invoking-moc-rcc-and-uic.patch new file mode 100644 index 00000000..86ba3a7d --- /dev/null +++ b/qt5-base/mingw-w64/0024-Fix-macro-invoking-moc-rcc-and-uic.patch @@ -0,0 +1,74 @@ +From 4c840dc66e4506e27cbc967e8b236f77132d8eeb Mon Sep 17 00:00:00 2001 +From: Martchus +Date: Sun, 4 Dec 2016 20:35:47 +0100 +Subject: [PATCH 24/30] 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 23909c9f3f..0fa0f187cd 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.12.2 + diff --git a/qt5-base/mingw-w64/0024-Fix-qt5_wrap_ui-macro.patch b/qt5-base/mingw-w64/0024-Fix-qt5_wrap_ui-macro.patch deleted file mode 100644 index 05415808..00000000 --- a/qt5-base/mingw-w64/0024-Fix-qt5_wrap_ui-macro.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 3e3e4a59ab80c311d4158369d456287123151286 Mon Sep 17 00:00:00 2001 -From: Martchus -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/qt5-base/mingw-w64/0025-Ignore-errors-about-missing-feature-static.patch b/qt5-base/mingw-w64/0025-Ignore-errors-about-missing-feature-static.patch index d36f4fe0..3052af4b 100644 --- a/qt5-base/mingw-w64/0025-Ignore-errors-about-missing-feature-static.patch +++ b/qt5-base/mingw-w64/0025-Ignore-errors-about-missing-feature-static.patch @@ -1,4 +1,4 @@ -From 989341ca2c6ab8a256503dacc32ac49a37b9b0cd Mon Sep 17 00:00:00 2001 +From d66dd7d23bc3586779e23297ae61cefe2c69e9fb Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 20:59:54 +0100 Subject: [PATCH 25/30] Ignore errors about missing feature static @@ -32,5 +32,5 @@ index 999cd18154..6bf08ea583 100644 + !equals($$1, "static"): error("Could not find feature $${1}.") } -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64/0026-Enable-and-fix-use-of-iconv.patch b/qt5-base/mingw-w64/0026-Enable-and-fix-use-of-iconv.patch index a70cb381..7987797a 100644 --- a/qt5-base/mingw-w64/0026-Enable-and-fix-use-of-iconv.patch +++ b/qt5-base/mingw-w64/0026-Enable-and-fix-use-of-iconv.patch @@ -1,4 +1,4 @@ -From c8710fe0122cc6847fb11944b657f814872954b5 Mon Sep 17 00:00:00 2001 +From f1909b3049c85c990da430b5842edcd2060e7529 Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 21:08:20 +0100 Subject: [PATCH 26/30] Enable and fix use of iconv @@ -79,5 +79,5 @@ index 0d1954c3a8..32bbe92f57 100644 }, "icu": { -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64/0027-Ignore-failing-pkg-config-test.patch b/qt5-base/mingw-w64/0027-Ignore-failing-pkg-config-test.patch index 3e72c18c..c0e63335 100644 --- a/qt5-base/mingw-w64/0027-Ignore-failing-pkg-config-test.patch +++ b/qt5-base/mingw-w64/0027-Ignore-failing-pkg-config-test.patch @@ -1,4 +1,4 @@ -From 64db0066305a86a66cc304174052de639607d10c Mon Sep 17 00:00:00 2001 +From 180c51b31bfb37355eb63d2ce7b375d242533c1e Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 21:08:48 +0100 Subject: [PATCH 27/30] Ignore failing pkg-config test @@ -21,5 +21,5 @@ index 12714da714..adc54e439c 100644 "publicFeature", { "type": "publicQtConfig", "negative": true }, -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64/0028-Include-uiviewsettingsinterop.h-correctly.patch b/qt5-base/mingw-w64/0028-Include-uiviewsettingsinterop.h-correctly.patch index 7cbf0614..68403556 100644 --- a/qt5-base/mingw-w64/0028-Include-uiviewsettingsinterop.h-correctly.patch +++ b/qt5-base/mingw-w64/0028-Include-uiviewsettingsinterop.h-correctly.patch @@ -1,4 +1,4 @@ -From f598982149077d0cd9aeb51efe47116f3598b8eb Mon Sep 17 00:00:00 2001 +From 101d2b3b5317ca5fab2dfead3982c37fe9682e94 Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 23:41:16 +0100 Subject: [PATCH 28/30] Include uiviewsettingsinterop.h correctly @@ -21,5 +21,5 @@ index 977bbfd11b..12cccd124b 100644 #ifndef HAS_UI_VIEW_SETTINGS_INTEROP -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64/0029-Hardcode-linker-flags-for-libqwindows.dll.patch b/qt5-base/mingw-w64/0029-Hardcode-linker-flags-for-libqwindows.dll.patch index 56059692..ebae87d7 100644 --- a/qt5-base/mingw-w64/0029-Hardcode-linker-flags-for-libqwindows.dll.patch +++ b/qt5-base/mingw-w64/0029-Hardcode-linker-flags-for-libqwindows.dll.patch @@ -1,4 +1,4 @@ -From d73ee96c1fcaab9351d7e8471f2d9c1a0d842377 Mon Sep 17 00:00:00 2001 +From bff29dca9fb69fd29dc4b741652429cbdfb4bf50 Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 23:42:30 +0100 Subject: [PATCH 29/30] Hardcode linker flags for libqwindows.dll @@ -41,5 +41,5 @@ index 23168c10dc..e27cf1a248 100644 include(windows.pri) -- -2.12.1 +2.12.2 diff --git a/qt5-base/mingw-w64/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch b/qt5-base/mingw-w64/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch index cefd4b32..98d0fbec 100644 --- a/qt5-base/mingw-w64/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch +++ b/qt5-base/mingw-w64/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch @@ -1,4 +1,4 @@ -From cf89985a2417df8e4519cab3824b239269792e57 Mon Sep 17 00:00:00 2001 +From 8409e69154755c1f8a23fcf4321e76a36342c79e Mon Sep 17 00:00:00 2001 From: Martchus Date: Tue, 7 Feb 2017 18:25:28 +0100 Subject: [PATCH 30/30] Prevent qmake from messing static lib dependencies @@ -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.12.2 diff --git a/qt5-base/mingw-w64/PKGBUILD b/qt5-base/mingw-w64/PKGBUILD index f850a673..b389ae9d 100644 --- a/qt5-base/mingw-w64/PKGBUILD +++ b/qt5-base/mingw-w64/PKGBUILD @@ -78,7 +78,7 @@ isNoOpenGL() { pkgname=mingw-w64-qt5-base pkgver=5.8.0 -pkgrel=2 +pkgrel=3 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') @@ -116,7 +116,7 @@ source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/sub '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' + '0024-Fix-macro-invoking-moc-rcc-and-uic.patch' '0025-Ignore-errors-about-missing-feature-static.patch' '0026-Enable-and-fix-use-of-iconv.patch' '0027-Ignore-failing-pkg-config-test.patch' @@ -124,36 +124,36 @@ source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/sub '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') + '4f725d3b11329b38e25fed9a1d1d279a' + '6ae90af85ee7212f2097b2e92b0e2c46' + 'bdb2c93fa4e688274691ea8ec2b10907' + '1189a3a1d90a9dfb8b20b2fc92c74cf2' + 'ca7340bab827ae3cb85aadafcb4be783' + '4b1d4a6f45e6ff63e478b77b0bc07138' + '76aa0757e329d49c2d243cf13ebfc991' + '1a4c3201cc8d2096588cdf939f6c4e3a' + '6e9bf21df1c032c2ded111949d6888fa' + '517e525e61777652cc9cc378f53aa75e' + 'c67f73e3ae3f52df548aac14093406b8' + '86eee18e0c8dd0f94155eca48f175a0e' + 'd58a065a408ee7c9831c80de91f5c8af' + 'fc73e39c859b19ee98065305399ae2e2' + '2bc4f40aaac5e62b4e01c7dc1d8a381b' + '1f460216b0074e5deded85f5eb64c0db' + 'e1658603a165f388bc260a70d39d6114' + '8eecb292d3ae281967d2f586f64b1959' + '3ae4ad36bb37cc0793b96c10b98603c0' + '1825be44a99982893849bf12c9c2edbf' + 'a41c9d756c465adf98acedbdf81d3b74' + 'c48cad72d59cc19a48193e5911c84c1c' + '5576070ff3b7263eb0ea61e8ab50017f' + '64f175bb799575f52d26a99924015895' + '450767e45637a132c457b59b365efd8c' + 'd5526f9f6d0e315d5526ad1a7420f35a' + '67f0dcc84e59685dc38eb81097f5df23' + 'f81f75d41c1a9b5421ff090625325405' + '25e7218e60b52eef70c6e9596d844c07' + '5952dd9939639d144f28acc768cff946') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' #_architectures='x86_64-w64-mingw32 i686-w64-mingw32'