diff --git a/ports/zeroc-ice/md5i_fix.patch b/ports/zeroc-ice/md5i_fix.patch deleted file mode 100644 index 0e45588d07..0000000000 --- a/ports/zeroc-ice/md5i_fix.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/cpp/src/Slice/MD5I.cpp b/cpp/src/Slice/MD5I.cpp -index 66f4de545b..271352d1ea 100644 ---- a/cpp/src/Slice/MD5I.cpp -+++ b/cpp/src/Slice/MD5I.cpp -@@ -52,6 +52,7 @@ - */ - - #include -+#include - #include - - #ifdef __GNUC__ -@@ -172,7 +173,7 @@ md5_process(md5_state_t *pms, const md5_byte_t *data /*[64]*/) - * On little-endian machines, we can process properly aligned - * data without copying it. - */ -- if (!((data - (const md5_byte_t *)0) & 3)) { -+ if (!((reinterpret_cast(data)) & 3)) { - /* data are properly aligned */ - X = (const md5_word_t *)data; - } else { diff --git a/ports/zeroc-ice/portfile.cmake b/ports/zeroc-ice/portfile.cmake index 22c60df29d..e0fe436b45 100644 --- a/ports/zeroc-ice/portfile.cmake +++ b/ports/zeroc-ice/portfile.cmake @@ -2,9 +2,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO zeroc-ice/ice - REF v3.7.7 - SHA512 73c3a2bb14c9e145383e4026206edd3e03b29c60a33af628611bfdab71d69a3aed108ce4e6cbfd67eb852560110e3495b4bd238c8cdf0de9d1f8e2f1088513ee - PATCHES md5i_fix.patch slice2swift.patch mcppd_fix.patch no-werror.patch + REF "v${VERSION}" + SHA512 07d7c439fbe1f69d808d05a11f32e09cdd8d4df2a93b6f253496304e0a521d417212ae688e316b4450dae406b59d1a460025b51ecd0614c69e48d86c0a6f81c5 + PATCHES mcppd_fix.patch no-werror.patch ) set(RELEASE_TRIPLET ${TARGET_TRIPLET}-rel) diff --git a/ports/zeroc-ice/prepare_for_build.cmake b/ports/zeroc-ice/prepare_for_build.cmake index df3e93003d..e49303c99f 100644 --- a/ports/zeroc-ice/prepare_for_build.cmake +++ b/ports/zeroc-ice/prepare_for_build.cmake @@ -8,6 +8,7 @@ function(prepare_for_build ICE_SOURCE_DIR) message("-- Modifying hardcoded 'RuntimeLibrary' directives in .vcxproj files") set(CPP_SOURCE_DIR "${ICE_SOURCE_DIR}/cpp/src") file(GLOB_RECURSE PROJ_FILES "${CPP_SOURCE_DIR}/*.vcxproj") + foreach(PROJ_FILE ${PROJ_FILES}) file(READ ${PROJ_FILE} PROJ_FILE_CONTENT) STRING(REGEX @@ -50,15 +51,16 @@ function(prepare_for_build ICE_SOURCE_DIR) ) endforeach() + set(ICE_BUILDER_VERSION "5.0.9") set(ICE_CPP_MSBUILD_PACKAGES_DIR "${ICE_SOURCE_DIR}/cpp/msbuild/packages") - set(ICE_BUILDER_DEST_DIRECTORY "${ICE_CPP_MSBUILD_PACKAGES_DIR}/zeroc.icebuilder.msbuild.5.0.7") + set(ICE_BUILDER_DEST_DIRECTORY "${ICE_CPP_MSBUILD_PACKAGES_DIR}/zeroc.icebuilder.msbuild.${ICE_BUILDER_VERSION}") if(NOT EXISTS "${ICE_BUILDER_DEST_DIRECTORY}") message("-- Making Ice Builder for MSBuild available") vcpkg_download_distfile( ICE_BUILDER_MSBUILD_ARCHIVE - URLS https://globalcdn.nuget.org/packages/zeroc.icebuilder.msbuild.5.0.7.nupkg - FILENAME zeroc.icebuilder.msbuild.5.0.7.zip - SHA512 d4afed8a3c67daf2e1cde09e7747ec9f088fa1354069bb7c7782c1089ea0f4e50b669f45a88502ad341dbccafbc1394d74fe764479f25bf4be1d3f70e66cb174 + URLS https://globalcdn.nuget.org/packages/zeroc.icebuilder.msbuild.5.0.9.nupkg + FILENAME "zeroc.icebuilder.msbuild.${ICE_BUILDER_VERSION}.zip" + SHA512 E65620F3B667A48B28EC770443296BB0B8058168197DB3AE877A36531FFC6CE7E9289C7FE37DFAD751877FBDBA03C55E37122931BBF001EA6F1906DFEEBACFCB ) vcpkg_extract_source_archive( diff --git a/ports/zeroc-ice/slice2swift.patch b/ports/zeroc-ice/slice2swift.patch deleted file mode 100644 index 6c45cb82db..0000000000 --- a/ports/zeroc-ice/slice2swift.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/cpp/src/slice2swift/SwiftUtil.cpp b/cpp/src/slice2swift/SwiftUtil.cpp -index 404dee7670..01e144de90 100644 ---- a/cpp/src/slice2swift/SwiftUtil.cpp -+++ b/cpp/src/slice2swift/SwiftUtil.cpp -@@ -1523,7 +1523,7 @@ SwiftGenerator::writeMemberwiseInitializer(IceUtilInternal::Output& out, - const DataMemberList& baseMembers, - const DataMemberList& allMembers, - const ContainedPtr& p, -- bool local, -+ bool /*local*/, - bool rootClass, - const StringPairList& extraParams) - { -@@ -1531,11 +1531,6 @@ SwiftGenerator::writeMemberwiseInitializer(IceUtilInternal::Output& out, - { - out << sp; - out << nl; -- int typeCtx = TypeContextInParam; -- if(local) -- { -- typeCtx |= TypeContextLocal; -- } - out << "public init" << spar; - for(DataMemberList::const_iterator i = allMembers.begin(); i != allMembers.end(); ++i) - { diff --git a/ports/zeroc-ice/vcpkg.json b/ports/zeroc-ice/vcpkg.json index 9cec3ca768..3d71a0a2de 100644 --- a/ports/zeroc-ice/vcpkg.json +++ b/ports/zeroc-ice/vcpkg.json @@ -1,7 +1,6 @@ { "name": "zeroc-ice", - "version": "3.7.7", - "port-version": 4, + "version": "3.7.9", "maintainers": "Benjamin Oldenburg ", "description": "Comprehensive RPC framework with support for C++, CSharp, Java, JavaScript, Python and more.", "homepage": "https://github.com/zeroc-ice/ice", @@ -18,12 +17,18 @@ }, "zlib" ], + "default-features": [ + "glacier2lib", + "icegridlib", + "icestormlib" + ], "features": { "glacier2lib": { "description": "Glacier2 libraries" }, "glacier2router": { "description": "Glacier2Router", + "supports": "!(windows & static)", "dependencies": [ { "name": "zeroc-ice", @@ -35,13 +40,16 @@ ] }, "iceboxlib": { - "description": "IceBox libraries and runtime" + "description": "IceBox libraries and runtime", + "supports": "!(windows & static)" }, "iceboxtools": { - "description": "IceBox tools" + "description": "IceBox tools", + "supports": "!(windows & static)" }, "icebridge": { "description": "IceBridge", + "supports": "!(windows & static)", "dependencies": [ { "name": "zeroc-ice", @@ -78,6 +86,7 @@ }, "icegridtools": { "description": "IceGrid tools", + "supports": "!(windows & static)", "dependencies": [ "expat", { @@ -105,6 +114,7 @@ }, "icestormtools": { "description": "IceStorm tools", + "supports": "!(windows & static)", "dependencies": [ "lmdb", { diff --git a/versions/baseline.json b/versions/baseline.json index 0e17daaa85..bcf85f5797 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8741,8 +8741,8 @@ "port-version": 2 }, "zeroc-ice": { - "baseline": "3.7.7", - "port-version": 4 + "baseline": "3.7.9", + "port-version": 0 }, "zeromq": { "baseline": "2023-01-31", diff --git a/versions/z-/zeroc-ice.json b/versions/z-/zeroc-ice.json index 6c3d37cfa3..3f7dbb1e35 100644 --- a/versions/z-/zeroc-ice.json +++ b/versions/z-/zeroc-ice.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "aba63efeb29d2249b285f6188b44fde25dbff9d3", + "version": "3.7.9", + "port-version": 0 + }, { "git-tree": "2ec016c70ea82b2ddb340c6c809aece865c7c2ce", "version": "3.7.7",