diff --git a/ports/stlab/cross-build.patch b/ports/stlab/cross-build.patch deleted file mode 100644 index 79a2fa4eee..0000000000 --- a/ports/stlab/cross-build.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/cmake/StlabUtil.cmake b/cmake/StlabUtil.cmake -index 3e36278..aeb284f 100644 ---- a/cmake/StlabUtil.cmake -+++ b/cmake/StlabUtil.cmake -@@ -2,14 +2,14 @@ - # functionality useful for stlab builds. - - include( CheckCXXSymbolExists ) --include( CheckCXXSourceRuns ) -+include( CheckCXXSourceCompiles ) - - # Determine if the selected C++ compiler has functional coroutines. Set the - # specified 'result_var' to 'TRUE' if they are determined to be disfunctional - # and 'FALSE' otherwise. Note that this check consists of a smoke test and does - # not check all the ways this feature may be deficient. - function( stlab_check_disfunctional_coroutines result_var ) -- check_cxx_source_runs( " -+ check_cxx_source_compiles( " - #include - #include - #include diff --git a/ports/stlab/devendoring.patch b/ports/stlab/devendoring.patch index 0fd1bf72fa..0f5d1ef3ca 100644 --- a/ports/stlab/devendoring.patch +++ b/ports/stlab/devendoring.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 61a3ccb..108f3c3 100644 +index 42d624a..887cc0d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,8 +9,7 @@ include(cmake/CPM.cmake) @@ -12,7 +12,7 @@ index 61a3ccb..108f3c3 100644 # Enable dependency tracking BEFORE project() cpp_library_enable_dependency_tracking() -@@ -147,11 +146,11 @@ add_subdirectory(src) +@@ -159,11 +158,11 @@ add_subdirectory(src) # Dependencies (added after project() for dependency tracking) # https://github.com/stlab/stlab-copy-on-write @@ -26,7 +26,7 @@ index 61a3ccb..108f3c3 100644 target_link_libraries(stlab INTERFACE $) # System dependencies -@@ -183,7 +182,7 @@ endif() +@@ -196,7 +195,7 @@ endif() ######################################################## # Installation Support (using cpp-library dependency auto-discovery) if(PROJECT_IS_TOP_LEVEL) diff --git a/ports/stlab/portfile.cmake b/ports/stlab/portfile.cmake index b359345545..2b96285313 100644 --- a/ports/stlab/portfile.cmake +++ b/ports/stlab/portfile.cmake @@ -2,10 +2,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO stlab/libraries REF "v${VERSION}" - SHA512 b37466fa43c0a6834f8929a77cdd8d1a2230665b28be7032451fe2d3563dc2a5d475e4bd272808f652a6633f02794b82c7b135ffd1c5c064cea78b615e223d84 + SHA512 4783697ada2102082e37fbb581d75fc04f89c71228771927ce1f63bbe05b24d632e574dec1aeae5a9e027996e30962852615a3c60d566404da7ddfabde53f87c HEAD_REF main PATCHES - cross-build.patch devendoring.patch use-cxx-20.patch ) diff --git a/ports/stlab/vcpkg.json b/ports/stlab/vcpkg.json index a3c3955869..2f09b583d1 100644 --- a/ports/stlab/vcpkg.json +++ b/ports/stlab/vcpkg.json @@ -1,6 +1,6 @@ { "name": "stlab", - "version": "2.2.0", + "version": "2.3.0", "description": [ "stlab is the ongoing work of what was Adobe Software Technology Lab.", "The Concurrency library provides futures and channels, high level constructs for implementing algorithms that eases the use of multiple CPU cores while minimizing contention. This library solves several problems of the C++11 and C++17 TS futures." diff --git a/versions/baseline.json b/versions/baseline.json index 85bb237fb4..0f63c9ecd9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -9529,7 +9529,7 @@ "port-version": 0 }, "stlab": { - "baseline": "2.2.0", + "baseline": "2.3.0", "port-version": 0 }, "stlab-copy-on-write": { diff --git a/versions/s-/stlab.json b/versions/s-/stlab.json index 34dcb58966..c2c787b8fc 100644 --- a/versions/s-/stlab.json +++ b/versions/s-/stlab.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8a6c26c3ac8aea1453e791ed01f2ad4bf539df31", + "version": "2.3.0", + "port-version": 0 + }, { "git-tree": "21ece7941a63cf763a93218dd4b2999ff6209222", "version": "2.2.0",