diff --git a/ports/zeroc-ice/fix-missing-functional.patch b/ports/zeroc-ice/fix-missing-functional.patch new file mode 100644 index 0000000000..1125a3f388 --- /dev/null +++ b/ports/zeroc-ice/fix-missing-functional.patch @@ -0,0 +1,12 @@ +diff --git a/cpp/include/IceUtil/Timer.h b/cpp/include/IceUtil/Timer.h +index 177a7f8..19b8c09 100644 +--- a/cpp/include/IceUtil/Timer.h ++++ b/cpp/include/IceUtil/Timer.h +@@ -12,6 +12,7 @@ + + #include + #include ++#include + + namespace IceUtil + { diff --git a/ports/zeroc-ice/portfile.cmake b/ports/zeroc-ice/portfile.cmake index 11637b3002..3875d3c399 100644 --- a/ports/zeroc-ice/portfile.cmake +++ b/ports/zeroc-ice/portfile.cmake @@ -4,7 +4,10 @@ vcpkg_from_github( REPO zeroc-ice/ice REF "v${VERSION}" SHA512 07d7c439fbe1f69d808d05a11f32e09cdd8d4df2a93b6f253496304e0a521d417212ae688e316b4450dae406b59d1a460025b51ecd0614c69e48d86c0a6f81c5 - PATCHES mcppd_fix.patch no-werror.patch + PATCHES + mcppd_fix.patch + no-werror.patch + fix-missing-functional.patch ) set(RELEASE_TRIPLET ${TARGET_TRIPLET}-rel) diff --git a/ports/zeroc-ice/vcpkg.json b/ports/zeroc-ice/vcpkg.json index 68b1b12c48..5e6f404e9b 100644 --- a/ports/zeroc-ice/vcpkg.json +++ b/ports/zeroc-ice/vcpkg.json @@ -1,7 +1,7 @@ { "name": "zeroc-ice", "version": "3.7.9", - "port-version": 1, + "port-version": 2, "maintainers": "Benjamin Oldenburg ", "description": "Comprehensive RPC framework with support for C++, CSharp, Java, JavaScript, Python and more.", "homepage": "https://github.com/zeroc-ice/ice", diff --git a/versions/baseline.json b/versions/baseline.json index 01c9693220..f49e12cfea 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -9042,7 +9042,7 @@ }, "zeroc-ice": { "baseline": "3.7.9", - "port-version": 1 + "port-version": 2 }, "zeromq": { "baseline": "2023-06-20", diff --git a/versions/z-/zeroc-ice.json b/versions/z-/zeroc-ice.json index 29a369c2b0..f9b50d7684 100644 --- a/versions/z-/zeroc-ice.json +++ b/versions/z-/zeroc-ice.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dc07eee81cdf5c66efc83d606c635e722ef23d39", + "version": "3.7.9", + "port-version": 2 + }, { "git-tree": "bb449d6446b3700170a831c0b155d58be3613a26", "version": "3.7.9",