From 58e60f6909d832bb6100e9a168f002a14d4214ef Mon Sep 17 00:00:00 2001 From: Ruslan Makhmatkhanov Date: Mon, 17 Jun 2013 11:42:41 +0000 Subject: - update to 3.5.0 - add license (GPLv2) - switch to bdb 5 - mark broken on 10.x for the time being (as it was discussed on ports@ ML) - remove patches, applied upstream This version of Ice brings many new features, e.g. - New encoding version - Metrics facility - Optional data members and parameters - Compact encoding for classes and exceptions - Compact type IDs - Preserved slices - Custom enumerator values - C++11 lambda functions - Remote Update of Server Properties - IPv6 now enabled by default - Python 3 support - Use Berkley DB 5 See http://doc.zeroc.com/display/Ice/Release+Notes for details. PR: 179233 Submitted by: Michael Gmelin (maintainer) Tested by: Jaret Bartsch --- .../patch-cpp-include-Ice-IconvStringConverter.h | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 devel/ice/files/patch-cpp-include-Ice-IconvStringConverter.h (limited to 'devel/ice/files/patch-cpp-include-Ice-IconvStringConverter.h') diff --git a/devel/ice/files/patch-cpp-include-Ice-IconvStringConverter.h b/devel/ice/files/patch-cpp-include-Ice-IconvStringConverter.h deleted file mode 100644 index 43d148f7a64b..000000000000 --- a/devel/ice/files/patch-cpp-include-Ice-IconvStringConverter.h +++ /dev/null @@ -1,21 +0,0 @@ ---- cpp.orig/include/Ice/IconvStringConverter.h 2011-06-15 21:43:58.000000000 +0200 -+++ cpp/include/Ice/IconvStringConverter.h 2012-03-04 20:14:52.000000000 +0100 -@@ -225,10 +225,16 @@ - template /*static*/ void - IconvStringConverter::close(std::pair cdp) - { -- int rs = iconv_close(cdp.first); -+#ifndef NDEBUG -+ int rs = -+#endif -+ iconv_close(cdp.first); - assert(rs == 0); - -- rs = iconv_close(cdp.second); -+#ifndef NDEBUG -+ rs = -+#endif -+ iconv_close(cdp.second); - assert(rs == 0); - } - -- cgit v1.2.3