Use official commit after finding it

Author: JohnMcPMS

.gitignore

@@ -20,6 +20,7 @@ settings.json
 [Rr]eleases/
 x64/
 x86/
+arm64/
 AnyCPU/
 Fuzzing/
 bld/

src/VcpkgPortOverlay/CreatePortOverlay.ps1

@@ -208,6 +208,44 @@ function Add-PatchToPortFile
     $modifiedPortFile | Out-File $portFilePath
 }
 
+# Removes all patches from portfile.cmake
+function Remove-PortPatches
+{
+    param(
+        [Parameter(Mandatory)]
+        [string]$Port
+    )
+
+    # Look for the line that says "PATCHES"
+
+    $portFilePath = Join-Path $OverlayRoot $Port "portfile.cmake"
+    $originalPortFile = Get-Content $portFilePath
+
+    $modifiedPortFile = @()
+    foreach ($line in $originalPortFile)
+    {
+        if ($line.TrimEnd().EndsWith("PATCHES"))
+        {
+            $foundPatches = $true
+        }
+        elseif ($line -eq ")")
+        {
+            $foundParen = $true
+            $modifiedPortFile += $line
+        }
+        elseif ($foundPatches -and -not $foundParen)
+        {
+            # Drop line
+        }
+        else
+        {
+            $modifiedPortFile += $line
+        }
+    }
+
+    $modifiedPortFile | Out-File $portFilePath
+}
+
 # Adds a patch to a port
 function Add-PatchToPort
 {
@@ -236,26 +274,6 @@ function Add-PatchToPort
     Add-PatchToPortFile -Port $Port -PatchName $PatchName
 }
 
-# Copies a patch to a port
-function Copy-PatchToPort
-{
-    param(
-        [Parameter(Mandatory)]
-        [string]$Port,
-        [Parameter(Mandatory)]
-        [string]$PatchPath,  # overlay relative directory
-        [Parameter(Mandatory)]
-        [string]$PatchName
-    )
-
-    $portSource = Join-Path $OverlayRoot $PatchPath $PatchName
-
-    $portDir = Join-Path $OverlayRoot $Port
-    Copy-Item -Path $portSource -Destination (Join-Path $portDir $PatchName)
-
-    Add-PatchToPortFile -Port $Port -PatchName $PatchName
-}
-
 # Sets the value of an existing function parameter.
 # For example, REF in vcpkg_from_github
 function Set-ParameterInPortFile
@@ -295,13 +313,12 @@ function Update-PortSource
         [Parameter(Mandatory)]
         [string]$Commit,
         [Parameter(Mandatory)]
-        [string]$SourceHash
+        [string]$SourceHash,
+        [string]$RefPattern = '[0-9a-f]{40}( #.*)?$'
     )
 
-    $portDir = Join-Path $OverlayRoot $Port
-
     # For the REF, we also delete any comments after it that may say the wrong version
-    Set-ParameterInPortFile $Port -ParameterName 'REF' -CurrentValuePattern '[0-9a-f]{40}( #.*)?$' -NewValue "$Commit # Unreleased"
+    Set-ParameterInPortFile $Port -ParameterName 'REF' -CurrentValuePattern $RefPattern -NewValue "$Commit # Unreleased"
     Set-ParameterInPortFile $Port -ParameterName 'SHA512' -CurrentValuePattern '[0-9a-f]{128}' -NewValue $SourceHash
 }
 
@@ -323,7 +340,8 @@ New-PortOverlay cpprestsdk -Version 2.10.18 -PortVersion 4
 Add-PatchToPort cpprestsdk -PatchRepo 'microsoft/winget-cli' -PatchCommit '888b4ed8f4f7d25cb05a47210e083fe29348163b' -PatchName 'add-server-certificate-validation.patch' -PatchRoot 'src/cpprestsdk/cpprestsdk'
 
 New-PortOverlay detours -Version 4.0.1 -PortVersion 8
-Copy-PatchToPort detours -PatchPath 'detours_manual' -PatchName 'undockedregfreewinrt-version.patch'
+Update-PortSource detours -RefPattern 'v4.0.1' -Commit '404c153ff390cb14f1787c7feeb4908c6d79b0ab' -SourceHash '1f3f26657927fa153116dce13dbfa3319ea368e6c9017f4999b6ec24d6356c335b3d5326718d3ec707b92832763ffea092088df52596f016d7ca9b8127f7033d'
+Remove-PortPatches detours
 
 New-PortOverlay libyaml -Version 0.2.5 -PortVersion 5
 Update-PortSource libyaml -Commit '840b65c40675e2d06bf40405ad3f12dec7f35923' -SourceHash 'de85560312d53a007a2ddf1fe403676bbd34620480b1ba446b8c16bb366524ba7a6ed08f6316dd783bf980d9e26603a9efc82f134eb0235917b3be1d3eb4b302'

src/VcpkgPortOverlay/README.md

@@ -12,7 +12,18 @@ Note that we use v2.10.18, which is not the latest.
 
 Changes:
 * Add patch file: `add-server-certificate-validation.patch`
-  Patch source: https://github.com/microsoft/winget-cli/commit/888b4ed8f4f7d25cb05a47210e083fe29348163b
+* Patch source: https://github.com/microsoft/winget-cli/commit/888b4ed8f4f7d25cb05a47210e083fe29348163b
+
+## detours
+
+We use the version used by UndockedRegFreeWinRT (https://github.com/microsoft/winget-cli/tree/release-v1.10/src/Xlang/UndockedRegFreeWinRT/src/UndockedRegFreeWinRT/detours).
+The only official release of detours (4.0.1) does not include complete support for ARM64.
+While the exact version that we pulled from UndockedRegFreeWinRT is unclear (https://github.com/microsoft/xlang/pull/644), through manually comparing versions it is equivalent to
+https://github.com/microsoft/Detours/commit/404c153ff390cb14f1787c7feeb4908c6d79b0ab (only some whitespace changes are present).
+
+Changes:
+* New source commit: https://github.com/microsoft/Detours/commit/404c153ff390cb14f1787c7feeb4908c6d79b0ab
+* Remove the patch on the official port as it is already present in the newer commit
 
 ## libyaml
 

src/VcpkgPortOverlay/detours/portfile.cmake

@@ -3,12 +3,9 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO microsoft/Detours
-    REF v4.0.1
-    SHA512 0a9c21b8222329add2de190d2e94d99195dfa55de5a914b75d380ffe0fb787b12e016d0723ca821001af0168fd1643ffd2455298bf3de5fdc155b3393a3ccc87
+    REF 404c153ff390cb14f1787c7feeb4908c6d79b0ab # Unreleased
+    SHA512 1f3f26657927fa153116dce13dbfa3319ea368e6c9017f4999b6ec24d6356c335b3d5326718d3ec707b92832763ffea092088df52596f016d7ca9b8127f7033d
     HEAD_REF master
-    PATCHES 
-        find-jmp-bounds-arm64.patch
-        undockedregfreewinrt-version.patch
 )
 
 vcpkg_build_nmake(