diff --git a/ports/capnproto/disable-C-20-co-routines.patch b/ports/capnproto/disable-C-20-co-routines.patch deleted file mode 100644 index ab292af079..0000000000 --- a/ports/capnproto/disable-C-20-co-routines.patch +++ /dev/null @@ -1,25 +0,0 @@ -From da5b439b558e354a8fc59d09dff6a9eb657f54fd Mon Sep 17 00:00:00 2001 -From: Stig Hornang -Date: Mon, 28 Aug 2023 22:28:43 +0200 -Subject: [PATCH] Disable C++20 co-routines - ---- - c++/src/kj/async-prelude.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/c++/src/kj/async-prelude.h b/c++/src/kj/async-prelude.h -index 6289bf3f..c9845cdc 100644 ---- a/c++/src/kj/async-prelude.h -+++ b/c++/src/kj/async-prelude.h -@@ -36,7 +36,7 @@ - #if (__cpp_impl_coroutine >= 201902L) && __has_include() - // C++20 Coroutines detected. - #include --#define KJ_HAS_COROUTINE 1 -+// #define KJ_HAS_COROUTINE 1 - #define KJ_COROUTINE_STD_NAMESPACE std - #elif (__cpp_coroutines >= 201703L) && __has_include() - // Coroutines TS detected. --- -2.41.0.windows.3 - diff --git a/ports/capnproto/portfile.cmake b/ports/capnproto/portfile.cmake index 64ffee8d80..7df078985b 100644 --- a/ports/capnproto/portfile.cmake +++ b/ports/capnproto/portfile.cmake @@ -7,7 +7,6 @@ vcpkg_from_github( SHA512 56551ecad52cf06e5dd52401e6d848eae41126c6ba2bb31a9ec1c82e1b47e0e6171d69db923c118c614aec0d396ddf35724081cccef3a605c39d0b5379a2c03e HEAD_REF master PATCHES - disable-C-20-co-routines.patch undef-KJ_USE_EPOLL-for-ANDROID_PLATFORM-23.patch ) diff --git a/ports/capnproto/vcpkg.json b/ports/capnproto/vcpkg.json index 79f4d05759..7d671e4a99 100644 --- a/ports/capnproto/vcpkg.json +++ b/ports/capnproto/vcpkg.json @@ -1,6 +1,7 @@ { "name": "capnproto", "version": "1.0.2", + "port-version": 1, "description": "Data interchange format and capability-based RPC system", "homepage": "https://capnproto.org/", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index b802011d15..57ababc371 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1506,7 +1506,7 @@ }, "capnproto": { "baseline": "1.0.2", - "port-version": 0 + "port-version": 1 }, "capstone": { "baseline": "5.0.3", diff --git a/versions/c-/capnproto.json b/versions/c-/capnproto.json index 76c44eefcd..7e430ee7b3 100644 --- a/versions/c-/capnproto.json +++ b/versions/c-/capnproto.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "38a65f51f26928a3ea7bed90ada2ec4081091a6b", + "version": "1.0.2", + "port-version": 1 + }, { "git-tree": "52f73df5478fbcdb34b8dd5dd8d488672031cc32", "version": "1.0.2",