diff --git a/vcpkg/overlay/qgis-qt6/auth_awss3_qt66.patch b/vcpkg/overlay/qgis-qt6/auth_awss3_qt66.patch new file mode 100644 index 0000000000..267bcec4c8 --- /dev/null +++ b/vcpkg/overlay/qgis-qt6/auth_awss3_qt66.patch @@ -0,0 +1,13 @@ +diff --git a/src/auth/awss3/core/qgsauthawss3method.cpp b/src/auth/awss3/core/qgsauthawss3method.cpp +index 2248f3438cb..c76871443a0 100644 +--- a/src/auth/awss3/core/qgsauthawss3method.cpp ++++ b/src/auth/awss3/core/qgsauthawss3method.cpp +@@ -118,7 +118,7 @@ bool QgsAuthAwsS3Method::updateNetworkRequest( QNetworkRequest &request, const Q + const QByteArray signingKey = QMessageAuthenticationCode::hash( "aws4_request", + QMessageAuthenticationCode::hash( "s3", + QMessageAuthenticationCode::hash( region, +- QMessageAuthenticationCode::hash( date, "AWS4" + password, ++ QMessageAuthenticationCode::hash( date, QByteArray( "AWS4" + password ), + QCryptographicHash::Sha256 ), + QCryptographicHash::Sha256 ), + QCryptographicHash::Sha256 ), diff --git a/vcpkg/overlay/qgis-qt6/portfile.cmake b/vcpkg/overlay/qgis-qt6/portfile.cmake index d6ab1f0010..ba173f82fb 100644 --- a/vcpkg/overlay/qgis-qt6/portfile.cmake +++ b/vcpkg/overlay/qgis-qt6/portfile.cmake @@ -27,6 +27,8 @@ vcpkg_from_github( exif_orientation_fix.patch # Remove when updating to QGIS 3.34.1 layout_fix.patch # Remove when updating to QGIS 3.34 qsharedmemory_android.patch # Qt 6.6 removed dummy QSharedMemory implementation on Android + wcs_capabilities_qt66.patch # Qt 6.6 compilation fix + auth_awss3_qt66.patch # Qt 6.6 compilation fix ) file(REMOVE ${SOURCE_PATH}/cmake/FindQtKeychain.cmake) diff --git a/vcpkg/overlay/qgis-qt6/wcs_capabilities_qt66.patch b/vcpkg/overlay/qgis-qt6/wcs_capabilities_qt66.patch new file mode 100644 index 0000000000..e074139c41 --- /dev/null +++ b/vcpkg/overlay/qgis-qt6/wcs_capabilities_qt66.patch @@ -0,0 +1,28 @@ +diff --git a/src/providers/wcs/qgswcscapabilities.cpp b/src/providers/wcs/qgswcscapabilities.cpp +index ca3418cb11f..0ddce374835 100644 +--- a/src/providers/wcs/qgswcscapabilities.cpp ++++ b/src/providers/wcs/qgswcscapabilities.cpp +@@ -1312,12 +1312,12 @@ QgsWcsCoverageSummary *QgsWcsCapabilities::coverageSummary( QString const &ident + { + if ( c->identifier == identifier ) + { +- return c; ++ return &(*c); + } + else + { + // search sub coverages +- QgsWcsCoverageSummary *subCoverage = coverageSummary( identifier, c ); ++ QgsWcsCoverageSummary *subCoverage = coverageSummary( identifier, &(*c) ); + if ( subCoverage ) + { + return subCoverage; +@@ -1343,7 +1343,7 @@ QList QgsWcsCapabilities::coverageSummaries( QgsWcsCovera + for ( QVector::iterator c = parent->coverageSummary.begin(); c != parent->coverageSummary.end(); ++c ) + { + list.append( *c ); +- list.append( coverageSummaries( c ) ); ++ list.append( coverageSummaries( &(*c) ) ); + } + return list; + }