diff --git a/ports/libsigcpp/fix_version.patch b/ports/libsigcpp/fix_version.patch deleted file mode 100644 index 2fdb77681b..0000000000 --- a/ports/libsigcpp/fix_version.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -16,9 +16,9 @@ - - cmake_minimum_required (VERSION 3.2) - - set (SIGCXX_MAJOR_VERSION 3) --set (SIGCXX_MINOR_VERSION 4) -+set (SIGCXX_MINOR_VERSION 6) - set (SIGCXX_MICRO_VERSION 0) - - set (SIGCXX_API_VERSION 3.0) - set (PACKAGE_VERSION ${SIGCXX_MAJOR_VERSION}.${SIGCXX_MINOR_VERSION}.${SIGCXX_MICRO_VERSION}) diff --git a/ports/libsigcpp/portfile.cmake b/ports/libsigcpp/portfile.cmake index 1a04bbc729..5ace170ab6 100644 --- a/ports/libsigcpp/portfile.cmake +++ b/ports/libsigcpp/portfile.cmake @@ -2,13 +2,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libsigcplusplus/libsigcplusplus REF "${VERSION}" - SHA512 0d22275995a1629ae73b0cc2b2f2598b18aa0ed6d35bd3f1735a50f54d356fb248dedc8d9b5f2794830866b04e0f58ce641048e2df7215ec2e6eac744de58a27 + SHA512 8fc90594fe161a4fd82b88fe4b0cb5b667d61712dae47982ba569775b4a855e03d4b30d3ba232f96e6a98f87473f7c9d4948b7a17a3f9ca2da547f95b6f91a40 HEAD_REF master PATCHES disable_tests_enable_static_build.patch fix-shared-windows-build.patch fix_include_path.patch - fix_version.patch ) vcpkg_cmake_configure( @@ -20,7 +19,9 @@ vcpkg_fixup_pkgconfig() vcpkg_cmake_config_fixup(PACKAGE_NAME sigc++-3 CONFIG_PATH lib/cmake/sigc++-3) if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/sigc++config.h" "ifdef BUILD_SHARED" "if 1" IGNORE_UNCHANGED) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/sigc++config.h" "#ifdef SIGC_DLL" "#if 1") +else() + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/sigc++config.h" "#ifdef SIGC_DLL" "#if 0") endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/libsigcpp/vcpkg.json b/ports/libsigcpp/vcpkg.json index 21dbc8107e..d2262fada7 100644 --- a/ports/libsigcpp/vcpkg.json +++ b/ports/libsigcpp/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libsigcpp", - "version": "3.6.0", - "port-version": 2, + "version": "3.8.0", "description": "Typesafe callback framework for C++", "homepage": "https://libsigcplusplus.github.io/libsigcplusplus/", "license": "LGPL-3.0-or-later", diff --git a/scripts/test_ports/vcpkg-ci-libsigcpp/portfile.cmake b/scripts/test_ports/vcpkg-ci-libsigcpp/portfile.cmake new file mode 100644 index 0000000000..bc785962c8 --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-libsigcpp/portfile.cmake @@ -0,0 +1,4 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + +vcpkg_cmake_configure(SOURCE_PATH "${CURRENT_PORT_DIR}/project") +vcpkg_cmake_build() diff --git a/scripts/test_ports/vcpkg-ci-libsigcpp/project/CMakeLists.txt b/scripts/test_ports/vcpkg-ci-libsigcpp/project/CMakeLists.txt new file mode 100755 index 0000000000..0a696c2767 --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-libsigcpp/project/CMakeLists.txt @@ -0,0 +1,9 @@ +cmake_minimum_required(VERSION 3.10) +project(vcpkg_ci_libsigcpp) + +set(CMAKE_CXX_STANDARD 17) + +find_package(sigc++-3 CONFIG REQUIRED) + +add_executable(vcpkg_ci_libsigcpp main.cpp) +target_link_libraries(vcpkg_ci_libsigcpp PRIVATE sigc-3.0) diff --git a/scripts/test_ports/vcpkg-ci-libsigcpp/project/main.cpp b/scripts/test_ports/vcpkg-ci-libsigcpp/project/main.cpp new file mode 100755 index 0000000000..f399aa5ce4 --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-libsigcpp/project/main.cpp @@ -0,0 +1,14 @@ +#include +#include +#include + +void on_print(const std::string &str) { + std::cout << str; +} + +int main() { + sigc::signal signal_print; + signal_print.connect(sigc::ptr_fun(&on_print)); + signal_print.emit("hello world\n"); + return 0; +} diff --git a/scripts/test_ports/vcpkg-ci-libsigcpp/vcpkg.json b/scripts/test_ports/vcpkg-ci-libsigcpp/vcpkg.json new file mode 100644 index 0000000000..d8d991fb96 --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-libsigcpp/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "vcpkg-ci-libsigcpp", + "version-date": "2026-03-31", + "description": "Validates libsigcpp", + "license": null, + "dependencies": [ + "libsigcpp", + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 17dc4b6f78..310f87f716 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5549,8 +5549,8 @@ "port-version": 0 }, "libsigcpp": { - "baseline": "3.6.0", - "port-version": 2 + "baseline": "3.8.0", + "port-version": 0 }, "libslirp": { "baseline": "4.9.1", diff --git a/versions/l-/libsigcpp.json b/versions/l-/libsigcpp.json index 6b8daa7f7b..a2362dd753 100644 --- a/versions/l-/libsigcpp.json +++ b/versions/l-/libsigcpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ba1c1f9f00c4a0051889a9584c442251c2134dd0", + "version": "3.8.0", + "port-version": 0 + }, { "git-tree": "5b48fe434789aee633527a307273c41f0b8be925", "version": "3.6.0",