[114739] trunk/dports/net/squid3
jmr at macports.org
jmr at macports.org
Sat Dec 14 10:07:54 PST 2013
Revision: 114739
https://trac.macports.org/changeset/114739
Author: jmr at macports.org
Date: 2013-12-14 10:07:53 -0800 (Sat, 14 Dec 2013)
Log Message:
-----------
squid3: apply patch from upstream bug report to address build failure on Mavericks (#40986)
Modified Paths:
--------------
trunk/dports/net/squid3/Portfile
Added Paths:
-----------
trunk/dports/net/squid3/files/patch-Vector.h.diff
Modified: trunk/dports/net/squid3/Portfile
===================================================================
--- trunk/dports/net/squid3/Portfile 2013-12-14 16:58:08 UTC (rev 114738)
+++ trunk/dports/net/squid3/Portfile 2013-12-14 18:07:53 UTC (rev 114739)
@@ -37,7 +37,8 @@
patchfiles patch-cf.data.pre.diff \
patch-compat_types.h.diff \
- patch-basic_pam_auth.cc.diff
+ patch-basic_pam_auth.cc.diff \
+ patch-Vector.h.diff
platform darwin 10 {
# ticket #37102, /usr/include/rpcsvc/yp_prot.h tries to redefine bool
Added: trunk/dports/net/squid3/files/patch-Vector.h.diff
===================================================================
--- trunk/dports/net/squid3/files/patch-Vector.h.diff (rev 0)
+++ trunk/dports/net/squid3/files/patch-Vector.h.diff 2013-12-14 18:07:53 UTC (rev 114739)
@@ -0,0 +1,24 @@
+http://bugs.squid-cache.org/show_bug.cgi?id=3954
+Patch from Romain Geissler of Amadeus IT Group
+
+diff --git src/base/Vector.h src/base/Vector.h
+index 8cee5fa..8f43522 100644
+--- src/base/Vector.h
++++ src/base/Vector.h
+@@ -35,6 +35,7 @@
+ \todo CLEANUP: this file should be called Vector.h at least, and probably be replaced by STL Vector<C>
+ */
+
++#include <iterator>
+ #include "fatal.h"
+ #include "util.h"
+
+@@ -44,7 +45,7 @@
+ /* iterator support */
+
+ template <class C>
+-class VectorIteratorBase
++class VectorIteratorBase : public std::iterator <std::forward_iterator_tag, typename C::value_type>
+ {
+
+ public:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20131214/64d32b7f/attachment.html>
More information about the macports-changes
mailing list