From dac8281400816e8e82a0912d73b97fc49f9e2e2c Mon Sep 17 00:00:00 2001 From: SunBlack Date: Fri, 7 Aug 2026 10:48:37 +0200 Subject: [PATCH 1/3] [gapp] Update to 1.0.1 --- ports/gapp/portfile.cmake | 10 ++++++---- ports/gapp/vcpkg.json | 2 +- scripts/ci.feature.baseline.txt | 2 -- versions/baseline.json | 2 +- versions/g-/gapp.json | 5 +++++ 5 files changed, 13 insertions(+), 8 deletions(-) diff --git a/ports/gapp/portfile.cmake b/ports/gapp/portfile.cmake index d7de00f2690598..999bf94757c7c8 100644 --- a/ports/gapp/portfile.cmake +++ b/ports/gapp/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KRM7/gapp REF "v${VERSION}" - SHA512 de6e1d9e28590cc569c05fe3b2462245940fcca5c8ffbc2974758062f88d3165e527fdc273bb290eb1080dd899d78b540fc7d0f62d7236b289a63e138484f5f0 + SHA512 16588f6feb60ebdea7fe8777f231fca78285b15a58975ea228ed6b706c6ccf46b17e3cd8bc8c2eb938222439ef28170bc25b15a527c3ac70d7eb76ce0d6665b3 HEAD_REF master ) @@ -20,9 +20,11 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/gapp) -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/doc/gapp/api") +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/share/doc/gapp/api" +) configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" COPYONLY) diff --git a/ports/gapp/vcpkg.json b/ports/gapp/vcpkg.json index 5984aadd42f20a..db0b5c9bff637c 100644 --- a/ports/gapp/vcpkg.json +++ b/ports/gapp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "gapp", - "version": "1.0.0", + "version": "1.0.1", "description": "A genetic algorithms library in C++ for single- and multi-objective optimization.", "homepage": "https://github.com/KRM7/gapp", "license": "MIT", diff --git a/scripts/ci.feature.baseline.txt b/scripts/ci.feature.baseline.txt index b6b55006f706d1..3732f71ab6800d 100644 --- a/scripts/ci.feature.baseline.txt +++ b/scripts/ci.feature.baseline.txt @@ -343,8 +343,6 @@ g3log:x64-android=fail gamenetworkingsockets:arm-neon-android=fail gamenetworkingsockets:arm64-android=fail gamenetworkingsockets:x64-android=fail -gapp:arm64-osx=fail # requires c++20 -gapp(android)=fail # requires c++20 gdal[arrow,parquet](!(arm64 | x64))=cascade gdal[aws-ec2-windows](!windows)=cascade gdal[iconv]:arm64-linux=feature-fails diff --git a/versions/baseline.json b/versions/baseline.json index 4a73528cdc9bdc..6c3d070ef0dd43 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3325,7 +3325,7 @@ "port-version": 6 }, "gapp": { - "baseline": "1.0.0", + "baseline": "1.0.1", "port-version": 0 }, "gasol": { diff --git a/versions/g-/gapp.json b/versions/g-/gapp.json index 31e60e13af4fd4..8dd45f5f02db02 100644 --- a/versions/g-/gapp.json +++ b/versions/g-/gapp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fabcc89398b2a995685dd4b614953047543751fb", + "version": "1.0.1", + "port-version": 0 + }, { "git-tree": "6fa4c0e7c1232f8b5a74613c115eb3319b2ca7fc", "version": "1.0.0", From 3f8535f662635931e769f36cf758d63f0c752786 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Fri, 7 Aug 2026 23:23:00 -0700 Subject: [PATCH 2/3] [gapp] Fix Windows package integration Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- ports/gapp/fix-install.patch | 24 ++++++++++++++++++++++++ ports/gapp/portfile.cmake | 12 ++++++++++-- ports/gapp/usage | 4 ---- ports/gapp/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/g-/gapp.json | 5 +++++ 6 files changed, 41 insertions(+), 7 deletions(-) create mode 100644 ports/gapp/fix-install.patch delete mode 100644 ports/gapp/usage diff --git a/ports/gapp/fix-install.patch b/ports/gapp/fix-install.patch new file mode 100644 index 00000000000000..0427e9ab2c2f6c --- /dev/null +++ b/ports/gapp/fix-install.patch @@ -0,0 +1,24 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8d9f1b4..27f659c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -154,9 +154,9 @@ endif() + + # Install + install(TARGETS gapp EXPORT gapp-config +- ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}/$" +- LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}/$" +- RUNTIME DESTINATION "${CMAKE_INSTALL_LIBDIR}/$") ++ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" ++ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" ++ RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}") + + install(DIRECTORY "src/" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/gapp" FILES_MATCHING PATTERN "*.hpp" PATTERN "*.txt") + install(DIRECTORY "docs/" DESTINATION "${CMAKE_INSTALL_DOCDIR}" FILES_MATCHING PATTERN "*.md") +@@ -164,5 +164,5 @@ install(DIRECTORY "docs/" DESTINATION "${CMAKE_INSTALL_DOCDIR}" FILES_MATCHI + if(MSVC AND BUILD_SHARED_LIBS) +- install(FILES "$" DESTINATION "${CMAKE_INSTALL_LIBDIR}/$") ++ install(FILES "$" DESTINATION "${CMAKE_INSTALL_BINDIR}") + endif() + + export(TARGETS gapp NAMESPACE gapp:: diff --git a/ports/gapp/portfile.cmake b/ports/gapp/portfile.cmake index 999bf94757c7c8..d60321fa38bdeb 100644 --- a/ports/gapp/portfile.cmake +++ b/ports/gapp/portfile.cmake @@ -8,6 +8,8 @@ vcpkg_from_github( REF "v${VERSION}" SHA512 16588f6feb60ebdea7fe8777f231fca78285b15a58975ea228ed6b706c6ccf46b17e3cd8bc8c2eb938222439ef28170bc25b15a527c3ac70d7eb76ce0d6665b3 HEAD_REF master + PATCHES + fix-install.patch ) vcpkg_cmake_configure( @@ -20,12 +22,18 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/gapp) +if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "static") + vcpkg_replace_string( + "${CURRENT_PACKAGES_DIR}/include/gapp/utility/utility.hpp" + "#if defined(_WIN32) && !defined(GAPP_BUILD_STATIC)" + "#ifndef GAPP_BUILD_STATIC\n#define GAPP_BUILD_STATIC\n#endif\n\n#if defined(_WIN32) && !defined(GAPP_BUILD_STATIC)" + ) +endif() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/share/doc/gapp/api" ) -configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" COPYONLY) - vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/gapp/usage b/ports/gapp/usage deleted file mode 100644 index bcfbbdff6f35cf..00000000000000 --- a/ports/gapp/usage +++ /dev/null @@ -1,4 +0,0 @@ -gapp provides CMake targets: - - find_package(gapp CONFIG REQUIRED) - target_link_libraries(main PRIVATE gapp::gapp) diff --git a/ports/gapp/vcpkg.json b/ports/gapp/vcpkg.json index db0b5c9bff637c..ec2cb29f524696 100644 --- a/ports/gapp/vcpkg.json +++ b/ports/gapp/vcpkg.json @@ -1,6 +1,7 @@ { "name": "gapp", "version": "1.0.1", + "port-version": 1, "description": "A genetic algorithms library in C++ for single- and multi-objective optimization.", "homepage": "https://github.com/KRM7/gapp", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 6c3d070ef0dd43..6f75c238c42821 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3326,7 +3326,7 @@ }, "gapp": { "baseline": "1.0.1", - "port-version": 0 + "port-version": 1 }, "gasol": { "baseline": "2018-01-04", diff --git a/versions/g-/gapp.json b/versions/g-/gapp.json index 8dd45f5f02db02..acee99c43448f3 100644 --- a/versions/g-/gapp.json +++ b/versions/g-/gapp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f221182130932f0564e03e521655e0e0d9a40ae8", + "version": "1.0.1", + "port-version": 1 + }, { "git-tree": "fabcc89398b2a995685dd4b614953047543751fb", "version": "1.0.1", From 748493b0a07a3c05c2b7f66dc6a466e97087a061 Mon Sep 17 00:00:00 2001 From: SunBlack Date: Sun, 9 Aug 2026 22:52:40 +0200 Subject: [PATCH 3/3] Fix port version --- ports/gapp/portfile.cmake | 34 +++++++++++++++++----------------- ports/gapp/vcpkg.json | 1 - versions/baseline.json | 2 +- versions/g-/gapp.json | 7 +------ 4 files changed, 19 insertions(+), 25 deletions(-) diff --git a/ports/gapp/portfile.cmake b/ports/gapp/portfile.cmake index d60321fa38bdeb..9c4828fcb4ba50 100644 --- a/ports/gapp/portfile.cmake +++ b/ports/gapp/portfile.cmake @@ -1,33 +1,33 @@ if(VCPKG_TARGET_IS_WINDOWS) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) endif() vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO KRM7/gapp - REF "v${VERSION}" - SHA512 16588f6feb60ebdea7fe8777f231fca78285b15a58975ea228ed6b706c6ccf46b17e3cd8bc8c2eb938222439ef28170bc25b15a527c3ac70d7eb76ce0d6665b3 - HEAD_REF master - PATCHES - fix-install.patch + OUT_SOURCE_PATH SOURCE_PATH + REPO KRM7/gapp + REF "v${VERSION}" + SHA512 16588f6feb60ebdea7fe8777f231fca78285b15a58975ea228ed6b706c6ccf46b17e3cd8bc8c2eb938222439ef28170bc25b15a527c3ac70d7eb76ce0d6665b3 + HEAD_REF master + PATCHES + fix-install.patch ) vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - -DGAPP_BUILD_TESTS=OFF - -DGAPP_USE_LTO=OFF + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DGAPP_BUILD_TESTS=OFF + -DGAPP_USE_LTO=OFF ) vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/gapp) if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "static") - vcpkg_replace_string( - "${CURRENT_PACKAGES_DIR}/include/gapp/utility/utility.hpp" - "#if defined(_WIN32) && !defined(GAPP_BUILD_STATIC)" - "#ifndef GAPP_BUILD_STATIC\n#define GAPP_BUILD_STATIC\n#endif\n\n#if defined(_WIN32) && !defined(GAPP_BUILD_STATIC)" - ) + vcpkg_replace_string( + "${CURRENT_PACKAGES_DIR}/include/gapp/utility/utility.hpp" + "#if defined(_WIN32) && !defined(GAPP_BUILD_STATIC)" + "#ifndef GAPP_BUILD_STATIC\n#define GAPP_BUILD_STATIC\n#endif\n\n#if defined(_WIN32) && !defined(GAPP_BUILD_STATIC)" + ) endif() file(REMOVE_RECURSE diff --git a/ports/gapp/vcpkg.json b/ports/gapp/vcpkg.json index ec2cb29f524696..db0b5c9bff637c 100644 --- a/ports/gapp/vcpkg.json +++ b/ports/gapp/vcpkg.json @@ -1,7 +1,6 @@ { "name": "gapp", "version": "1.0.1", - "port-version": 1, "description": "A genetic algorithms library in C++ for single- and multi-objective optimization.", "homepage": "https://github.com/KRM7/gapp", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 6f75c238c42821..6c3d070ef0dd43 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3326,7 +3326,7 @@ }, "gapp": { "baseline": "1.0.1", - "port-version": 1 + "port-version": 0 }, "gasol": { "baseline": "2018-01-04", diff --git a/versions/g-/gapp.json b/versions/g-/gapp.json index acee99c43448f3..0597b5a05817f1 100644 --- a/versions/g-/gapp.json +++ b/versions/g-/gapp.json @@ -1,12 +1,7 @@ { "versions": [ { - "git-tree": "f221182130932f0564e03e521655e0e0d9a40ae8", - "version": "1.0.1", - "port-version": 1 - }, - { - "git-tree": "fabcc89398b2a995685dd4b614953047543751fb", + "git-tree": "32207cad2d45e1b9edf689ddeb23cf5f28ae3a1f", "version": "1.0.1", "port-version": 0 },