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 --- devel/ice/files/patch-cpp-src-slice2cpp-Main.cpp | 46 ------------------------ 1 file changed, 46 deletions(-) delete mode 100644 devel/ice/files/patch-cpp-src-slice2cpp-Main.cpp (limited to 'devel/ice/files/patch-cpp-src-slice2cpp-Main.cpp') diff --git a/devel/ice/files/patch-cpp-src-slice2cpp-Main.cpp b/devel/ice/files/patch-cpp-src-slice2cpp-Main.cpp deleted file mode 100644 index 1f0c2079b455..000000000000 --- a/devel/ice/files/patch-cpp-src-slice2cpp-Main.cpp +++ /dev/null @@ -1,46 +0,0 @@ ---- cpp.orig/src/slice2cpp/Main.cpp 2011-06-15 21:43:58.000000000 +0200 -+++ cpp/src/slice2cpp/Main.cpp 2012-09-10 11:43:58.000000000 +0200 -@@ -22,7 +22,7 @@ using namespace Slice; - namespace - { - --IceUtil::Mutex* mutex = 0; -+IceUtil::Mutex* mtx = 0; - bool interrupted = false; - - class Init -@@ -31,13 +31,13 @@ public: - - Init() - { -- mutex = new IceUtil::Mutex; -+ mtx = new IceUtil::Mutex; - } - - ~Init() - { -- delete mutex; -- mutex = 0; -+ delete mtx; -+ mtx = 0; - } - }; - -@@ -48,7 +48,7 @@ Init init; - void - interruptedCallback(int signal) - { -- IceUtilInternal::MutexPtrLock sync(mutex); -+ IceUtilInternal::MutexPtrLock sync(mtx); - - interrupted = true; - } -@@ -294,7 +294,7 @@ compile(int argc, char* argv[]) - } - - { -- IceUtilInternal::MutexPtrLock sync(mutex); -+ IceUtilInternal::MutexPtrLock sync(mtx); - - if(interrupted) - { -- cgit v1.2.3