Revision: 75237 http://trac.macports.org/changeset/75237 Author: blair@macports.org Date: 2011-01-18 11:04:01 -0800 (Tue, 18 Jan 2011) Log Message: ----------- Apply a patch from upstream that fixes Python servants having built-in operations invoked asynchronous. Partially resolves #28027. Modified Paths: -------------- trunk/dports/devel/ice-python26/Portfile Added Paths: ----------- trunk/dports/devel/ice-python26/files/patch-py.modules.IcePy.Operation.cpp.diff Modified: trunk/dports/devel/ice-python26/Portfile =================================================================== --- trunk/dports/devel/ice-python26/Portfile 2011-01-18 18:46:50 UTC (rev 75236) +++ trunk/dports/devel/ice-python26/Portfile 2011-01-18 19:04:01 UTC (rev 75237) @@ -4,6 +4,7 @@ name ice-python26 version 3.4.1 +revision 1 set branch [join [lrange [split ${version} .] 0 1] .] categories devel python maintainers blair @@ -32,7 +33,8 @@ master_sites ${homepage}download/Ice/${branch}/ dist_subdir ice-cpp distname Ice-${version} -patchfiles patch-py.config.Make.rules.Darwin.diff +patchfiles patch-py.config.Make.rules.Darwin.diff \ + patch-py.modules.IcePy.Operation.cpp.diff checksums md5 3aae42aa47dec74bb258c1a1b2847a1a \ sha1 f3ae394146a36fa6453dc69e80d2ab6ab30f4d9a \ rmd160 aa756a14421e084336dcecdcbb977aa98c5e1283 Added: trunk/dports/devel/ice-python26/files/patch-py.modules.IcePy.Operation.cpp.diff =================================================================== --- trunk/dports/devel/ice-python26/files/patch-py.modules.IcePy.Operation.cpp.diff (rev 0) +++ trunk/dports/devel/ice-python26/files/patch-py.modules.IcePy.Operation.cpp.diff 2011-01-18 19:04:01 UTC (rev 75237) @@ -0,0 +1,13 @@ +diff -ru ../Ice-3.4.1.orig/py/modules/IcePy/Operation.cpp ./py/modules/IcePy/Operation.cpp +--- ../Ice-3.4.1.orig/py/modules/IcePy/Operation.cpp 2010-06-03 09:48:35.000000000 -0700 ++++ ./py/modules/IcePy/Operation.cpp 2011-01-18 10:55:11.000000000 -0800 +@@ -3668,7 +3668,8 @@ + } + } + +- __checkMode(op->mode, current.mode); ++ // See http://www.zeroc.com/forums/help-center/5210-ice_ping-marshalexception-refre... . ++ // __checkMode(op->mode, current.mode); + + UpcallPtr up = new TypedUpcall(op, cb, current.adapter->getCommunicator()); + up->dispatch(_servant, inParams, current);