Revision: 116709 https://trac.macports.org/changeset/116709 Author: blair@macports.org Date: 2014-02-04 09:26:09 -0800 (Tue, 04 Feb 2014) Log Message: ----------- zeroc-ice35: fix compilation on Mavericks; closes #41219. I'm not bumping the rev since this change modifies a header file that does not appear in the installed package: # port contents zeroc-ice35 | grep DescriptorHelper.h | wc -l Additionally, the patch doesn't change the behavior of the binaries for older Mac OS X releases if it was successfully compiled there. Modified Paths: -------------- trunk/dports/devel/zeroc-ice35/Portfile Added Paths: ----------- trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.IceGrid.DescriptorHelper.h.diff Modified: trunk/dports/devel/zeroc-ice35/Portfile =================================================================== --- trunk/dports/devel/zeroc-ice35/Portfile 2014-02-04 17:17:21 UTC (rev 116708) +++ trunk/dports/devel/zeroc-ice35/Portfile 2014-02-04 17:26:09 UTC (rev 116709) @@ -41,6 +41,7 @@ patchfiles patch-ice.cpp.config.Make.rules.diff \ patch-ice.cpp.config.Make.rules.Darwin.diff \ patch-ice.cpp.src.Ice.DynamicLibrary.cpp.diff \ + patch-ice.cpp.src.IceGrid.DescriptorHelper.h.diff \ patch-ice.cpp.test.Ice.info.AllTests.cpp.diff \ patch-ice.cpp.test.IceGrid.admin.run.py.diff \ patch-ice.cpp.test.IceGrid.deployer.run.py.diff \ Added: trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.IceGrid.DescriptorHelper.h.diff =================================================================== --- trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.IceGrid.DescriptorHelper.h.diff (rev 0) +++ trunk/dports/devel/zeroc-ice35/files/patch-ice.cpp.src.IceGrid.DescriptorHelper.h.diff 2014-02-04 17:26:09 UTC (rev 116709) @@ -0,0 +1,23 @@ +http://www.zeroc.com/forums/bug-reports/6152-mavericks-build-failure-because... + +diff -ru Ice-3.5.1.orig/cpp/src/IceGrid/DescriptorHelper.h Ice-3.5.1/cpp/src/IceGrid/DescriptorHelper.h +--- Ice-3.5.1.orig/cpp/src/IceGrid/DescriptorHelper.h 2013-10-04 08:48:14.000000000 -0700 ++++ Ice-3.5.1/cpp/src/IceGrid/DescriptorHelper.h 2014-02-04 09:14:54.000000000 -0800 +@@ -247,7 +247,7 @@ + ServerInstanceHelper(const ServerInstanceDescriptor&, const Resolver&, bool); + ServerInstanceHelper(const ServerDescriptorPtr&, const Resolver&, bool); + +- void operator=(const ServerInstanceHelper&); ++ + bool operator==(const ServerInstanceHelper&) const; + bool operator!=(const ServerInstanceHelper&) const; + +@@ -265,7 +265,7 @@ + + void init(const ServerDescriptorPtr&, const Resolver&, bool); + +- const ServerInstanceDescriptor _def; ++ ServerInstanceDescriptor _def; + std::string _id; + ServerInstanceDescriptor _instance; +