[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>

4 files changed, 2 insertions, 28 deletions

diff --git a/ports/qt5-webengine/CONTROL b/ports/qt5-webengine/CONTROL
index a15765241..bfc1e1dbd 100644
--- a/ports/qt5-webengine/CONTROL
+++ b/ports/qt5-webengine/CONTROL
@@ -1,5 +1,5 @@
 Source: qt5-webengine

-Version: 5.15.0

+Version: 5.15.1

 Port-Version: 1

 Description: Qt5 webengine Module; 

 Build-Depends:  qt5-base[core], qt5-declarative, qt5-location, qt5-quickcontrols, qt5-quickcontrols2, qt5-tools, qt5-webchannel, atlmfc (windows), ffmpeg[core] (!windows)

diff --git a/ports/qt5-webengine/build.patch b/ports/qt5-webengine/build.patch
deleted file mode 100644
index ec13b2d14..000000000
--- a/ports/qt5-webengine/build.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/3rdparty/chromium/net/cert/x509_certificate_net_log_param.h b/src/3rdparty/chromium/net/cert/x509_certificate_net_log_param.h
-index 22dd9cc14..910149936 100644
---- a/src/3rdparty/chromium/net/cert/x509_certificate_net_log_param.h	
-+++ b/src/3rdparty/chromium/net/cert/x509_certificate_net_log_param.h
-@@ -6,6 +6,7 @@
- #define NET_CERT_X509_CERTIFICATE_NET_LOG_PARAM_H_
- 
- #include <memory>
-+#include <string>
- 
- #include "net/base/net_export.h"
- 
diff --git a/ports/qt5-webengine/portfile.cmake b/ports/qt5-webengine/portfile.cmake
index 611a3c7c0..aac884be3 100644
--- a/ports/qt5-webengine/portfile.cmake
+++ b/ports/qt5-webengine/portfile.cmake
@@ -37,9 +37,7 @@ vcpkg_add_to_path(PREPEND "${GPERF_DIR}")
 vcpkg_add_to_path(PREPEND "${NINJA_DIR}")
 
 set(PATCHES common.pri.patch 
-            gl.patch
-            build.patch
-            vs2017.patch)
+            gl.patch)
 
 if(NOT VCPKG_TARGET_IS_WINDOWS)
     list(APPEND CORE_OPTIONS "BUILD_OPTIONS" "-webengine-system-libwebp" "-webengine-system-ffmpeg" "-webengine-system-icu")
diff --git a/ports/qt5-webengine/vs2017.patch b/ports/qt5-webengine/vs2017.patch
deleted file mode 100644
index 07eb79e16..000000000
--- a/ports/qt5-webengine/vs2017.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/importers/systrace/systrace_trace_parser.cc b/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/importers/systrace/systrace_trace_parser.cc

-index 33d5cb1f6f6..1ba53aee4b3 100644

---- a/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/importers/systrace/systrace_trace_parser.cc

-+++ b/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/importers/systrace/systrace_trace_parser.cc

-@@ -26,6 +26,7 @@

- #include "src/trace_processor/slice_tracker.h"

- #include "src/trace_processor/track_tracker.h"

- 

-+#include <cctype>

- #include <inttypes.h>

- #include <string>

- #include <unordered_map>