From cc1f0b5471539b6bfc5e9e362566131cef96ebdd Mon Sep 17 00:00:00 2001 From: Cheney-Wang Date: Mon, 13 Jun 2022 02:40:15 -0700 Subject: [PATCH 1/3] [check] Fix the incorrect path of dll --- ports/check/fix-lib-path.patch | 8 +++----- ports/check/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/check.json | 5 +++++ 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/ports/check/fix-lib-path.patch b/ports/check/fix-lib-path.patch index 1951c2bfe7c98f..d3086e74fe7087 100644 --- a/ports/check/fix-lib-path.patch +++ b/ports/check/fix-lib-path.patch @@ -29,17 +29,15 @@ index 38cbc53..d8a4272 100644 # vim: shiftwidth=2:softtabstop=2:tabstop=2:expandtab:autoindent diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 4a02dbe..ade4cfd 100644 +index 4a02dbe..3bf2fa6 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -191,8 +191,8 @@ if(NOT THIS_IS_SUBPROJECT) +@@ -191,7 +191,7 @@ if(NOT THIS_IS_SUBPROJECT) install(TARGETS check checkShared EXPORT check-targets ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/manual-link -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}/manual-link + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} ) - endif() diff --git a/ports/check/vcpkg.json b/ports/check/vcpkg.json index bf10a4838c5256..a605fadc00e5b5 100644 --- a/ports/check/vcpkg.json +++ b/ports/check/vcpkg.json @@ -1,7 +1,7 @@ { "name": "check", "version": "0.15.2", - "port-version": 3, + "port-version": 4, "description": "A unit testing framework for C", "homepage": "https://github.com/libcheck/check", "license": "LGPL-2.1", diff --git a/versions/baseline.json b/versions/baseline.json index bb54b660c8839e..6076255cb3c23d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1362,7 +1362,7 @@ }, "check": { "baseline": "0.15.2", - "port-version": 3 + "port-version": 4 }, "chipmunk": { "baseline": "7.0.3", diff --git a/versions/c-/check.json b/versions/c-/check.json index 2bdf457569a265..42d330a5437e90 100644 --- a/versions/c-/check.json +++ b/versions/c-/check.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "edcd56a61341e496e9e7ab8d895c9a3738ca2abd", + "version": "0.15.2", + "port-version": 4 + }, { "git-tree": "f9804577939493b7f7934d98adc953624e0020c4", "version": "0.15.2", From e86a15259aa39368ca522d5d729244ad0ed011b4 Mon Sep 17 00:00:00 2001 From: Lily Wang Date: Mon, 13 Jun 2022 03:10:49 -0700 Subject: [PATCH 2/3] update license --- ports/check/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/check/vcpkg.json b/ports/check/vcpkg.json index a605fadc00e5b5..94886bedac951d 100644 --- a/ports/check/vcpkg.json +++ b/ports/check/vcpkg.json @@ -4,7 +4,7 @@ "port-version": 4, "description": "A unit testing framework for C", "homepage": "https://github.com/libcheck/check", - "license": "LGPL-2.1", + "license": "LGPL-2.1-only", "dependencies": [ { "name": "vcpkg-cmake", From 69ebb87e388c80d32944683e3c19889d664a60b7 Mon Sep 17 00:00:00 2001 From: Lily Wang Date: Mon, 13 Jun 2022 03:11:26 -0700 Subject: [PATCH 3/3] x-add-version --- versions/c-/check.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/c-/check.json b/versions/c-/check.json index 42d330a5437e90..d66579d7462a60 100644 --- a/versions/c-/check.json +++ b/versions/c-/check.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "edcd56a61341e496e9e7ab8d895c9a3738ca2abd", + "git-tree": "d3b96c10d08746796f0e7540f9cb896b263cd4a9", "version": "0.15.2", "port-version": 4 },