diff --git a/ports/zeroc-ice/fix-missing-functional.patch b/ports/zeroc-ice/fix-missing-functional.patch deleted file mode 100644 index 1125a3f388..0000000000 --- a/ports/zeroc-ice/fix-missing-functional.patch +++ /dev/null @@ -1,12 +0,0 @@ -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 13f4955a75..a9ddd7e7dc 100644 --- a/ports/zeroc-ice/portfile.cmake +++ b/ports/zeroc-ice/portfile.cmake @@ -1,13 +1,11 @@ - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO zeroc-ice/ice REF "v${VERSION}" - SHA512 07d7c439fbe1f69d808d05a11f32e09cdd8d4df2a93b6f253496304e0a521d417212ae688e316b4450dae406b59d1a460025b51ecd0614c69e48d86c0a6f81c5 + SHA512 638ca8721db1559aae80c43663a1210ba9c8f72d58003f2d9457048c9100bee74036910917d1d10bf5b998ba49f0878177e094b436c83d3deb63613f9075483d 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 db1a1c1e7c..30f8fbc08c 100644 --- a/ports/zeroc-ice/vcpkg.json +++ b/ports/zeroc-ice/vcpkg.json @@ -1,7 +1,6 @@ { "name": "zeroc-ice", - "version": "3.7.9", - "port-version": 4, + "version": "3.7.10", "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 3e28fbefa7..cd7fe35325 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -9901,8 +9901,8 @@ "port-version": 2 }, "zeroc-ice": { - "baseline": "3.7.9", - "port-version": 4 + "baseline": "3.7.10", + "port-version": 0 }, "zeromq": { "baseline": "4.3.5", diff --git a/versions/z-/zeroc-ice.json b/versions/z-/zeroc-ice.json index 5988b40cac..6e28eb1123 100644 --- a/versions/z-/zeroc-ice.json +++ b/versions/z-/zeroc-ice.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c94052d77917ec81baf105233e9498ec1e17e292", + "version": "3.7.10", + "port-version": 0 + }, { "git-tree": "9048b568a7f81f0a8788c6dd8b0215cb1cd300eb", "version": "3.7.9",