diff --git a/ports/glibmm/vcpkg.json b/ports/glibmm/vcpkg.json index 978d15f098..eacd17cf11 100644 --- a/ports/glibmm/vcpkg.json +++ b/ports/glibmm/vcpkg.json @@ -1,6 +1,7 @@ { "name": "glibmm", "version": "2.80.1", + "port-version": 1, "description": "This is glibmm, a C++ API for parts of glib that are useful for C++.", "homepage": "https://www.gtkmm.org.", "license": "LGPL-2.1-or-later", @@ -10,7 +11,7 @@ "glib", "libffi", "libiconv", - "libsigcpp-3", + "libsigcpp", "pcre", { "name": "vcpkg-tool-meson", diff --git a/ports/gsl/portfile.cmake b/ports/gsl/portfile.cmake index 86ae54f882..9faef9a7f7 100644 --- a/ports/gsl/portfile.cmake +++ b/ports/gsl/portfile.cmake @@ -23,9 +23,14 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_copy_pdbs() - vcpkg_fixup_pkgconfig() +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/gsl.pc" "\${GSL_CBLAS_LIB}" "-lgsl \${GSL_CBLAS_LIB}") +if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/gsl.pc") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/gsl.pc" "-lgslcblas" "-lgslcblasd") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/gsl.pc" "\${GSL_CBLAS_LIB}" "-lgsld \${GSL_CBLAS_LIB}") +endif() + file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) -configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY) \ No newline at end of file +configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY) diff --git a/ports/gsl/vcpkg.json b/ports/gsl/vcpkg.json index 921c690e15..f9f98dbd71 100644 --- a/ports/gsl/vcpkg.json +++ b/ports/gsl/vcpkg.json @@ -1,6 +1,7 @@ { "name": "gsl", "version": "2.8", + "port-version": 1, "description": "The GNU Scientific Library is a numerical library for C and C++ programmers", "homepage": "https://www.gnu.org/software/gsl/", "license": "GPL-3.0-or-later", diff --git a/ports/libsigcpp/fix_version.patch b/ports/libsigcpp/fix_version.patch new file mode 100644 index 0000000000..2fdb77681b --- /dev/null +++ b/ports/libsigcpp/fix_version.patch @@ -0,0 +1,14 @@ +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 a470a1ccd4..1a04bbc729 100644 --- a/ports/libsigcpp/portfile.cmake +++ b/ports/libsigcpp/portfile.cmake @@ -2,12 +2,13 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libsigcplusplus/libsigcplusplus REF "${VERSION}" - SHA512 0d22275995a1629ae73b0cc2b2f2598b18aa0ed6d35bd3f1735a50f54d356fb248dedc8d9b5f2794830866b04e0f58ce641048e2df7215ec2e6eac744de58a27 + SHA512 0d22275995a1629ae73b0cc2b2f2598b18aa0ed6d35bd3f1735a50f54d356fb248dedc8d9b5f2794830866b04e0f58ce641048e2df7215ec2e6eac744de58a27 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( diff --git a/ports/libsigcpp/vcpkg.json b/ports/libsigcpp/vcpkg.json index 58fa2daefe..21dbc8107e 100644 --- a/ports/libsigcpp/vcpkg.json +++ b/ports/libsigcpp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libsigcpp", "version": "3.6.0", - "port-version": 1, + "port-version": 2, "description": "Typesafe callback framework for C++", "homepage": "https://libsigcplusplus.github.io/libsigcplusplus/", "license": "LGPL-3.0-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index e8f25699f8..4376765f1f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3230,7 +3230,7 @@ }, "glibmm": { "baseline": "2.80.1", - "port-version": 0 + "port-version": 1 }, "glm": { "baseline": "1.0.1", @@ -3362,7 +3362,7 @@ }, "gsl": { "baseline": "2.8", - "port-version": 0 + "port-version": 1 }, "gsl-lite": { "baseline": "0.42.0", @@ -5242,7 +5242,7 @@ }, "libsigcpp": { "baseline": "3.6.0", - "port-version": 1 + "port-version": 2 }, "libsigcpp-3": { "baseline": "3.0.3", diff --git a/versions/g-/glibmm.json b/versions/g-/glibmm.json index cd667c9b23..4147705bec 100644 --- a/versions/g-/glibmm.json +++ b/versions/g-/glibmm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8d6c1e2f8d051288fce26c9294a15c89f3a56c3b", + "version": "2.80.1", + "port-version": 1 + }, { "git-tree": "a25c0ff9ecf2824710c645d6b236f10341ab68e6", "version": "2.80.1", diff --git a/versions/g-/gsl.json b/versions/g-/gsl.json index ba5e394486..a8f3f958c9 100644 --- a/versions/g-/gsl.json +++ b/versions/g-/gsl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e842d0c0f2aa72b22baf30c1350f81fcc87591dc", + "version": "2.8", + "port-version": 1 + }, { "git-tree": "065963abda1b0c77fc000f1624636bc5aec7e876", "version": "2.8", diff --git a/versions/l-/libsigcpp.json b/versions/l-/libsigcpp.json index 50cd59ba07..6b8daa7f7b 100644 --- a/versions/l-/libsigcpp.json +++ b/versions/l-/libsigcpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5b48fe434789aee633527a307273c41f0b8be925", + "version": "3.6.0", + "port-version": 2 + }, { "git-tree": "7acf22cbf38c907f3309b3478dd61dd9ed7a78f0", "version": "3.6.0",