From e7f2ac9e999ce46df699cb15bc2fa640b457f105 Mon Sep 17 00:00:00 2001 From: Jan Dupej <109523496+jandupej@users.noreply.github.com> Date: Thu, 3 Oct 2024 16:53:47 +0200 Subject: [PATCH] [bond] Update bond port to version 13.0.1 (#41314) --- ports/bond/fix-msc-ver.patch | 13 ------------- ports/bond/portfile.cmake | 5 ++--- ports/bond/vcpkg.json | 3 +-- versions/b-/bond.json | 5 +++++ versions/baseline.json | 4 ++-- 5 files changed, 10 insertions(+), 20 deletions(-) delete mode 100644 ports/bond/fix-msc-ver.patch diff --git a/ports/bond/fix-msc-ver.patch b/ports/bond/fix-msc-ver.patch deleted file mode 100644 index dedaca158a..0000000000 --- a/ports/bond/fix-msc-ver.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/cpp/inc/bond/core/detail/sdl.h b/cpp/inc/bond/core/detail/sdl.h -index 2a515f8..a38e6ff 100644 ---- a/cpp/inc/bond/core/detail/sdl.h -+++ b/cpp/inc/bond/core/detail/sdl.h -@@ -24,7 +24,7 @@ - namespace bond { namespace detail - { - --#ifdef _MSC_VER -+#if defined(_MSC_VER) && _MSC_VER < 1915 - - template inline - stdext::checked_array_iterator make_checked_array_iterator( diff --git a/ports/bond/portfile.cmake b/ports/bond/portfile.cmake index b873575776..8809ba6367 100644 --- a/ports/bond/portfile.cmake +++ b/ports/bond/portfile.cmake @@ -4,18 +4,17 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO microsoft/bond REF "${VERSION}" - SHA512 54316e955ce130ec8bb3795b45222fe38c6079cb29e4b5612a97bed8dd9876d378009af3ab0c554c0ded49ca5fde4544e87e3dc8a8c5f176947d439d73c662ee + SHA512 b00e371686bbd8aca36d70ffb079a460323e9aecef7431d78018891d27c9af9fe0cad9f489b7e98b3c9ef9786192d75e72fe6835fb6933983ccb0ecf05bb99df HEAD_REF master PATCHES fix-install-path.patch - fix-msc-ver.patch ) if (VCPKG_TARGET_IS_WINDOWS) vcpkg_download_distfile(GBC_ARCHIVE URLS "https://github.com/microsoft/bond/releases/download/${VERSION}/gbc-${VERSION}-amd64.zip" FILENAME "gbc-${VERSION}-amd64.zip" - SHA512 fde9dc862b71c843278dcbb90137b86e23869d79036367008f01165f22b11b067bd78d21eff8385ab0e96d80fa3194380bdd661199c44a8552252bcc4c9e18c0 + SHA512 4CD92F0665E36CB718311A237DF80B8CD93BFE33971F6460B88A1B74E9E2237D6AEA146766D6AE92674E2DDBBB3245CEBB199FF5BA82163FE69781340E0479AE ) # Clear the generator to prevent it from updating diff --git a/ports/bond/vcpkg.json b/ports/bond/vcpkg.json index d74343e8f0..51f162963f 100644 --- a/ports/bond/vcpkg.json +++ b/ports/bond/vcpkg.json @@ -1,7 +1,6 @@ { "name": "bond", - "version": "11.0.1", - "port-version": 4, + "version": "13.0.1", "description": "Bond is a cross-platform framework for working with schematized data. It supports cross-language de/serialization and powerful generic mechanisms for efficiently manipulating data. Bond is broadly used at Microsoft in high scale services.", "homepage": "https://github.com/Microsoft/bond", "dependencies": [ diff --git a/versions/b-/bond.json b/versions/b-/bond.json index be8408aeb0..76bbd1097b 100644 --- a/versions/b-/bond.json +++ b/versions/b-/bond.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e514b127e67f594fcbfbead6316497b0ae2bb3bf", + "version": "13.0.1", + "port-version": 0 + }, { "git-tree": "509a47415e454dad381998007ac964af4a288bb1", "version": "11.0.1", diff --git a/versions/baseline.json b/versions/baseline.json index 3c586c2772..14157cfb7b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -725,8 +725,8 @@ "port-version": 0 }, "bond": { - "baseline": "11.0.1", - "port-version": 4 + "baseline": "13.0.1", + "port-version": 0 }, "boolinq": { "baseline": "3.0.4",