[52984] trunk/dports/devel/ice-cpp
blair at macports.org
blair at macports.org
Fri Jun 26 21:05:34 PDT 2009
Revision: 52984
http://trac.macports.org/changeset/52984
Author: blair at macports.org
Date: 2009-06-26 21:05:33 -0700 (Fri, 26 Jun 2009)
Log Message:
-----------
Include two patches from upstream, which closes #19921.
http://www.zeroc.com/forums/patches/4275-patch-1-ice-3-3-1-slice2html-creates-bad-links.html
http://www.zeroc.com/forums/patches/4340-patch-2-ice-3-3-1-slice-compilers-abort.html
Modified Paths:
--------------
trunk/dports/devel/ice-cpp/Portfile
Added Paths:
-----------
trunk/dports/devel/ice-cpp/files/patch-ice.cpp.src.Slice.Preprocessor.cpp.diff
trunk/dports/devel/ice-cpp/files/patch-ice.cpp.src.slice2html.Gen.diff
Modified: trunk/dports/devel/ice-cpp/Portfile
===================================================================
--- trunk/dports/devel/ice-cpp/Portfile 2009-06-27 02:14:56 UTC (rev 52983)
+++ trunk/dports/devel/ice-cpp/Portfile 2009-06-27 04:05:33 UTC (rev 52984)
@@ -4,7 +4,7 @@
name ice-cpp
version 3.3.1
-revision 3
+revision 4
categories devel
maintainers blair
description Fast, object-oriented RPC for C++, Java, Python, Ruby, PHP
@@ -37,7 +37,9 @@
distname Ice-${version}
distfiles ${ice_dist}
patchfiles patch-ice.cpp.config.Make.rules.diff \
- patch-ice.cpp.config.Make.rules.Darwin.diff
+ patch-ice.cpp.config.Make.rules.Darwin.diff \
+ patch-ice.cpp.src.slice2html.Gen.diff \
+ patch-ice.cpp.src.Slice.Preprocessor.cpp.diff
checksums ${ice_dist} \
md5 1f37dfcec4662fcde030553fb447d064 \
sha1 08d0f32bdb7d909b4a531d45cccfa97bdde649aa \
@@ -60,6 +62,14 @@
ui_debug ${cmd}
system ${cmd}
+ set cmd "cd ${workpath}/Ice-${version} && patch -p1 < ${filespath}/patch-ice.cpp.src.slice2html.Gen.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}
+
reinplace "s/-O2/-g -O2/" \
${workpath}/Ice-${version}/cpp/config/Make.rules.Darwin
Added: trunk/dports/devel/ice-cpp/files/patch-ice.cpp.src.Slice.Preprocessor.cpp.diff
===================================================================
--- trunk/dports/devel/ice-cpp/files/patch-ice.cpp.src.Slice.Preprocessor.cpp.diff (rev 0)
+++ trunk/dports/devel/ice-cpp/files/patch-ice.cpp.src.Slice.Preprocessor.cpp.diff 2009-06-27 04:05:33 UTC (rev 52984)
@@ -0,0 +1,20 @@
+diff -r -c -N ../Ice-3.3.1-old/cpp/src/Slice/Preprocessor.cpp ./cpp/src/Slice/Preprocessor.cpp
+*** ../Ice-3.3.1-old/cpp/src/Slice/Preprocessor.cpp 2009-03-20 15:22:14.000000000 -0230
+--- ./cpp/src/Slice/Preprocessor.cpp 2009-05-12 16:18:54.000000000 -0230
+***************
+*** 46,52 ****
+
+ Slice::Preprocessor::Preprocessor(const string& path, const string& fileName, const vector<string>& args) :
+ _path(path),
+! _fileName(fileName),
+ _args(args),
+ _cppHandle(0)
+ {
+--- 46,52 ----
+
+ Slice::Preprocessor::Preprocessor(const string& path, const string& fileName, const vector<string>& args) :
+ _path(path),
+! _fileName(fullPath(fileName)),
+ _args(args),
+ _cppHandle(0)
+ {
Added: trunk/dports/devel/ice-cpp/files/patch-ice.cpp.src.slice2html.Gen.diff
===================================================================
--- trunk/dports/devel/ice-cpp/files/patch-ice.cpp.src.slice2html.Gen.diff (rev 0)
+++ trunk/dports/devel/ice-cpp/files/patch-ice.cpp.src.slice2html.Gen.diff 2009-06-27 04:05:33 UTC (rev 52984)
@@ -0,0 +1,152 @@
+diff --git a/cpp/src/slice2html/Gen.cpp b/cpp/src/slice2html/Gen.cpp
+index 4680c57..de13194 100644
+--- a/cpp/src/slice2html/Gen.cpp
++++ b/cpp/src/slice2html/Gen.cpp
+@@ -562,7 +562,7 @@ Slice::GeneratorBase::printMetaData(const ContainedPtr& p)
+ }
+
+ void
+-Slice::GeneratorBase::printSummary(const ContainedPtr& p, const ContainerPtr& module, bool deprecated)
++Slice::GeneratorBase::printSummary(const ContainedPtr& p, const ContainerPtr& module, bool deprecated, bool forIndex)
+ {
+ ContainerPtr container = ContainerPtr::dynamicCast(p);
+ if(!container)
+@@ -575,7 +575,7 @@ Slice::GeneratorBase::printSummary(const ContainedPtr& p, const ContainerPtr& mo
+ container = module;
+ }
+
+- string summary = getComment(p, container, true, module);
++ string summary = getComment(p, container, true, forIndex);
+ _out << nl << summary;
+
+ if(deprecated)
+@@ -2042,7 +2042,7 @@ Slice::ModuleGenerator::visitContainer(const ContainerPtr& p)
+ end();
+ start("dd");
+ string metadata;
+- printSummary(*q, p, (*q)->findMetaData("deprecate", metadata));
++ printSummary(*q, p, (*q)->findMetaData("deprecate", metadata), true);
+ end();
+ }
+ end();
+@@ -2071,7 +2071,7 @@ Slice::ModuleGenerator::visitContainer(const ContainerPtr& p)
+ end();
+ start("dd");
+ string metadata;
+- printSummary(*q, p, (*q)->findMetaData("deprecate", metadata));
++ printSummary(*q, p, (*q)->findMetaData("deprecate", metadata), true);
+ end();
+ }
+ end();
+@@ -2092,7 +2092,7 @@ Slice::ModuleGenerator::visitContainer(const ContainerPtr& p)
+ end();
+ start("dd");
+ string metadata;
+- printSummary(*q, p, (*q)->findMetaData("deprecate", metadata));
++ printSummary(*q, p, (*q)->findMetaData("deprecate", metadata), true);
+ end();
+ }
+ end();
+@@ -2115,7 +2115,7 @@ Slice::ModuleGenerator::visitContainer(const ContainerPtr& p)
+ end();
+ start("dd");
+ string metadata;
+- printSummary(*q, p, (*q)->findMetaData("deprecate", metadata));
++ printSummary(*q, p, (*q)->findMetaData("deprecate", metadata), true);
+ end();
+ }
+ end();
+@@ -2138,7 +2138,7 @@ Slice::ModuleGenerator::visitContainer(const ContainerPtr& p)
+ end();
+ start("dd");
+ string metadata;
+- printSummary(*q, p, (*q)->findMetaData("deprecate", metadata));
++ printSummary(*q, p, (*q)->findMetaData("deprecate", metadata), true);
+ end();
+ }
+ end();
+@@ -2161,7 +2161,7 @@ Slice::ModuleGenerator::visitContainer(const ContainerPtr& p)
+ end();
+ start("dd");
+ string metadata;
+- printSummary(*q, p, (*q)->findMetaData("deprecate", metadata));
++ printSummary(*q, p, (*q)->findMetaData("deprecate", metadata), true);
+ end();
+ }
+ end();
+@@ -2184,7 +2184,7 @@ Slice::ModuleGenerator::visitContainer(const ContainerPtr& p)
+ end();
+ start("dd");
+ string metadata;
+- printSummary(*q, p, (*q)->findMetaData("deprecate", metadata));
++ printSummary(*q, p, (*q)->findMetaData("deprecate", metadata), true);
+ end();
+ }
+ end();
+@@ -2207,7 +2207,7 @@ Slice::ModuleGenerator::visitContainer(const ContainerPtr& p)
+ end();
+ start("dd");
+ string metadata;
+- printSummary(*q, p, (*q)->findMetaData("deprecate", metadata));
++ printSummary(*q, p, (*q)->findMetaData("deprecate", metadata), true);
+ end();
+ }
+ end();
+@@ -2230,7 +2230,7 @@ Slice::ModuleGenerator::visitContainer(const ContainerPtr& p)
+ end();
+ start("dd");
+ string metadata;
+- printSummary(*q, p, (*q)->findMetaData("deprecate", metadata));
++ printSummary(*q, p, (*q)->findMetaData("deprecate", metadata), true);
+ end();
+ }
+ end();
+@@ -2427,7 +2427,7 @@ Slice::ExceptionGenerator::generate(const ExceptionPtr& e)
+ end();
+ start("dd");
+ string metadata;
+- printSummary(*q, e, (*q)->findMetaData("deprecate", metadata));
++ printSummary(*q, e, (*q)->findMetaData("deprecate", metadata), false);
+ end();
+ }
+ end();
+@@ -2557,7 +2557,7 @@ Slice::ClassGenerator::generate(const ClassDefPtr& c)
+ end();
+ start("dd");
+ string metadata;
+- printSummary(*q, c, (*q)->findMetaData("deprecate", metadata));
++ printSummary(*q, c, (*q)->findMetaData("deprecate", metadata), false);
+ end();
+ }
+ end();
+@@ -2578,7 +2578,7 @@ Slice::ClassGenerator::generate(const ClassDefPtr& c)
+ end();
+ start("dd");
+ string metadata;
+- printSummary(*q, c, (*q)->findMetaData("deprecate", metadata));
++ printSummary(*q, c, (*q)->findMetaData("deprecate", metadata), false);
+ end();
+ }
+ end();
+@@ -2739,7 +2739,7 @@ Slice::StructGenerator::generate(const StructPtr& s)
+ end();
+ start("dd");
+ string metadata;
+- printSummary(*q, s, (*q)->findMetaData("deprecate", metadata));
++ printSummary(*q, s, (*q)->findMetaData("deprecate", metadata), false);
+ end();
+ }
+ end();
+diff --git a/cpp/src/slice2html/Gen.h b/cpp/src/slice2html/Gen.h
+index 776035b..cacdd58 100644
+--- a/cpp/src/slice2html/Gen.h
++++ b/cpp/src/slice2html/Gen.h
+@@ -52,7 +52,7 @@ protected:
+
+ void printComment(const ContainedPtr&, const ContainerPtr&, const ::std::string&, bool = false);
+ void printMetaData(const ContainedPtr&);
+- void printSummary(const ContainedPtr&, const ContainerPtr&, bool);
++ void printSummary(const ContainedPtr&, const ContainerPtr&, bool, bool);
+
+ void printHeaderFooter(const ContainedPtr&);
+ void printSearch();
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090626/78056e47/attachment-0001.html>
More information about the macports-changes
mailing list