From 6155b8437d74e76c4679a3a2d713a48e71df13bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Fri, 16 May 2025 03:12:28 +0800 Subject: [PATCH] [ned14-internal-quickcpplib] fix install (#45258) Co-authored-by: jyu49 --- .../fix-list_filter.patch | 31 +++++++++++++++++++ .../ned14-internal-quickcpplib/portfile.cmake | 1 + ports/ned14-internal-quickcpplib/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/n-/ned14-internal-quickcpplib.json | 5 +++ 5 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 ports/ned14-internal-quickcpplib/fix-list_filter.patch diff --git a/ports/ned14-internal-quickcpplib/fix-list_filter.patch b/ports/ned14-internal-quickcpplib/fix-list_filter.patch new file mode 100644 index 0000000000..41d0e5cfd6 --- /dev/null +++ b/ports/ned14-internal-quickcpplib/fix-list_filter.patch @@ -0,0 +1,31 @@ +diff --git a/cmakelib/QuickCppLibUtils.cmake b/cmakelib/QuickCppLibUtils.cmake +index 3fdd0e8..0f6a272 100644 +--- a/cmakelib/QuickCppLibUtils.cmake ++++ b/cmakelib/QuickCppLibUtils.cmake +@@ -53,24 +53,8 @@ endfunction() + + # Emulate list(FILTER list INCLUDE|EXCLUDE REGEX regex) on cmake < 3.6 + function(list_filter listname op regexqualifer regex) +- if(CMAKE_VERSION VERSION_GREATER 3.59) +- list(FILTER ${ARGV}) +- else() +- set(out) +- foreach(item ${${listname}}) +- string(REGEX MATCH "${regex}" match ${item}) +- if("${op}" STREQUAL "INCLUDE") +- if(match) +- list(APPEND out ${item}) +- endif() +- else() +- if(NOT match) +- list(APPEND out ${item}) +- endif() +- endif() +- endforeach() +- set(${listname} ${out} PARENT_SCOPE) +- endif() ++ list(FILTER ${ARGV}) ++ set(${listname} ${${listname}} PARENT_SCOPE) + endfunction() + + # Escape a string into a regex matching that string diff --git a/ports/ned14-internal-quickcpplib/portfile.cmake b/ports/ned14-internal-quickcpplib/portfile.cmake index d71d3b8d8a..0e2a87d29e 100644 --- a/ports/ned14-internal-quickcpplib/portfile.cmake +++ b/ports/ned14-internal-quickcpplib/portfile.cmake @@ -37,6 +37,7 @@ vcpkg_from_github( HEAD_REF master PATCHES quicklib-depheaders.patch + fix-list_filter.patch ) vcpkg_from_github( diff --git a/ports/ned14-internal-quickcpplib/vcpkg.json b/ports/ned14-internal-quickcpplib/vcpkg.json index b6e96e1a82..d22ca43824 100644 --- a/ports/ned14-internal-quickcpplib/vcpkg.json +++ b/ports/ned14-internal-quickcpplib/vcpkg.json @@ -1,6 +1,7 @@ { "name": "ned14-internal-quickcpplib", "version-date": "2023-11-22", + "port-version": 1, "maintainers": [ "Niall Douglas ", "Henrik Gaßmann " diff --git a/versions/baseline.json b/versions/baseline.json index 736d243be1..d077eaf1ed 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6526,7 +6526,7 @@ }, "ned14-internal-quickcpplib": { "baseline": "2023-11-22", - "port-version": 0 + "port-version": 1 }, "neon2sse": { "baseline": "2024-11-24", diff --git a/versions/n-/ned14-internal-quickcpplib.json b/versions/n-/ned14-internal-quickcpplib.json index de227f0f43..9bfd62c5ec 100644 --- a/versions/n-/ned14-internal-quickcpplib.json +++ b/versions/n-/ned14-internal-quickcpplib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3ada109fadc11854055e17baf513f1df776dd73b", + "version-date": "2023-11-22", + "port-version": 1 + }, { "git-tree": "fd29cd78a6d8aa5689620b077e062c8844d27871", "version-date": "2023-11-22",