diff --git a/ports/yoga/disable_tests.patch b/ports/yoga/disable_tests.patch index b9bbb92645..c2f4b452b7 100644 --- a/ports/yoga/disable_tests.patch +++ b/ports/yoga/disable_tests.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index e4f8535c..4e6f6914 100644 +index 55f1a6df..c8c15c30 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,7 +10,7 @@ set(CMAKE_VERBOSE_MAKEFILE on) @@ -9,5 +9,5 @@ index e4f8535c..4e6f6914 100644 -add_subdirectory(tests) +# add_subdirectory(tests) - # cmake install config - include(GNUInstallDirs) + option(BUILD_FUZZ_TESTS "Build fuzz tests" OFF) + diff --git a/ports/yoga/portfile.cmake b/ports/yoga/portfile.cmake index c918a1953d..2eb6976ead 100644 --- a/ports/yoga/portfile.cmake +++ b/ports/yoga/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/yoga REF "v${VERSION}" - SHA512 54ec9d4cee822d7480bb10f973769b3bc4c408720bfbaf9b8247747ae64ca75dca62b2d53dd4cb29addc9ec99d135d090c0e3e831108ac36e34863bf814448eb + SHA512 3831e467428a54d256b75aa9fa86830b9ceb124eb6e16d817affa72b6093c768c7763e1d13bcdc3b332e4354df4367f88289ecd533790d89ccd90cef206563f8 HEAD_REF master PATCHES disable_tests.patch diff --git a/ports/yoga/vcpkg.json b/ports/yoga/vcpkg.json index 840c93982f..d14cda3605 100644 --- a/ports/yoga/vcpkg.json +++ b/ports/yoga/vcpkg.json @@ -1,7 +1,6 @@ { "name": "yoga", - "version": "2.0.1", - "port-version": 1, + "version": "3.0.2", "description": "Yoga is a cross-platform layout engine which implements Flexbox", "homepage": "https://github.com/facebook/yoga", "license": "MIT", diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 8b47f6c122..3d9f49e3d6 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1218,6 +1218,9 @@ xbitmaps:arm64-android=fail xbitmaps:x64-android=fail xbitmaps:x64-osx=skip xbitmaps:arm64-osx=skip +yoga:arm-neon-android=fail +yoga:arm64-android=fail +yoga:x64-android=fail zeroc-ice:arm-neon-android=fail zeroc-ice:arm64-android=fail zeroc-ice:x64-android=fail diff --git a/versions/baseline.json b/versions/baseline.json index 6c38c16da5..5e75877bb4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -9537,8 +9537,8 @@ "port-version": 0 }, "yoga": { - "baseline": "2.0.1", - "port-version": 1 + "baseline": "3.0.2", + "port-version": 0 }, "yomm2": { "baseline": "1.4.0", diff --git a/versions/y-/yoga.json b/versions/y-/yoga.json index 692ece777b..dcefd29f07 100644 --- a/versions/y-/yoga.json +++ b/versions/y-/yoga.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "be1192567872f981e847d21819c5ec44edc2b43f", + "version": "3.0.2", + "port-version": 0 + }, { "git-tree": "216e97a199e84fb6894035fb5682e54a72f11744", "version": "2.0.1",