[128623] trunk/dports/devel/ddd

[raimue at macports.org]

Revision: 128623
          https://trac.macports.org/changeset/128623
Author:   raimue at macports.org
Date:     2014-11-24 07:27:36 -0800 (Mon, 24 Nov 2014)
Log Message:
-----------
devel/ddd:
Fix build error on OS X >= 10.9, closes #42800

Modified Paths:
--------------
    trunk/dports/devel/ddd/Portfile

Added Paths:
-----------
    trunk/dports/devel/ddd/files/patch-strclass-friend.diff

Modified: trunk/dports/devel/ddd/Portfile
===================================================================
--- trunk/dports/devel/ddd/Portfile	2014-11-24 14:28:47 UTC (rev 128622)
+++ trunk/dports/devel/ddd/Portfile	2014-11-24 15:27:36 UTC (rev 128623)
@@ -25,7 +25,8 @@
 	port:xorg-libXaw \
 	port:xorg-libXp
 
-patchfiles      patch-ambiguous-overload.diff
+patchfiles      patch-ambiguous-overload.diff \
+                patch-strclass-friend.diff
 
 configure.args  --infodir=${prefix}/share/info \
                 --mandir=${prefix}/share/man \

Added: trunk/dports/devel/ddd/files/patch-strclass-friend.diff
===================================================================
--- trunk/dports/devel/ddd/files/patch-strclass-friend.diff	                        (rev 0)
+++ trunk/dports/devel/ddd/files/patch-strclass-friend.diff	2014-11-24 15:27:36 UTC (rev 128623)
@@ -0,0 +1,66 @@
+Upstream: https://savannah.gnu.org/bugs/download.php?file_id=31132
+--- ddd/strclass.h
++++ ddd/strclass.h
+@@ -810,10 +810,10 @@ public:
+     friend int split(const string& x, string *res, int maxn, 
+ 		     const regex& sep);
+ 
+-    friend string common_prefix(const string& x, const string& y, 
+-				int startpos = 0);
+-    friend string common_suffix(const string& x, const string& y, 
+-				int startpos = -1);
++    inline string common_prefix(const string& x, const string& y);
++    friend string common_prefix(const string& x, const string& y, int startpos);
++    inline string common_suffix(const string& x, const string& y);
++    friend string common_suffix(const string& x, const string& y, int startpos);
+     friend string replicate(char c, int n);
+     friend string replicate(const string& y, int n);
+     friend string join(const string *src, int n, const string& sep);
+@@ -863,9 +863,10 @@ public:
+     friend inline std::ostream& operator<<(std::ostream& s, const subString& x);
+     friend std::istream& operator>>(std::istream& s, string& x);
+ 
+-    friend int readline(std::istream& s, string& x, 
+-			char terminator = '\n',
+-			int discard_terminator = 1);
++    inline int readline(std::istream& s, string& x);
++    inline int readline(std::istream& s, string& x, char terminator);
++    friend int readline(std::istream& s, string& x, char terminator,
++			int discard_terminator);
+ 
+     // Status
+     unsigned int length() const;
+@@ -1456,6 +1457,16 @@ inline string operator + (char x, const subString& y)
+     string r; cat(x, y, r); return r;
+ }
+ 
++inline string common_prefix(const string& x, const string& y)
++{
++    return common_prefix(x, y, 0);
++}
++
++inline string common_suffix(const string& x, const string& y)
++{
++    return common_suffix(x, y, -1);
++}
++
+ inline string reverse(const string& x) 
+ {
+     string r; r.rep = string_Sreverse(x.rep, r.rep); return r;
+@@ -1476,6 +1487,16 @@ inline string capitalize(const string& x)
+     string r; r.rep = string_Scapitalize(x.rep, r.rep); return r;
+ }
+ 
++inline int readline(std::istream& s, string& x)
++{
++    return readline(s, x, '\n', 1);
++}
++
++inline int readline(std::istream& s, string& x, char terminator)
++{
++    return readline(s, x, terminator, 1);
++}
++
+ // prepend
+ 
+ inline string& string::prepend(const string& y)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141124/7797d5e6/attachment.html>