Additional maplibre patches

Author: dirkvdb

vcpkg_overlay/ports/maplibregl-native/fix-includes.patch

@@ -0,0 +1,36 @@
+diff --git a/include/mbgl/gfx/shader_registry.hpp b/include/mbgl/gfx/shader_registry.hpp
+index ec3716ceb..816009c5d 100644
+--- a/include/mbgl/gfx/shader_registry.hpp
++++ b/include/mbgl/gfx/shader_registry.hpp
+@@ -5,6 +5,7 @@
+ #include <memory>
+ #include <mutex>
+ #include <shared_mutex>
++#include <string>
+ #include <unordered_map>
+ 
+ namespace mbgl {
+diff --git a/include/mbgl/storage/resource_options.hpp b/include/mbgl/storage/resource_options.hpp
+index bb5619c70..0afe44e0b 100644
+--- a/include/mbgl/storage/resource_options.hpp
++++ b/include/mbgl/storage/resource_options.hpp
+@@ -2,6 +2,7 @@
+ 
+ #include <memory>
+ #include <string>
++#include <cstdint>
+ #include <mbgl/util/tile_server_options.hpp>
+ 
+ namespace mbgl {
+diff --git a/src/mbgl/text/bidi.hpp b/src/mbgl/text/bidi.hpp
+index 1f03ab91d..b24d48531 100644
+--- a/src/mbgl/text/bidi.hpp
++++ b/src/mbgl/text/bidi.hpp
+@@ -4,6 +4,7 @@
+ #include <string>
+ #include <vector>
+ #include <memory>
++#include <cstdint>
+ 
+ #include <mbgl/util/noncopyable.hpp>
+ 

vcpkg_overlay/ports/maplibregl-native/http2.patch

@@ -0,0 +1,70 @@
+From f2eec1201ecd8922535717e3db33e2ffc2bebc13 Mon Sep 17 00:00:00 2001
+From: Dirk Vanden Boer <dirk.vdb@gmail.com>
+Date: Sun, 5 Oct 2025 13:56:39 +0200
+Subject: [PATCH] Qt6 causes HTTP/2 errors
+
+https://github.com/maplibre/maplibre-native/issues/3644
+---
+ platform/qt/src/mbgl/http_file_source.cpp | 35 ++++++++++++++++++-----
+ 1 file changed, 28 insertions(+), 7 deletions(-)
+
+diff --git a/platform/qt/src/mbgl/http_file_source.cpp b/platform/qt/src/mbgl/http_file_source.cpp
+index 43df2470715f..dd3bff2c1fdc 100644
+--- a/platform/qt/src/mbgl/http_file_source.cpp
++++ b/platform/qt/src/mbgl/http_file_source.cpp
+@@ -68,12 +68,21 @@ void HTTPFileSource::Impl::cancel(HTTPRequest* req) {
+ 
+     if (requestsVector.empty()) {
+         m_pending.erase(it);
++#if QT_VERSION >= QT_VERSION_CHECK(5, 9, 4)
++        // Qt 5.9.4 introduced HTTP/2, in the ideal world we would like to know if this reply
++        // is from a HTTP/2 connection. At this point in time we cannot check it. If HTTP/2 is
++        // in use we may not abort the connection.
++        Q_UNUSED(reply);
++#else
++        // Works fine with HTTP/1
+         if (reply) reply->abort();
++#endif
+     }
+ }
+ 
+ void HTTPFileSource::Impl::onReplyFinished() {
+     QNetworkReply* reply = qobject_cast<QNetworkReply*>(sender());
++    if (!reply) return;
+     const QUrl& url = reply->request().url();
+ 
+     auto it = m_pending.find(url);
+@@ -82,14 +91,26 @@ void HTTPFileSource::Impl::onReplyFinished() {
+         return;
+     }
+ 
+-    QByteArray data = reply->readAll();
+-    QVector<HTTPRequest*>& requestsVector = it.value().second;
++    // Error handling
++    if (reply->error() != QNetworkReply::NoError) {
++        qWarning() << "Network error for URL" << url << ":" << reply->errorString();
++
++        QVariant statusCode = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute);
++        if (!statusCode.isValid()) {
++            qWarning() << "No HTTP status code received; possible connection/protocol failure.";
++        }
++
++        m_manager->clearConnectionCache();
++    } else {
++        QByteArray data = reply->readAll();
++        QVector<HTTPRequest*>& requestsVector = it.value().second;
+ 
+-    // Cannot use the iterator to walk the requestsVector
+-    // because calling handleNetworkReply() might get
+-    // requests added to the requestsVector.
+-    while (!requestsVector.isEmpty()) {
+-        requestsVector.takeFirst()->handleNetworkReply(reply, data);
++        // Cannot use the iterator to walk the requestsVector
++        // because calling handleNetworkReply() might get
++        // requests added to the requestsVector.
++        while (!requestsVector.isEmpty()) {
++            requestsVector.takeFirst()->handleNetworkReply(reply, data);
++        }
+     }
+ 
+     m_pending.erase(it);

vcpkg_overlay/ports/maplibregl-native/portfile.cmake

@@ -50,6 +50,8 @@ vcpkg_apply_patches(
     cmake-changes.patch
     timer-overflow.patch
     boost-numeric.patch
+    fix-includes.patch
+    http2.patch
 )
 
 if(VCPKG_TARGET_IS_OSX)