Skip to content

Commit 35696bc

Browse files
authored
[libsigcpp, glibmm, gsl] fix ports bugs (#45313)
1 parent fd8dc85 commit 35696bc

File tree

10 files changed

+45
-8
lines changed

10 files changed

+45
-8
lines changed

ports/glibmm/vcpkg.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"name": "glibmm",
33
"version": "2.80.1",
4+
"port-version": 1,
45
"description": "This is glibmm, a C++ API for parts of glib that are useful for C++.",
56
"homepage": "https://www.gtkmm.org.",
67
"license": "LGPL-2.1-or-later",
@@ -10,7 +11,7 @@
1011
"glib",
1112
"libffi",
1213
"libiconv",
13-
"libsigcpp-3",
14+
"libsigcpp",
1415
"pcre",
1516
{
1617
"name": "vcpkg-tool-meson",

ports/gsl/portfile.cmake

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,14 @@ vcpkg_cmake_configure(
2323

2424
vcpkg_cmake_install()
2525
vcpkg_copy_pdbs()
26-
2726
vcpkg_fixup_pkgconfig()
2827

28+
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/gsl.pc" "\${GSL_CBLAS_LIB}" "-lgsl \${GSL_CBLAS_LIB}")
29+
if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/gsl.pc")
30+
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/gsl.pc" "-lgslcblas" "-lgslcblasd")
31+
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/gsl.pc" "\${GSL_CBLAS_LIB}" "-lgsld \${GSL_CBLAS_LIB}")
32+
endif()
33+
2934
file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
3035
file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
31-
configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY)
36+
configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY)

ports/gsl/vcpkg.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"name": "gsl",
33
"version": "2.8",
4+
"port-version": 1,
45
"description": "The GNU Scientific Library is a numerical library for C and C++ programmers",
56
"homepage": "https://www.gnu.org/software/gsl/",
67
"license": "GPL-3.0-or-later",

ports/libsigcpp/fix_version.patch

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
diff --git a/CMakeLists.txt b/CMakeLists.txt
2+
--- a/CMakeLists.txt
3+
+++ b/CMakeLists.txt
4+
@@ -16,9 +16,9 @@
5+
6+
cmake_minimum_required (VERSION 3.2)
7+
8+
set (SIGCXX_MAJOR_VERSION 3)
9+
-set (SIGCXX_MINOR_VERSION 4)
10+
+set (SIGCXX_MINOR_VERSION 6)
11+
set (SIGCXX_MICRO_VERSION 0)
12+
13+
set (SIGCXX_API_VERSION 3.0)
14+
set (PACKAGE_VERSION ${SIGCXX_MAJOR_VERSION}.${SIGCXX_MINOR_VERSION}.${SIGCXX_MICRO_VERSION})

ports/libsigcpp/portfile.cmake

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@ vcpkg_from_github(
22
OUT_SOURCE_PATH SOURCE_PATH
33
REPO libsigcplusplus/libsigcplusplus
44
REF "${VERSION}"
5-
SHA512 0d22275995a1629ae73b0cc2b2f2598b18aa0ed6d35bd3f1735a50f54d356fb248dedc8d9b5f2794830866b04e0f58ce641048e2df7215ec2e6eac744de58a27
5+
SHA512 0d22275995a1629ae73b0cc2b2f2598b18aa0ed6d35bd3f1735a50f54d356fb248dedc8d9b5f2794830866b04e0f58ce641048e2df7215ec2e6eac744de58a27
66
HEAD_REF master
77
PATCHES
88
disable_tests_enable_static_build.patch
99
fix-shared-windows-build.patch
1010
fix_include_path.patch
11+
fix_version.patch
1112
)
1213

1314
vcpkg_cmake_configure(

ports/libsigcpp/vcpkg.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "libsigcpp",
33
"version": "3.6.0",
4-
"port-version": 1,
4+
"port-version": 2,
55
"description": "Typesafe callback framework for C++",
66
"homepage": "https://libsigcplusplus.github.io/libsigcplusplus/",
77
"license": "LGPL-3.0-or-later",

versions/baseline.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3230,7 +3230,7 @@
32303230
},
32313231
"glibmm": {
32323232
"baseline": "2.80.1",
3233-
"port-version": 0
3233+
"port-version": 1
32343234
},
32353235
"glm": {
32363236
"baseline": "1.0.1",
@@ -3362,7 +3362,7 @@
33623362
},
33633363
"gsl": {
33643364
"baseline": "2.8",
3365-
"port-version": 0
3365+
"port-version": 1
33663366
},
33673367
"gsl-lite": {
33683368
"baseline": "0.42.0",
@@ -5242,7 +5242,7 @@
52425242
},
52435243
"libsigcpp": {
52445244
"baseline": "3.6.0",
5245-
"port-version": 1
5245+
"port-version": 2
52465246
},
52475247
"libsigcpp-3": {
52485248
"baseline": "3.0.3",

versions/g-/glibmm.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"versions": [
3+
{
4+
"git-tree": "8d6c1e2f8d051288fce26c9294a15c89f3a56c3b",
5+
"version": "2.80.1",
6+
"port-version": 1
7+
},
38
{
49
"git-tree": "a25c0ff9ecf2824710c645d6b236f10341ab68e6",
510
"version": "2.80.1",

versions/g-/gsl.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"versions": [
3+
{
4+
"git-tree": "e842d0c0f2aa72b22baf30c1350f81fcc87591dc",
5+
"version": "2.8",
6+
"port-version": 1
7+
},
38
{
49
"git-tree": "065963abda1b0c77fc000f1624636bc5aec7e876",
510
"version": "2.8",

versions/l-/libsigcpp.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"versions": [
3+
{
4+
"git-tree": "5b48fe434789aee633527a307273c41f0b8be925",
5+
"version": "3.6.0",
6+
"port-version": 2
7+
},
38
{
49
"git-tree": "7acf22cbf38c907f3309b3478dd61dd9ed7a78f0",
510
"version": "3.6.0",

0 commit comments

Comments
 (0)