[141937] trunk/dports/www/phantomjs

[cal at macports.org]

Revision: 141937
          https://trac.macports.org/changeset/141937
Author:   cal at macports.org
Date:     2015-10-31 07:51:54 -0700 (Sat, 31 Oct 2015)
Log Message:
-----------
phantomjs: fix build with clang 3.7, closes #49514, maintainer timeout

Modified Paths:
--------------
    trunk/dports/www/phantomjs/Portfile

Added Paths:
-----------
    trunk/dports/www/phantomjs/files/patch-src__tools__qlalr__lalr.cpp.diff

Modified: trunk/dports/www/phantomjs/Portfile
===================================================================
--- trunk/dports/www/phantomjs/Portfile	2015-10-31 11:08:41 UTC (rev 141936)
+++ trunk/dports/www/phantomjs/Portfile	2015-10-31 14:51:54 UTC (rev 141937)
@@ -27,8 +27,11 @@
 checksums           rmd160  84f80e82a4dc48110f02dc4734c938c9abd8acb0 \
                     sha256  cc81249eaa059cc138414390cade9cb6509b9d6fa0df16f4f43de70b174b3bfe
 
+depends_lib         port:openssl
+
 patchfiles          patch-tools_preconfig.sh.diff \
-                    patch-qcocoaapplicationdelegate.mm.diff
+                    patch-qcocoaapplicationdelegate.mm.diff \
+                    patch-src__tools__qlalr__lalr.cpp.diff
 
 use_configure       no
 

Added: trunk/dports/www/phantomjs/files/patch-src__tools__qlalr__lalr.cpp.diff
===================================================================
--- trunk/dports/www/phantomjs/files/patch-src__tools__qlalr__lalr.cpp.diff	                        (rev 0)
+++ trunk/dports/www/phantomjs/files/patch-src__tools__qlalr__lalr.cpp.diff	2015-10-31 14:51:54 UTC (rev 141937)
@@ -0,0 +1,57 @@
+From cf63c63d558227fdbef09699c261560e7474f5ea Mon Sep 17 00:00:00 2001
+From: =?utf8?q?Bernhard=20Rosenkr=C3=A4nzer?= <bero at lindev.ch>
+Date: Wed, 15 Jul 2015 15:52:53 +0200
+Subject: [PATCH] Fix build with clang 3.7
+
+_Nullable is a language extension in clang 3.7 (indicating whether or
+not a pointer can be null).
+http://clang.llvm.org/docs/AttributeReference.html#nullable
+
+Using it as a class name breaks building with this compiler.
+
+Change-Id: I0c838dac872ca2c00bf57c95df17d24edb48007b
+Reviewed-by: Thiago Macieira <thiago.macieira at intel.com>
+Upstream-Status: Backport [https://codereview.qt-project.org/#/c/121545]
+---
+ src/tools/qlalr/lalr.cpp | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/tools/qlalr/lalr.cpp b/src/tools/qlalr/lalr.cpp
+index 3d0d5de..3d780cd 100644
+--- src/qt/qtbase/src/tools/qlalr/lalr.cpp
++++ src/qt/qtbase/src/tools/qlalr/lalr.cpp
+@@ -238,11 +238,11 @@ void Grammar::buildExtendedGrammar ()
+   non_terminals.insert (accept_symbol);
+ }
+ 
+-struct _Nullable: public std::unary_function<Name, bool>
++struct Nullable: public std::unary_function<Name, bool>
+ {
+   Automaton *_M_automaton;
+ 
+-  _Nullable (Automaton *aut):
++  Nullable (Automaton *aut):
+     _M_automaton (aut) {}
+ 
+   bool operator () (Name name) const
+@@ -300,7 +300,7 @@ void Automaton::buildNullables ()
+ 
+       for (RulePointer rule = _M_grammar->rules.begin (); rule != _M_grammar->rules.end (); ++rule)
+         {
+-          NameList::iterator nn = std::find_if (rule->rhs.begin (), rule->rhs.end (), std::not1 (_Nullable (this)));
++          NameList::iterator nn = std::find_if (rule->rhs.begin (), rule->rhs.end (), std::not1 (Nullable (this)));
+ 
+           if (nn == rule->rhs.end ())
+             changed |= nullables.insert (rule->lhs).second;
+@@ -635,7 +635,7 @@ void Automaton::buildIncludesDigraph ()
+                   if (! _M_grammar->isNonTerminal (*A))
+                     continue;
+ 
+-                  NameList::iterator first_not_nullable = std::find_if (dot, rule->rhs.end (), std::not1 (_Nullable (this)));
++                  NameList::iterator first_not_nullable = std::find_if (dot, rule->rhs.end (), std::not1 (Nullable (this)));
+                   if (first_not_nullable != rule->rhs.end ())
+                     continue;
+ 
+-- 
+2.6.2.2.g1b5ffa3
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151212/84d05adf/attachment.html>