diff options
| author | Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> | 2020-10-17 11:10:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-17 02:10:11 -0700 |
| commit | aa0ffba768684702f04d6c397838365c3b23a053 (patch) | |
| tree | 7275a5954f232cb61c6e19789bc9437eafadab03 /ports/qt5-tools | |
| parent | 32c5722104fc28cd55d166a2c04e1d44906eec68 (diff) | |
| download | vcpkg-aa0ffba768684702f04d6c397838365c3b23a053.tar.gz vcpkg-aa0ffba768684702f04d6c397838365c3b23a053.zip | |
[qt5] Update to 5.15.1 (#13477)
* update everything. Let ci test if just updating is enough
* fix some minor version details.
* remove upstream patch
* add zstdd patch and do not remove zlib since it is required for bootstrapping
* add mqtt hash
* webengine hash
* add fixup pkgconfig to assimp
* add assimp to qt-3d (still requires zlib fix)
* setup pkg-config for qt
* fix psql detection in configure
* fix build details
* fix assimp library nameing
* -rpath option is not available for static builds
* move config log somewhere where CI can catch it.
* move logs only if they exists
* append bzip2 qt-3d
* break qt3d again to get logs
* retry qt3d
* remove qt-3d failure. everything ok now
* add assistent patch for qt5-tools not building qthelp
* remove unnecessary qt5-webengine patches
* Remove PSQL_TYPES
* [qt5-3d] remove irrxml as a assimp dep
* remove unnecessary patch
* fix qt-3d on windows
* fix qt5-3d linux
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Diffstat (limited to 'ports/qt5-tools')
| -rw-r--r-- | ports/qt5-tools/CONTROL | 2 | ||||
| -rw-r--r-- | ports/qt5-tools/assistant.patch | 28 | ||||
| -rw-r--r-- | ports/qt5-tools/portfile.cmake | 2 |
3 files changed, 30 insertions, 2 deletions
diff --git a/ports/qt5-tools/CONTROL b/ports/qt5-tools/CONTROL index 032db26c0..49319c5fb 100644 --- a/ports/qt5-tools/CONTROL +++ b/ports/qt5-tools/CONTROL @@ -1,4 +1,4 @@ Source: qt5-tools
-Version: 5.15.0
+Version: 5.15.1
Description: Qt5 Tools Module; Includes deployment tools and helpers, Qt Designer, Assistant, and other applications
Build-Depends: qt5-base[core], qt5-declarative, qt5-activeqt (windows)
diff --git a/ports/qt5-tools/assistant.patch b/ports/qt5-tools/assistant.patch new file mode 100644 index 000000000..b92325a23 --- /dev/null +++ b/ports/qt5-tools/assistant.patch @@ -0,0 +1,28 @@ +From 6db2b442dd14eb068bba52e4f7223139ea29a558 Mon Sep 17 00:00:00 2001
+From: Jarek Kobus <jaroslaw.kobus@qt.io>
+Date: Mon, 7 Sep 2020 14:37:33 +0200
+Subject: [PATCH] Fix static build of assistant
+
+Fixes: QTBUG-86477
+Pick-to: 5.15
+Change-Id: Ifb77fb38b4b182a996666c6b69d8357458add0c4
+Reviewed-by: Kai Koehne <kai.koehne@qt.io>
+---
+ src/src.pro | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/src.pro b/src/src.pro
+index 8c75a8cd8..24d0b9c6b 100644
+--- a/src/src.pro
++++ b/src/src.pro
+@@ -9,7 +9,7 @@ qtHaveModule(widgets) {
+ SUBDIRS = designer \
+ pixeltool
+
+- !static|contains(QT_PLUGINS, qtsqlite): SUBDIRS += assistant
++ !static|contains(QT_PLUGINS, qsqlite): SUBDIRS += assistant
+
+ linguist.depends = designer
+ }
+--
+2.16.3
diff --git a/ports/qt5-tools/portfile.cmake b/ports/qt5-tools/portfile.cmake index dcb121634..2efc85eb9 100644 --- a/ports/qt5-tools/portfile.cmake +++ b/ports/qt5-tools/portfile.cmake @@ -1,6 +1,6 @@ include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) -qt_submodule_installation() +qt_submodule_installation(PATCHES assistant.patch) if(EXISTS "${CURRENT_INSTALLED_DIR}/plugins/platforms/qminimal${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}") file(INSTALL "${CURRENT_INSTALLED_DIR}/plugins/platforms/qminimal${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/plugins/platforms") |