From 989b8d34f947bb92636a500c72aaff1736820a29 Mon Sep 17 00:00:00 2001 From: jim wang <122244446+jimwang118@users.noreply.github.com> Date: Mon, 23 Dec 2024 15:55:45 +0000 Subject: [PATCH] [itpp] Fix runtime errors (#42881) --- ports/itpp/fix-build.patch | 14 ++++++++++++++ ports/itpp/portfile.cmake | 3 ++- ports/itpp/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/i-/itpp.json | 5 +++++ 5 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 ports/itpp/fix-build.patch diff --git a/ports/itpp/fix-build.patch b/ports/itpp/fix-build.patch new file mode 100644 index 0000000000..282504d418 --- /dev/null +++ b/ports/itpp/fix-build.patch @@ -0,0 +1,14 @@ +diff --git a/itpp/base/mat.cpp b/itpp/base/mat.cpp +index 9f2a20e..11b0a58 100644 +--- a/itpp/base/mat.cpp ++++ b/itpp/base/mat.cpp +@@ -173,8 +173,7 @@ cmat operator*(const cmat &m1, const cmat &m2) + template<> + mat operator*(const mat &m1, const mat &m2) + { +- it_assert_debug(m1.rows() == m2.cols(), +- "Mat<>::operator*(): Wrong sizes"); ++ it_assert_debug(m1.cols() == m2.rows(), "cmat::operator*(): Wrong sizes"); + mat r(m1.rows(), m2.cols()); + double *tr = r._data(); + const double *t1; diff --git a/ports/itpp/portfile.cmake b/ports/itpp/portfile.cmake index 598dc8a709..ddb762856b 100644 --- a/ports/itpp/portfile.cmake +++ b/ports/itpp/portfile.cmake @@ -11,6 +11,7 @@ vcpkg_from_sourceforge( fix-uwp.patch fix-linux.patch rename-version.patch + fix-build.patch ) file(RENAME "${SOURCE_PATH}/VERSION" "${SOURCE_PATH}/VERSION.txt") @@ -33,6 +34,6 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") vcpkg_copy_pdbs() -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") vcpkg_fixup_pkgconfig() diff --git a/ports/itpp/vcpkg.json b/ports/itpp/vcpkg.json index adafea2871..72fb888f7a 100644 --- a/ports/itpp/vcpkg.json +++ b/ports/itpp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "itpp", "version-semver": "4.3.1", - "port-version": 11, + "port-version": 12, "description": "IT++ is a C++ library of mathematical, signal processing and communication classes and functions. Its main use is in simulation of communication systems and for performing research in the area of communications.", "homepage": "http://itpp.sourceforge.net", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 096fb00907..d00eea252d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3798,7 +3798,7 @@ }, "itpp": { "baseline": "4.3.1", - "port-version": 11 + "port-version": 12 }, "itsy-bitsy": { "baseline": "2022-08-02", diff --git a/versions/i-/itpp.json b/versions/i-/itpp.json index 993791ac59..b3cf40280c 100644 --- a/versions/i-/itpp.json +++ b/versions/i-/itpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "90c2b246877a97ce4ee4b4f5b7aa55714ac715fd", + "version-semver": "4.3.1", + "port-version": 12 + }, { "git-tree": "deb799807d61211af72ccc732eea3950b2d52b4c", "version-semver": "4.3.1",