[112557] trunk/dports/shells/fish

[raimue at macports.org]

Revision: 112557
          https://trac.macports.org/changeset/112557
Author:   raimue at macports.org
Date:     2013-10-25 19:32:36 -0700 (Fri, 25 Oct 2013)
Log Message:
-----------
shells/fish:
Fix build on Mavericks failing due to tr1 headers, fix one ambiguous overload.
Closes #40891.

Modified Paths:
--------------
    trunk/dports/shells/fish/Portfile

Added Paths:
-----------
    trunk/dports/shells/fish/files/patch-ambiguous-overload.diff
    trunk/dports/shells/fish/files/patch-c++11-tr1.diff

Modified: trunk/dports/shells/fish/Portfile
===================================================================
--- trunk/dports/shells/fish/Portfile	2013-10-26 02:15:23 UTC (rev 112556)
+++ trunk/dports/shells/fish/Portfile	2013-10-26 02:32:36 UTC (rev 112557)
@@ -31,7 +31,9 @@
 use_autoconf            yes
 
 # MEMO: patchfile patch-proc_c.diff could be still needed
-patchfiles          patch-share_config_fish.diff
+patchfiles          patch-share_config_fish.diff \
+                    patch-c++11-tr1.diff \
+                    patch-ambiguous-overload.diff
 
 post-patch {
     reinplace "s|@@PREFIX@@|${prefix}/bin|g"     "${worksrcpath}/share/config.fish"

Added: trunk/dports/shells/fish/files/patch-ambiguous-overload.diff
===================================================================
--- trunk/dports/shells/fish/files/patch-ambiguous-overload.diff	                        (rev 0)
+++ trunk/dports/shells/fish/files/patch-ambiguous-overload.diff	2013-10-26 02:32:36 UTC (rev 112557)
@@ -0,0 +1,12 @@
+Upstream: https://github.com/fish-shell/fish-shell/commit/a8af97489549ef737b1518888545c9fedcf380ef
+--- exec.cpp
++++ exec.cpp
+@@ -376,7 +376,7 @@ static void launch_process_nofork(process_t *p)
+ */
+ static int has_fd(const io_chain_t &d, int fd)
+ {
+-    return io_chain_get(d, fd) != NULL;
++    return io_chain_get(d, fd).get() != NULL;
+ }
+ 
+ /**

Added: trunk/dports/shells/fish/files/patch-c++11-tr1.diff
===================================================================
--- trunk/dports/shells/fish/files/patch-c++11-tr1.diff	                        (rev 0)
+++ trunk/dports/shells/fish/files/patch-c++11-tr1.diff	2013-10-26 02:32:36 UTC (rev 112557)
@@ -0,0 +1,24 @@
+Upstream: https://github.com/fish-shell/fish-shell/issues/968
+Upstream: https://github.com/fish-shell/fish-shell/commit/7541fac245b47cce023ba4b12b4216e671508780
+--- io.h
++++ io.h
+@@ -2,12 +2,16 @@
+ #define FISH_IO_H
+ 
+ #include <vector>
+-#if __cplusplus > 199711L
+-// C++11
++
++// Note that we have to include something to get any _LIBCPP_VERSION defined so we can detect libc++
++// So it's key that vector go above. If we didn't need vector for other reasons, we might include ciso646, which does nothing
++
++#if defined(_LIBCPP_VERSION) || __cplusplus > 199711L
++// C++11 or libc++ (which is a C++11-only library, but the memory header works OK in C++03)
+ #include <memory>
+ using std::shared_ptr;
+ #else
+-// C++03
++// C++03 or libstdc++
+ #include <tr1/memory>
+ using std::tr1::shared_ptr;
+ #endif
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131025/7f9e17be/attachment.html>