From 7fb6edfb8c71cb091ee95d53dd52ca4d65f7a449 Mon Sep 17 00:00:00 2001 From: Kevin Pfeifer Date: Mon, 25 Dec 2023 13:37:06 +0100 Subject: [PATCH] take whitespaces into account --- .github/workflows/build-windows-vcpkg.yml | 58 +++++++++++------------ 1 file changed, 28 insertions(+), 30 deletions(-) diff --git a/.github/workflows/build-windows-vcpkg.yml b/.github/workflows/build-windows-vcpkg.yml index 1909cf0549..dde3ea4119 100644 --- a/.github/workflows/build-windows-vcpkg.yml +++ b/.github/workflows/build-windows-vcpkg.yml @@ -35,37 +35,35 @@ jobs: run: | cd vcpkg echo "GIT_COMMIT=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT - - tee -a ./libslirp-update.patch << END - diff --git a/ports/libslirp/portfile.cmake b/ports/libslirp/portfile.cmake - index 0bd6e252c..756e4b9b8 100644 - --- a/ports/libslirp/portfile.cmake - +++ b/ports/libslirp/portfile.cmake - @@ -2,8 +2,8 @@ vcpkg_from_gitlab( - GITLAB_URL https://gitlab.freedesktop.org/ - OUT_SOURCE_PATH SOURCE_PATH - REPO slirp/libslirp - - REF v4.7.0 - - SHA512 387f4a6dad240ce633df2640bb49c6cb0041c8b3afc8d0ef38186d385f00dd9e4ef4443e93e1b71dbf05e22892b6f2771a87a202e815d8ec899ab5c147a1f09f - + REF 129077f9870426d1b7b3a8239d8b5a50bee017b4 - + SHA512 0 - HEAD_REF master - ) - diff --git a/ports/libslirp/vcpkg.json b/ports/libslirp/vcpkg.json - index 032e5cc5d..f849f54c3 100644 - --- a/ports/libslirp/vcpkg.json - +++ b/ports/libslirp/vcpkg.json - @@ -4,7 +4,7 @@ - "description": "libslirp is a user-mode networking library used by virtual machines, containers or various tools.", - "homepage": "https://gitlab.freedesktop.org/slirp/libslirp", - "license": "BSD-3-Clause", - - "supports": "!windows | mingw", - + "supports": "windows | mingw", - "dependencies": [ - "glib", - { - END + echo 'diff --git a/ports/libslirp/portfile.cmake b/ports/libslirp/portfile.cmake' | tee -a libslirp-update.patch + echo 'index 0bd6e252c..756e4b9b8 100644' | tee -a libslirp-update.patch + echo '--- a/ports/libslirp/portfile.cmake' | tee -a libslirp-update.patch + echo '+++ b/ports/libslirp/portfile.cmake' | tee -a libslirp-update.patch + echo '@@ -2,8 +2,8 @@ vcpkg_from_gitlab(' | tee -a libslirp-update.patch + echo ' GITLAB_URL https://gitlab.freedesktop.org/' | tee -a libslirp-update.patch + echo ' OUT_SOURCE_PATH SOURCE_PATH' | tee -a libslirp-update.patch + echo ' REPO slirp/libslirp' | tee -a libslirp-update.patch + echo '- REF v4.7.0' | tee -a libslirp-update.patch + echo '- SHA512 387f4a6dad240ce633df2640bb49c6cb0041c8b3afc8d0ef38186d385f00dd9e4ef4443e93e1b71dbf05e22892b6f2771a87a202e815d8ec899ab5c147a1f09f' | tee -a libslirp-update.patch + echo '+ REF 129077f9870426d1b7b3a8239d8b5a50bee017b4' | tee -a libslirp-update.patch + echo '+ SHA512 0' | tee -a libslirp-update.patch + echo ' HEAD_REF master' | tee -a libslirp-update.patch + echo ' )' | tee -a libslirp-update.patch + echo '' | tee -a libslirp-update.patch + echo 'diff --git a/ports/libslirp/vcpkg.json b/ports/libslirp/vcpkg.json' | tee -a libslirp-update.patch + echo 'index 032e5cc5d..f849f54c3 100644' | tee -a libslirp-update.patch + echo '--- a/ports/libslirp/vcpkg.json' | tee -a libslirp-update.patch + echo '+++ b/ports/libslirp/vcpkg.json' | tee -a libslirp-update.patch + echo '@@ -4,7 +4,7 @@' | tee -a libslirp-update.patch + echo ' "description": "libslirp is a user-mode networking library used by virtual machines, containers or various tools.",' | tee -a libslirp-update.patch + echo ' "homepage": "https://gitlab.freedesktop.org/slirp/libslirp",' | tee -a libslirp-update.patch + echo ' "license": "BSD-3-Clause",' | tee -a libslirp-update.patch + echo '- "supports": "!windows | mingw",' | tee -a libslirp-update.patch + echo '+ "supports": "windows | mingw",' | tee -a libslirp-update.patch + echo ' "dependencies": [' | tee -a libslirp-update.patch + echo ' "glib",' | tee -a libslirp-update.patch + echo ' {' | tee -a libslirp-update.patch git apply ./libslirp-update.patch --reject --whitespace=fix id: version