From 86620461ebd7c74b451e0e75ecb25bfeb1e47a50 Mon Sep 17 00:00:00 2001 From: RT222 Date: Tue, 22 Oct 2019 02:19:35 +0200 Subject: [yoga] Update to 1.16.0 and enabled UWP builds (#8630) * [yoga] Update to 1.16.0 * [yoga] Enabled UWP builds * [yoga] Fixed regressions --- ports/yoga/CONTROL | 2 +- ports/yoga/add-project-declaration.patch | 4 +--- ports/yoga/portfile.cmake | 10 +++------- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/ports/yoga/CONTROL b/ports/yoga/CONTROL index 01f28ac17..52e8498a3 100644 --- a/ports/yoga/CONTROL +++ b/ports/yoga/CONTROL @@ -1,4 +1,4 @@ Source: yoga -Version: 1.14.0-1 +Version: 1.16.0-1 Homepage: https://github.com/facebook/yoga Description: Yoga is a cross-platform layout engine which implements Flexbox diff --git a/ports/yoga/add-project-declaration.patch b/ports/yoga/add-project-declaration.patch index 31a87ee1f..299078ee0 100644 --- a/ports/yoga/add-project-declaration.patch +++ b/ports/yoga/add-project-declaration.patch @@ -1,5 +1,3 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5a89ace..6b5836d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,7 +6,7 @@ @@ -10,4 +8,4 @@ index 5a89ace..6b5836d 100644 +project(yogacore CXX) set(CMAKE_VERBOSE_MAKEFILE on) - file(GLOB yogacore_SRC yoga/*.cpp) + file(GLOB_RECURSE yogacore_SRC yoga/*.cpp) diff --git a/ports/yoga/portfile.cmake b/ports/yoga/portfile.cmake index c48e2c0b7..53254da06 100644 --- a/ports/yoga/portfile.cmake +++ b/ports/yoga/portfile.cmake @@ -2,15 +2,11 @@ include(vcpkg_common_functions) vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL WindowsStore) - message(FATAL_ERROR "Error: UWP builds not supported yet.") -endif() - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/yoga - REF 1.14.0 - SHA512 c634cb9be08a4f4f478c50de9f26a2e1a18b9c6313b78665cd3a28047bd04e14aac2f06702c3bc9f55dba605177b787424a405c4043f052a94d311c76e38bef1 + REF 1.16.0 + SHA512 ad53c3008f9d934b53350927c68fb91391bf2e973f05a446e4819fe424a9334f6d9f06bc14c50d5c310c83d3ba8482a920d640c9bce21a8483d7195c798bbe34 HEAD_REF master PATCHES add-project-declaration.patch ) @@ -45,4 +41,4 @@ endif() vcpkg_copy_pdbs() -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/yoga RENAME copyright) \ No newline at end of file +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file -- cgit v1.2.3