Revision: 110429 https://trac.macports.org/changeset/110429 Author: blair@macports.org Date: 2013-08-30 19:19:22 -0700 (Fri, 30 Aug 2013) Log Message: ----------- zeroc-ice33: fix slice2cpp generating invalid code for a Slice exception. http://www.zeroc.com/forums/patches/4864-patch-2-ice-3-4-0-slice2cpp-stream-... Modified Paths: -------------- trunk/dports/devel/zeroc-ice33/Portfile Added Paths: ----------- trunk/dports/devel/zeroc-ice33/files/patch-ice.cpp.src.slice2cpp.Gen.cpp.diff Modified: trunk/dports/devel/zeroc-ice33/Portfile =================================================================== --- trunk/dports/devel/zeroc-ice33/Portfile 2013-08-31 02:13:11 UTC (rev 110428) +++ trunk/dports/devel/zeroc-ice33/Portfile 2013-08-31 02:19:22 UTC (rev 110429) @@ -42,6 +42,7 @@ patch-ice.cpp.config.Make.rules.Darwin.diff \ patch-ice.cpp.src.IceSSL.Instance.cpp.diff \ patch-ice.cpp.src.slice2html.Gen.diff \ + patch-ice.cpp.src.slice2cpp.Gen.cpp.diff \ patch-ice.cpp.src.Slice.Preprocessor.cpp.diff platforms darwin @@ -69,6 +70,10 @@ ui_debug ${cmd} system ${cmd} + set cmd "cd ${workpath}/Ice-${version} && patch -p1 < ${filespath}/patch-ice.cpp.src.slice2cpp.Gen.cpp.diff" + ui_debug ${cmd} + system ${cmd} + set cmd "cd ${workpath}/Ice-${version} && patch -p1 < ${filespath}/patch-ice.cpp.src.Slice.Preprocessor.cpp.diff" ui_debug ${cmd} system ${cmd} Added: trunk/dports/devel/zeroc-ice33/files/patch-ice.cpp.src.slice2cpp.Gen.cpp.diff =================================================================== --- trunk/dports/devel/zeroc-ice33/files/patch-ice.cpp.src.slice2cpp.Gen.cpp.diff (rev 0) +++ trunk/dports/devel/zeroc-ice33/files/patch-ice.cpp.src.slice2cpp.Gen.cpp.diff 2013-08-31 02:19:22 UTC (rev 110429) @@ -0,0 +1,17 @@ +http://www.zeroc.com/forums/patches/4864-patch-2-ice-3-4-0-slice2cpp-stream-... + +diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp +index 998dd7e..ea80897 100644 +--- a/cpp/src/slice2cpp/Gen.cpp ++++ b/cpp/src/slice2cpp/Gen.cpp +@@ -354,6 +354,10 @@ Slice::Gen::generate(const UnitPtr& p) + { + H << "\n#include <Ice/Stream.h>"; + } ++ else ++ { ++ H << "\n#include <Ice/StreamF.h>"; ++ } + } + + if(_checksum)