diff --git a/mingw-w64-qt5-static/0042-qt-5.4.0-static-cmake-also-link-plugins-and-plugin-deps.patch b/mingw-w64-qt5-static/0042-qt-5.4.0-static-cmake-also-link-plugins-and-plugin-deps.patch index 679b081be4..92d36a7f35 100644 --- a/mingw-w64-qt5-static/0042-qt-5.4.0-static-cmake-also-link-plugins-and-plugin-deps.patch +++ b/mingw-w64-qt5-static/0042-qt-5.4.0-static-cmake-also-link-plugins-and-plugin-deps.patch @@ -22,7 +22,7 @@ diff -urN qt-everywhere-opensource-src-5.6.0.orig/qtbase/mkspecs/features/data/c + \"IMPORTED_LINK_INTERFACE_LIBRARIES_${Configuration}\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}${_list_sep}${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${Configuration}_LIB_DEPENDENCIES}\" ) + # provide static plugins for MINSIZEREL and RELWITHDEBINFO too -+ set_target_properties(${_Qt5$${CMAKE_MODULE_NAME} PROPERTIES ++ set_target_properties(${_Qt5$${CMAKE_MODULE_NAME}} PROPERTIES + MAP_IMPORTED_CONFIG_MINSIZEREL Release + MAP_IMPORTED_CONFIG_RELWITHDEBINFO Release + ) diff --git a/mingw-w64-qt5-static/0055-resolve-conflict-with-vectorcanbackend-static.patch b/mingw-w64-qt5-static/0055-resolve-conflict-with-vectorcanbackend-static.patch new file mode 100644 index 0000000000..7eb1cfeba6 --- /dev/null +++ b/mingw-w64-qt5-static/0055-resolve-conflict-with-vectorcanbackend-static.patch @@ -0,0 +1,25 @@ +--- i686/qtserialbus/src/plugins/canbus/tinycan/tinycanbackend.cpp.orig 2018-10-19 09:41:28.137042000 +0300 ++++ i686/qtserialbus/src/plugins/canbus/tinycan/tinycanbackend.cpp 2018-10-19 09:44:38.613376600 +0300 +@@ -89,11 +89,11 @@ + + Q_GLOBAL_STATIC(TinyCanGlobal, gTinyCan) + +-class WriteNotifier : public QTimer ++class WriteNotifierTiny : public QTimer + { + // no Q_OBJECT macro! + public: +- WriteNotifier(TinyCanBackendPrivate *d, QObject *parent) ++ WriteNotifierTiny(TinyCanBackendPrivate *d, QObject *parent) + : QTimer(parent) + , dptr(d) + { +@@ -211,7 +211,7 @@ + } + } + +- writeNotifier = new WriteNotifier(this, q); ++ writeNotifier = new WriteNotifierTiny(this, q); + writeNotifier->setInterval(0); + + isOpen = true; diff --git a/mingw-w64-qt5-static/PKGBUILD b/mingw-w64-qt5-static/PKGBUILD index 148c631617..f6cee5f842 100644 --- a/mingw-w64-qt5-static/PKGBUILD +++ b/mingw-w64-qt5-static/PKGBUILD @@ -225,6 +225,7 @@ source=(#https://download.qt.io/development_releases/qt/${pkgver%.*}/${_ver_base 0052-qt-5.11-mingw-fix-link-qdoc-with-clang.patch 0053-qt-5.11-documents-fix-regression.patch 0054-win32-dont-need-flatpack-theme.patch + 0055-resolve-conflict-with-vectorcanbackend-static.patch 0125-qt5-windeployqt-fixes.patch 0300-qt-5.8.0-cast-errors.patch 0301-remove-evr-declaration.patch @@ -340,6 +341,8 @@ prepare() { patch -p1 -i ${srcdir}/0052-qt-5.11-mingw-fix-link-qdoc-with-clang.patch patch -p1 -i ${srcdir}/0053-qt-5.11-documents-fix-regression.patch patch -p1 -i ${srcdir}/0054-win32-dont-need-flatpack-theme.patch + patch -p1 -i ${srcdir}/0055-resolve-conflict-with-vectorcanbackend-static.patch + pushd qttools > /dev/null patch -p1 -i ${srcdir}/0125-qt5-windeployqt-fixes.patch @@ -740,7 +743,7 @@ sha256sums=('c6104b840b6caee596fa9a35bc5f57f67ed5a99d6a36497b6fe66f990a53ca81' '3ae9d64fb683036b3b1f91036378791e1ec4a10205c59e78761d22d8479c0540' 'd720ac76035d56caea1f045dfb468a25865f9d4b22016cec5414f1c639a7697a' '914051840e01bf453e3db710d4471e6758e39e2cb87f8ffe3072fb90218c9f83' - '2ed8fa715d7459df66bdbb938d098df8ae64209b5ba65957d754eeef09c8f995' + 'a6c9ce0df1e378ef92e5fbab2891c5b0e4783498406ac3e33c3aea68a06d810d' '29ed4566d4c1853b70a5173c6391ed90f123c5121b5836f2d16f8478f6354f0a' '7d7a99ff45c6ae4f39be663d52bafc125970787f364e84593117e6a7d79f7eae' '72e46178f2f694d8408f22684d1a7d39394056cb574fc4855c1f38c9d51e7e6c' @@ -752,6 +755,7 @@ sha256sums=('c6104b840b6caee596fa9a35bc5f57f67ed5a99d6a36497b6fe66f990a53ca81' '13c85520e05379e2e5e7876c6c30fc0d4c88f152d5a1db7902bd8680955966cb' '89fd6085f7fb85086692037338a935354fc68735bfb7c8423e282f99076250a3' 'de8d7f88ee987ed376226793350918a2a618a093cc3f56c37e1b3b9bf3e23d84' + '09a4181ee02df575c13c94da7d7bc09c18252db9040bdaa27012e3aac7a947e1' '353afa72d5f659213625d1af02653308ead2a74292023cc960b55f04d6a098af' 'b38c912a1a0e94ea1a4f3706d84b5a6b2a46b72a9b3b5e6a821b123794fd5e07' '314a0c55c3ad45b46375c86717abaaa6cafd8a1cd41c09c77752503359ca6fb9' diff --git a/mingw-w64-qt5/0042-qt-5.4.0-static-cmake-also-link-plugins-and-plugin-deps.patch b/mingw-w64-qt5/0042-qt-5.4.0-static-cmake-also-link-plugins-and-plugin-deps.patch index 679b081be4..92d36a7f35 100644 --- a/mingw-w64-qt5/0042-qt-5.4.0-static-cmake-also-link-plugins-and-plugin-deps.patch +++ b/mingw-w64-qt5/0042-qt-5.4.0-static-cmake-also-link-plugins-and-plugin-deps.patch @@ -22,7 +22,7 @@ diff -urN qt-everywhere-opensource-src-5.6.0.orig/qtbase/mkspecs/features/data/c + \"IMPORTED_LINK_INTERFACE_LIBRARIES_${Configuration}\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}${_list_sep}${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${Configuration}_LIB_DEPENDENCIES}\" ) + # provide static plugins for MINSIZEREL and RELWITHDEBINFO too -+ set_target_properties(${_Qt5$${CMAKE_MODULE_NAME} PROPERTIES ++ set_target_properties(${_Qt5$${CMAKE_MODULE_NAME}} PROPERTIES + MAP_IMPORTED_CONFIG_MINSIZEREL Release + MAP_IMPORTED_CONFIG_RELWITHDEBINFO Release + ) diff --git a/mingw-w64-qt5/0055-resolve-conflict-with-vectorcanbackend-static.patch b/mingw-w64-qt5/0055-resolve-conflict-with-vectorcanbackend-static.patch new file mode 100644 index 0000000000..7eb1cfeba6 --- /dev/null +++ b/mingw-w64-qt5/0055-resolve-conflict-with-vectorcanbackend-static.patch @@ -0,0 +1,25 @@ +--- i686/qtserialbus/src/plugins/canbus/tinycan/tinycanbackend.cpp.orig 2018-10-19 09:41:28.137042000 +0300 ++++ i686/qtserialbus/src/plugins/canbus/tinycan/tinycanbackend.cpp 2018-10-19 09:44:38.613376600 +0300 +@@ -89,11 +89,11 @@ + + Q_GLOBAL_STATIC(TinyCanGlobal, gTinyCan) + +-class WriteNotifier : public QTimer ++class WriteNotifierTiny : public QTimer + { + // no Q_OBJECT macro! + public: +- WriteNotifier(TinyCanBackendPrivate *d, QObject *parent) ++ WriteNotifierTiny(TinyCanBackendPrivate *d, QObject *parent) + : QTimer(parent) + , dptr(d) + { +@@ -211,7 +211,7 @@ + } + } + +- writeNotifier = new WriteNotifier(this, q); ++ writeNotifier = new WriteNotifierTiny(this, q); + writeNotifier->setInterval(0); + + isOpen = true; diff --git a/mingw-w64-qt5/PKGBUILD b/mingw-w64-qt5/PKGBUILD index 5f66fb8625..b9b3dec5e4 100644 --- a/mingw-w64-qt5/PKGBUILD +++ b/mingw-w64-qt5/PKGBUILD @@ -225,6 +225,7 @@ source=(#https://download.qt.io/development_releases/qt/${pkgver%.*}/${_ver_base 0052-qt-5.11-mingw-fix-link-qdoc-with-clang.patch 0053-qt-5.11-documents-fix-regression.patch 0054-win32-dont-need-flatpack-theme.patch + 0055-resolve-conflict-with-vectorcanbackend-static.patch 0125-qt5-windeployqt-fixes.patch 0300-qt-5.8.0-cast-errors.patch 0301-remove-evr-declaration.patch @@ -340,6 +341,7 @@ prepare() { patch -p1 -i ${srcdir}/0052-qt-5.11-mingw-fix-link-qdoc-with-clang.patch patch -p1 -i ${srcdir}/0053-qt-5.11-documents-fix-regression.patch patch -p1 -i ${srcdir}/0054-win32-dont-need-flatpack-theme.patch + patch -p1 -i ${srcdir}/0055-resolve-conflict-with-vectorcanbackend-static.patch pushd qttools > /dev/null patch -p1 -i ${srcdir}/0125-qt5-windeployqt-fixes.patch @@ -740,7 +742,7 @@ sha256sums=('c6104b840b6caee596fa9a35bc5f57f67ed5a99d6a36497b6fe66f990a53ca81' '3ae9d64fb683036b3b1f91036378791e1ec4a10205c59e78761d22d8479c0540' 'd720ac76035d56caea1f045dfb468a25865f9d4b22016cec5414f1c639a7697a' '914051840e01bf453e3db710d4471e6758e39e2cb87f8ffe3072fb90218c9f83' - '2ed8fa715d7459df66bdbb938d098df8ae64209b5ba65957d754eeef09c8f995' + 'a6c9ce0df1e378ef92e5fbab2891c5b0e4783498406ac3e33c3aea68a06d810d' '29ed4566d4c1853b70a5173c6391ed90f123c5121b5836f2d16f8478f6354f0a' '7d7a99ff45c6ae4f39be663d52bafc125970787f364e84593117e6a7d79f7eae' '72e46178f2f694d8408f22684d1a7d39394056cb574fc4855c1f38c9d51e7e6c' @@ -752,6 +754,7 @@ sha256sums=('c6104b840b6caee596fa9a35bc5f57f67ed5a99d6a36497b6fe66f990a53ca81' '13c85520e05379e2e5e7876c6c30fc0d4c88f152d5a1db7902bd8680955966cb' '89fd6085f7fb85086692037338a935354fc68735bfb7c8423e282f99076250a3' 'de8d7f88ee987ed376226793350918a2a618a093cc3f56c37e1b3b9bf3e23d84' + '09a4181ee02df575c13c94da7d7bc09c18252db9040bdaa27012e3aac7a947e1' '353afa72d5f659213625d1af02653308ead2a74292023cc960b55f04d6a098af' 'b38c912a1a0e94ea1a4f3706d84b5a6b2a46b72a9b3b5e6a821b123794fd5e07' '314a0c55c3ad45b46375c86717abaaa6cafd8a1cd41c09c77752503359ca6fb9'