From 717732e7fbf462cbc75aed5411491ede0394da0a Mon Sep 17 00:00:00 2001 From: Zhao Liu Date: Tue, 30 May 2023 01:12:37 -0700 Subject: [PATCH 1/4] [angelscript] fix build dependency errors --- ports/angelscript/fix-dependency.patch | 9 +++++++++ ports/angelscript/portfile.cmake | 1 + ports/angelscript/vcpkg.json | 1 + 3 files changed, 11 insertions(+) create mode 100644 ports/angelscript/fix-dependency.patch diff --git a/ports/angelscript/fix-dependency.patch b/ports/angelscript/fix-dependency.patch new file mode 100644 index 00000000000000..be5213f84a5f18 --- /dev/null +++ b/ports/angelscript/fix-dependency.patch @@ -0,0 +1,9 @@ +diff --git a/angelscript/projects/cmake/cmake/AngelscriptConfig.cmake b/angelscript/projects/cmake/cmake/AngelscriptConfig.cmake +index 4d1ef0f..ec14fe9 100644 +--- a/angelscript/projects/cmake/cmake/AngelscriptConfig.cmake ++++ b/angelscript/projects/cmake/cmake/AngelscriptConfig.cmake +@@ -1,2 +1,4 @@ + include("${CMAKE_CURRENT_LIST_DIR}/AngelscriptTargets.cmake") ++include(CMakeFindDependencyMacro) ++find_dependency(Threads REQUIRED) + diff --git a/ports/angelscript/portfile.cmake b/ports/angelscript/portfile.cmake index f8ea42f52edb57..76dc34502c9ed1 100644 --- a/ports/angelscript/portfile.cmake +++ b/ports/angelscript/portfile.cmake @@ -9,6 +9,7 @@ vcpkg_extract_source_archive( ARCHIVE "${ARCHIVE}" PATCHES mark-threads-private.patch + fix-dependency.patch ) vcpkg_cmake_configure( diff --git a/ports/angelscript/vcpkg.json b/ports/angelscript/vcpkg.json index b9662364dda0f1..472f7a81154f4b 100644 --- a/ports/angelscript/vcpkg.json +++ b/ports/angelscript/vcpkg.json @@ -1,6 +1,7 @@ { "name": "angelscript", "version": "2.36.1", + "port-version": 1, "description": "The AngelCode Scripting Library, or AngelScript as it is also known, is an extremely flexible cross-platform scripting library designed to allow applications to extend their functionality through external scripts. It has been designed from the beginning to be an easy to use component, both for the application programmer and the script writer.", "homepage": "https://angelcode.com/angelscript", "license": "Zlib", From 3b3c1311560d043b2b1f4fc0d9ec363097dd6f8e Mon Sep 17 00:00:00 2001 From: Zhao Liu Date: Tue, 30 May 2023 01:19:06 -0700 Subject: [PATCH 2/4] update version --- versions/a-/angelscript.json | 5 +++++ versions/baseline.json | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/a-/angelscript.json b/versions/a-/angelscript.json index 49745dd32a57bb..d0a7809e6f5933 100644 --- a/versions/a-/angelscript.json +++ b/versions/a-/angelscript.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b2201125685375e9427ff82e40e6db16c6bc7a94", + "version": "2.36.1", + "port-version": 1 + }, { "git-tree": "e90e0fe54ab8038226b849471fba169157753c19", "version": "2.36.1", diff --git a/versions/baseline.json b/versions/baseline.json index d3d15af56a2ece..731c60a5f36a9a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -118,7 +118,7 @@ }, "angelscript": { "baseline": "2.36.1", - "port-version": 0 + "port-version": 1 }, "angle": { "baseline": "chromium_5414", From cd7aebbf2b83b891b475c1f8bdd61e93226d3bf7 Mon Sep 17 00:00:00 2001 From: Zhao Liu Date: Tue, 30 May 2023 01:27:19 -0700 Subject: [PATCH 3/4] update portfile.cmake --- ports/angelscript/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/angelscript/portfile.cmake b/ports/angelscript/portfile.cmake index 76dc34502c9ed1..ac93fa2d0442dc 100644 --- a/ports/angelscript/portfile.cmake +++ b/ports/angelscript/portfile.cmake @@ -9,7 +9,7 @@ vcpkg_extract_source_archive( ARCHIVE "${ARCHIVE}" PATCHES mark-threads-private.patch - fix-dependency.patch + fix-dependency.patch ) vcpkg_cmake_configure( From 606be66b76feb21461643c20c52a9e471ae3cdac Mon Sep 17 00:00:00 2001 From: Zhao Liu Date: Tue, 30 May 2023 01:27:41 -0700 Subject: [PATCH 4/4] update version --- versions/a-/angelscript.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/a-/angelscript.json b/versions/a-/angelscript.json index d0a7809e6f5933..d6c134f048ae5f 100644 --- a/versions/a-/angelscript.json +++ b/versions/a-/angelscript.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "b2201125685375e9427ff82e40e6db16c6bc7a94", + "git-tree": "5c1bc126371829227e923c11f029a539a234a483", "version": "2.36.1", "port-version": 1 },