Merge branch 'kf5kio-fixup' into libidn2

ports/cgal/vcpkg.json

@@ -1,6 +1,7 @@
 {
   "name": "cgal",
   "version": "5.6.1",
+  "port-version": 1,
   "description": "The Computational Geometry Algorithms Library (CGAL) is a C++ library that aims to provide easy access to efficient and reliable algorithms in computational geometry.",
   "homepage": "https://github.com/CGAL/cgal",
   "license": "GPL-3.0-or-later AND LGPL-3.0-or-later AND BSL-1.0",
@@ -15,6 +16,7 @@
     "boost-core",
     "boost-detail",
     "boost-filesystem",
+    "boost-format",
     "boost-functional",
     "boost-fusion",
     "boost-geometry",
@@ -64,7 +66,6 @@
     "qt": {
       "description": "Qt GUI support for CGAL",
       "dependencies": [
-        "boost-format",
         "eigen3",
         "qt5-3d",
         {

ports/gettext-libintl/vcpkg-cmake-wrapper.cmake

@@ -14,4 +14,10 @@ if(Intl_FOUND AND Intl_LIBRARIES)
             set_property(TARGET Intl::Intl APPEND PROPERTY INTERFACE_LINK_LIBRARIES $<LINK_ONLY:Iconv::Iconv>)
         endif()
     endif()
+    if(APPLE)
+        list(APPEND Intl_LIBRARIES "-framework CoreFoundation")
+        if(TARGET Intl::Intl) # Since CMake 3.20
+            set_property(TARGET Intl::Intl APPEND PROPERTY INTERFACE_LINK_LIBRARIES "$<LINK_ONLY:-framework CoreFoundation>")
+        endif()
+    endif()
 endif()

ports/gettext-libintl/vcpkg.json

@@ -1,6 +1,7 @@
 {
   "name": "gettext-libintl",
   "version": "0.22.5",
+  "port-version": 1,
   "description": "The libintl C library from GNU gettext-runtime.",
   "homepage": "https://www.gnu.org/software/gettext/",
   "license": "LGPL-2.1-or-later",

ports/kf5kio/portfile.cmake

@@ -1,11 +1,11 @@
-if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL static)
+if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     list(APPEND PATCHES fix_libiconv.patch)
 endif()
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO KDE/kio
-    REF v5.98.0
+    REF "v${VERSION}"
     SHA512 6ffb44963b266f806150bc3ff9a1c3cf13f2fe7b4bda57e27d9bd9b931bfd757d50ee29f4143f6d282a25f675c8024aff16dc2f91e00ec0c7663eb8effdfee30
     HEAD_REF master
     PATCHES
@@ -26,14 +26,15 @@ vcpkg_cmake_configure(
     OPTIONS
         -DCMAKE_FIND_PACKAGE_TARGETS_GLOBAL=ON
         -DBUILD_TESTING=OFF
+        -DCMAKE_DISABLE_FIND_PACKAGE_GSSAPI=ON
         -DCMAKE_DISABLE_FIND_PACKAGE_KF5DocTools=ON
         -DCMAKE_VERBOSE_MAKEFILE=ON
         -DKDE_INSTALL_QTPLUGINDIR=plugins
         -DKDE_INSTALL_PLUGINDIR=plugins
         -DKDE_INSTALL_LIBEXECDIR=bin
         ${FEATURE_OPTIONS}
-        --trace-expand
-    MAYBE_UNUSED_VARIABLES CMAKE_DISABLE_FIND_PACKAGE_KF5Notifications
+    MAYBE_UNUSED_VARIABLES
+        CMAKE_DISABLE_FIND_PACKAGE_KF5Notifications
 )
 
 vcpkg_cmake_install()
@@ -66,5 +67,3 @@ endif()
 
 file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*")
 vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES})
-
-

ports/kf5kio/vcpkg.json

@@ -1,6 +1,7 @@
 {
   "name": "kf5kio",
   "version": "5.98.0",
+  "port-version": 1,
   "description": "Network transparent access to files and data",
   "homepage": "https://api.kde.org/frameworks/kio/html/index.html",
   "license": null,
@@ -47,7 +48,10 @@
       "name": "libmount",
       "platform": "linux"
     },
-    "qt5-base",
+    {
+      "name": "qt5-base",
+      "default-features": false
+    },
     {
       "name": "qt5-macextras",
       "platform": "osx"

ports/libmagic/unofficial-libmagic-config.cmake.in

@@ -45,11 +45,11 @@ set_target_properties(unofficial::libmagic::libmagic PROPERTIES
 if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static")
     set_target_properties(unofficial::libmagic::libmagic PROPERTIES
         INTERFACE_LINK_LIBRARIES
-            "\$<LINK_ONLY:$<$<BOOL:${WIN32}>:unofficial::tre::tre>>"
+            "\$<LINK_ONLY:$<$<BOOL:${WIN32}>:unofficial::tre::tre;shlwapi>>"
             "\$<LINK_ONLY:$<@has_zlib@:ZLIB::ZLIB>>"
             "\$<LINK_ONLY:$<@has_bzip2@:BZip2::BZip2>>"
             "\$<LINK_ONLY:$<@has_lzma@:LibLZMA::LibLZMA>>"
-            "\$<LINK_ONLY:$<@has_zstd@:$<IF:$<TARGET_EXISTS:zstd::libzstd_shared>,zstd::libzstd_shared,zstd::libzstd_static>>>"
+            "\$<LINK_ONLY:$<@has_zstd@:zstd::libzstd>"
     )
 endif()
 

ports/libmagic/vcpkg.json

@@ -1,7 +1,7 @@
 {
   "name": "libmagic",
   "version": "5.45",
-  "port-version": 2,
+  "port-version": 3,
   "description": "This library can be used to classify files according to magic number tests.",
   "homepage": "https://github.com/file/file",
   "license": "BSD-2-Clause",

ports/protobuf/portfile.cmake

@@ -121,14 +121,32 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
 endif()
 
 vcpkg_copy_pdbs()
-set(packages protobuf protobuf-lite)
-foreach(_package IN LISTS packages)
-    set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/${_package}.pc")
-    if(EXISTS "${_file}")
-        vcpkg_replace_string(${_file} "-l${_package}" "-l${_package}d")
+
+function(replace_package_string package)
+    set(debug_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/${package}.pc")
+    set(release_file "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/${package}.pc")
+
+    if(EXISTS "${release_file}")
+        if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
+            vcpkg_replace_string(${release_file} "-l${package}" "-llib${package}")
+        endif()
+    endif()
+
+    if(EXISTS "${debug_file}")
+        if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
+            vcpkg_replace_string(${debug_file} "-l${package}" "-llib${package}d")
+        else()
+            vcpkg_replace_string(${debug_file} "-l${package}" "-l${package}d")
+        endif()
     endif()
+endfunction()
+
+set(packages protobuf protobuf-lite)
+foreach(package IN LISTS packages)
+    replace_package_string(${package})
 endforeach()
 
+
 vcpkg_fixup_pkgconfig()
 
 if(NOT protobuf_BUILD_PROTOC_BINARIES)

ports/protobuf/vcpkg.json

@@ -1,7 +1,7 @@
 {
   "name": "protobuf",
   "version": "3.21.12",
-  "port-version": 2,
+  "port-version": 3,
   "description": "Google's language-neutral, platform-neutral, extensible mechanism for serializing structured data.",
   "homepage": "https://github.com/protocolbuffers/protobuf",
   "license": "BSD-3-Clause",

scripts/azure-pipelines/android/Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1.4
 # DisableDockerDetector "Used to build the container deployed to Azure Container Registry"
-FROM ubuntu:focal-20240216
+FROM ubuntu:focal-20240427
 
 ADD https://packages.microsoft.com/config/ubuntu/20.04/packages-microsoft-prod.deb /packages-microsoft-prod.deb
 ADD https://dl.google.com/android/repository/android-ndk-r25c-linux.zip /android-ndk-r25c-linux.zip

scripts/azure-pipelines/azure-pipelines.yml

@@ -2,11 +2,7 @@
 # SPDX-License-Identifier: MIT
 #
 variables:
-  linux-pool: 'PrLin-1ES-Pool'
-  windows-pool: 'PrWin-1ES'
-  osx-pool: 'PrOsx-2024-01-18'
-  osx-arm64-pool: 'PrOsx-2024-01-22-arm64'
-  linux-docker-image: 'vcpkgandroidwus3.azurecr.io/vcpkg-android:2024-04-11'
+  linux-docker-image: 'vcpkgandroidwus3.azurecr.io/vcpkg-android:2024-05-17'
 
 parameters:
   - name: vcpkgToolSha
@@ -37,70 +33,62 @@ jobs:
 - template: windows/azure-pipelines.yml
   parameters:
     jobName: x86_windows
-    poolName: $(windows-pool)
     vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
     tripletPattern: ${{ parameters.tripletPattern }}
 
 - template: windows/azure-pipelines.yml
   parameters:
     jobName: x64_windows
-    poolName: $(windows-pool)
     vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
     tripletPattern: ${{ parameters.tripletPattern }}
 
 - template: windows/azure-pipelines.yml
   parameters:
     jobName: x64_windows_static
-    poolName: $(windows-pool)
     vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
     tripletPattern: ${{ parameters.tripletPattern }}
 
 - template: windows/azure-pipelines.yml
   parameters:
     jobName: x64_windows_static_md
-    poolName: $(windows-pool)
     vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
     tripletPattern: ${{ parameters.tripletPattern }}
 
 - template: windows/azure-pipelines.yml
   parameters:
     jobName: x64_uwp
-    poolName: $(windows-pool)
     vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
     tripletPattern: ${{ parameters.tripletPattern }}
 
 - template: windows/azure-pipelines.yml
   parameters:
     jobName: arm64_windows
-    poolName: $(windows-pool)
     vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
     tripletPattern: ${{ parameters.tripletPattern }}
 
 - template: windows/azure-pipelines.yml
   parameters:
     jobName: arm64_uwp
-    poolName: $(windows-pool)
     vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
     tripletPattern: ${{ parameters.tripletPattern }}
 
 - template: osx/azure-pipelines.yml
   parameters:
     jobName: x64_osx
-    poolName: $(osx-pool)
+    poolName: 'PrOsx-2024-01-18'
     vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
     tripletPattern: ${{ parameters.tripletPattern }}
 
 - template: osx/azure-pipelines.yml
   parameters:
     jobName: arm64_osx
-    poolName: $(osx-arm64-pool)
+    poolName: 'PrOsx-2024-01-22-arm64'
     vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
     tripletPattern: ${{ parameters.tripletPattern }}
 
 - template: linux/azure-pipelines.yml
   parameters:
     jobName: x64_linux
-    poolName: $(linux-pool)
     vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
     tripletPattern: ${{ parameters.tripletPattern }}
 

scripts/azure-pipelines/linux/azure-pipelines.yml

@@ -10,8 +10,6 @@ parameters:
   - name: jobName
     type: string
     default: 'x64_linux'
-  - name: poolName
-    type: string
   - name: tripletPattern
     displayName: 'Enable the triplets which contain this substring'
     type: string
@@ -21,7 +19,7 @@ jobs:
 - job: x64_linux
   condition: and(succeeded(), contains('^${{ replace(parameters.jobName, '_', '-') }}$', '${{ parameters.tripletPattern }}'))
   pool:
-    name: ${{ parameters.poolName }}
+    name: PrLin-1ES-Pool
   workspace:
     clean: resources
   timeoutInMinutes: 1440 # 1 day

scripts/azure-pipelines/windows/azure-pipelines.yml

@@ -10,8 +10,6 @@ parameters:
   - name: jobName
     type: string
     default: 'x86_windows'
-  - name: poolName
-    type: string
   - name: tripletPattern
     displayName: 'Enable the triplets which contain this substring'
     type: string
@@ -21,7 +19,8 @@ jobs:
 - job: ${{ parameters.jobName }}
   condition: and(succeeded(), contains('^${{ replace(parameters.jobName, '_', '-') }}$', '${{ parameters.tripletPattern }}'))
   pool:
-    name: ${{ parameters.poolName }}
+    name: PrWin-1ES
+    demands: ImageVersionOverride -equals 2024.05.24
   workspace:
     clean: resources
   timeoutInMinutes: 2880 # 2 days

scripts/azure-pipelines/windows/create-image.ps1

@@ -24,7 +24,7 @@ $WindowsServerSku = '2022-datacenter-azure-edition'
 $ErrorActionPreference = 'Stop'
 
 $ProgressActivity = 'Creating Windows Image'
-$TotalProgress = 17
+$TotalProgress = 18
 $CurrentProgress = 1
 
 # Assigning this to another variable helps when running the commands in this script manually for
@@ -87,11 +87,11 @@ Write-Progress `
 
 $VcpkgImageMintingAccount = Get-AzStorageAccount -ResourceGroupName 'vcpkg-image-minting' -Name 'vcpkgimageminting'
 
-# Grant 'Storage Blob Data Reader' (RoleDefinitionId 2a2b9908-6ea1-4ae2-8e65-a410df84e7d1) to the VM
-New-AzRoleAssignment `
-  -Scope $VcpkgImageMintingAccount.ID `
-  -RoleDefinitionId '2a2b9908-6ea1-4ae2-8e65-a410df84e7d1' `
-  -ObjectId  $VMCreated.Identity.PrincipalId
+$CudnnStorageContext = New-AzStorageContext -StorageAccountName 'vcpkgimageminting' -UseConnectedAccount
+$StartTime = Get-Date
+$ExpiryTime = $StartTime.AddDays(1)
+$CudnnSas = New-AzStorageContainerSASToken -Name 'assets' -Permission r -StartTime $StartTime -ExpiryTime $ExpiryTime -Context $CudnnStorageContext
+$CudnnUrl = "https://vcpkgimageminting.blob.core.windows.net/assets/cudnn-windows-x86_64-8.8.1.3_cuda12-archive.zip?$CudnnSas"
 
 ####################################################################################################
 Write-Progress `
@@ -127,7 +127,8 @@ Write-Host "deploy-psexec.ps1 output: $($DeployPsExecResult.value.Message)"
 function Invoke-ScriptWithPrefix {
   param(
     [string]$ScriptName,
-    [switch]$AddAdminPw
+    [switch]$AddAdminPw,
+    [string]$CudnnUrl = $null
   )
 
   Write-Progress `
@@ -146,6 +147,10 @@ function Invoke-ScriptWithPrefix {
     }
 
     $script = $script.Replace('# REPLACE WITH UTILITY-PREFIX.ps1', $UtilityPrefixContent);
+    if (-not [string]::IsNullOrEmpty($CudnnUrl)) {
+      $script = $script.Replace('# REPLACE WITH CudnnUrl', "`$CudnnUrl = `"$CudnnUrl`"")
+    }
+
     Set-Content -Path $tempScriptFilename -Value $script -Encoding utf8NoBOM
 
     $parameter = $null
@@ -166,8 +171,6 @@ function Invoke-ScriptWithPrefix {
   }
 }
 
-Invoke-ScriptWithPrefix -ScriptName 'deploy-azcopy.ps1'
-
 ####################################################################################################
 Invoke-ScriptWithPrefix -ScriptName 'deploy-windows-sdks.ps1' -AddAdminPw
 
@@ -180,6 +183,12 @@ Invoke-ScriptWithPrefix -ScriptName 'deploy-mpi.ps1' -AddAdminPw
 ####################################################################################################
 Invoke-ScriptWithPrefix -ScriptName 'deploy-cuda.ps1' -AddAdminPw
 
+####################################################################################################
+Invoke-ScriptWithPrefix -ScriptName 'deploy-cudnn.ps1' -CudnnUrl $CudnnUrl
+
+####################################################################################################
+Invoke-ScriptWithPrefix -ScriptName 'test-cudnn.ps1'
+
 ####################################################################################################
 Invoke-ScriptWithPrefix -ScriptName 'deploy-inteloneapi.ps1' -AddAdminPw
 
@@ -256,11 +265,6 @@ Write-Progress `
   -Status 'Deleting unused temporary resources' `
   -PercentComplete (100 / $TotalProgress * $CurrentProgress++)
 
-Remove-AzRoleAssignment `
-  -Scope $VcpkgImageMintingAccount.ID `
-  -RoleDefinitionId '2a2b9908-6ea1-4ae2-8e65-a410df84e7d1' `
-  -ObjectId  $VMCreated.Identity.PrincipalId
-
 Remove-AzVM -Id $VMCreated.ID -Force
 Remove-AzDisk -ResourceGroupName 'vcpkg-image-minting' -Name $VMCreatedOsDisk -Force
 Remove-AzNetworkInterface -ResourceGroupName 'vcpkg-image-minting' -Name $NicName -Force