[67809] trunk/dports/devel/ice-cpp

[blair at macports.org]

Revision: 67809
          http://trac.macports.org/changeset/67809
Author:   blair at macports.org
Date:     2010-05-18 13:23:42 -0700 (Tue, 18 May 2010)
Log Message:
-----------
Add two patches from ZeroC, downloaded from the following URLs:

http://www.zeroc.com/forums/patches/4829-patch-1-ice-3-4-0-slice2cpp-stream-issue.html
http://www.zeroc.com/forums/patches/4864-patch-2-ice-3-4-0-slice2cpp-stream-issue-2-a.html

Modified Paths:
--------------
    trunk/dports/devel/ice-cpp/Portfile

Added Paths:
-----------
    trunk/dports/devel/ice-cpp/files/745d1268183564-patch-1-ice-3-4-0-slice2cpp-stream-issue-patch-stream.txt
    trunk/dports/devel/ice-cpp/files/747d1269356146-patch-2-ice-3-4-0-slice2cpp-stream-issue-2-patch-stream2.txt

Modified: trunk/dports/devel/ice-cpp/Portfile
===================================================================
--- trunk/dports/devel/ice-cpp/Portfile	2010-05-18 20:21:33 UTC (rev 67808)
+++ trunk/dports/devel/ice-cpp/Portfile	2010-05-18 20:23:42 UTC (rev 67809)
@@ -4,7 +4,7 @@
 
 name            ice-cpp
 version         3.4.0
-revision        1
+revision        2
 set branch      [join [lrange [split ${version} .] 0 1] .]
 categories      devel
 maintainers     blair
@@ -36,7 +36,9 @@
 distname        Ice-${version}
 patchfiles      patch-ice.cpp.config.Make.rules.diff \
                 patch-ice.cpp.config.Make.rules.Darwin.diff \
-                patch-ice.cpp.src.Ice.Instance.cpp.diff
+                patch-ice.cpp.src.Ice.Instance.cpp.diff \
+                745d1268183564-patch-1-ice-3-4-0-slice2cpp-stream-issue-patch-stream.txt \
+                747d1269356146-patch-2-ice-3-4-0-slice2cpp-stream-issue-2-patch-stream2.txt
 patch.pre_args  -p1
 checksums       md5 998b10627ade020cb00f5beb73efc0e0 \
                 sha1 1c8fe296af8d65d16cddac39a8bc24b71e069f75 \

Added: trunk/dports/devel/ice-cpp/files/745d1268183564-patch-1-ice-3-4-0-slice2cpp-stream-issue-patch-stream.txt
===================================================================
--- trunk/dports/devel/ice-cpp/files/745d1268183564-patch-1-ice-3-4-0-slice2cpp-stream-issue-patch-stream.txt	                        (rev 0)
+++ trunk/dports/devel/ice-cpp/files/745d1268183564-patch-1-ice-3-4-0-slice2cpp-stream-issue-patch-stream.txt	2010-05-18 20:23:42 UTC (rev 67809)
@@ -0,0 +1,49 @@
+diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp
+index 22355fe..4e68b64 100644
+--- a/cpp/src/slice2cpp/Gen.cpp
++++ b/cpp/src/slice2cpp/Gen.cpp
+@@ -6629,21 +6629,34 @@ Slice::Gen::StreamVisitor::visitModuleStart(const ModulePtr& m)
+     {
+         return false;
+     }
+-    H.zeroIndent();
+-    H << nl << "#if defined(_MSC_VER) && (_MSC_VER < 1300) // VC++ 6 compiler bug"; // COMPILERFIX
+-    H << nl << "#else";
+-    H.restoreIndent();
+-    H << nl << "namespace Ice" << nl << '{';
++    if(UnitPtr::dynamicCast(m->container()))
++    {
++        //
++        // Only emit this for the top-level module.
++        //
++        H << sp;
++        H.zeroIndent();
++        H << nl << "#if defined(_MSC_VER) && (_MSC_VER < 1300) // VC++ 6 compiler bug"; // COMPILERFIX
++        H << nl << "#else";
++        H.restoreIndent();
++        H << nl << "namespace Ice" << nl << '{';
++    }
+     return true;
+ }
+ 
+ void
+-Slice::Gen::StreamVisitor::visitModuleEnd(const ModulePtr&)
++Slice::Gen::StreamVisitor::visitModuleEnd(const ModulePtr& m)
+ {
+-    H << nl << '}';
+-    H.zeroIndent();
+-    H << nl << "#endif";
+-    H.restoreIndent();
++    if(UnitPtr::dynamicCast(m->container()))
++    {
++        //
++        // Only emit this for the top-level module.
++        //
++        H << nl << '}';
++        H.zeroIndent();
++        H << nl << "#endif";
++        H.restoreIndent();
++    }
+ }
+ 
+ bool


Property changes on: trunk/dports/devel/ice-cpp/files/745d1268183564-patch-1-ice-3-4-0-slice2cpp-stream-issue-patch-stream.txt
___________________________________________________________________
Added: svn:keywords
   + HeadURL Id LastChangedBy LastChangedDate LastChangedRevision
Added: svn:eol-style
   + native

Added: trunk/dports/devel/ice-cpp/files/747d1269356146-patch-2-ice-3-4-0-slice2cpp-stream-issue-2-patch-stream2.txt
===================================================================
--- trunk/dports/devel/ice-cpp/files/747d1269356146-patch-2-ice-3-4-0-slice2cpp-stream-issue-2-patch-stream2.txt	                        (rev 0)
+++ trunk/dports/devel/ice-cpp/files/747d1269356146-patch-2-ice-3-4-0-slice2cpp-stream-issue-2-patch-stream2.txt	2010-05-18 20:23:42 UTC (rev 67809)
@@ -0,0 +1,15 @@
+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)


Property changes on: trunk/dports/devel/ice-cpp/files/747d1269356146-patch-2-ice-3-4-0-slice2cpp-stream-issue-2-patch-stream2.txt
___________________________________________________________________
Added: svn:keywords
   + HeadURL Id LastChangedBy LastChangedDate LastChangedRevision
Added: svn:eol-style
   + native
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100518/b987bb7c/attachment-0001.html>