From owner-svn-ports-all@freebsd.org Sat Sep 17 14:39:40 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 38CB5BDED4A; Sat, 17 Sep 2016 14:39:40 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EDB335FB; Sat, 17 Sep 2016 14:39:39 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u8HEddcK012857; Sat, 17 Sep 2016 14:39:39 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8HEddUE012855; Sat, 17 Sep 2016 14:39:39 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201609171439.u8HEddUE012855@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Sat, 17 Sep 2016 14:39:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r422328 - in branches/2016Q3/lang/phantomjs: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 Sep 2016 14:39:40 -0000 Author: feld Date: Sat Sep 17 14:39:38 2016 New Revision: 422328 URL: https://svnweb.freebsd.org/changeset/ports/422328 Log: MFH: r422327 lang/phantomjs: Fix build on 9.3 and 11.0 - Take maintainership (maintainer timeouts previously) - Remove no-op patch - Remove work related to GCC build profiles as we enforce clang - Add patch to fix building with clang in 11.0 - Add hack to enforce CC and CXX for 9.3 Partway through the build the compiler was switching from clang++ to c++ which is GCC in base system. This was causing build failures. Approved by: ports-secteam (with hat) Added: branches/2016Q3/lang/phantomjs/files/patch-src_qt_qtbase_src_tools_qlalr_lalr.cpp - copied unchanged from r422327, head/lang/phantomjs/files/patch-src_qt_qtbase_src_tools_qlalr_lalr.cpp Deleted: branches/2016Q3/lang/phantomjs/files/patch-mkspecs-freebsd-g++-qmake.conf Modified: branches/2016Q3/lang/phantomjs/Makefile Directory Properties: branches/2016Q3/ (props changed) Modified: branches/2016Q3/lang/phantomjs/Makefile ============================================================================== --- branches/2016Q3/lang/phantomjs/Makefile Sat Sep 17 14:37:36 2016 (r422327) +++ branches/2016Q3/lang/phantomjs/Makefile Sat Sep 17 14:39:38 2016 (r422328) @@ -2,12 +2,12 @@ PORTNAME= phantomjs PORTVERSION= 2.0.0 -PORTREVISION= 1 +PORTREVISION= 4 CATEGORIES= lang MASTER_SITES= https://bitbucket.org/ariya/phantomjs/downloads/ DISTNAME= ${PORTNAME}-${PORTVERSION}-source -MAINTAINER= kuriyama@FreeBSD.org +MAINTAINER= feld@FreeBSD.org COMMENT= Minimalistic, headless, WebKit-based, JavaScript-driven tool LICENSE= BSD3CLAUSE @@ -29,16 +29,19 @@ PLIST_FILES= bin/phantomjs #PATCH_DEBUG= yes NO_CCACHE= yes +USE_XORG= x11 + +# Hack for FreeBSD 9. Without it mysteriously switches from +# clang++ to c++ which ends in build failure. +CC=clang +CXX=clang++ + # NOTE: # build.sh --qtwebkit=system requires Qt 5.3.x. We cannot use it. # qmake.conf detection is in src/qt/qtbase/configure script. SPEC= ${WRKSRC}/src/qt/qtbase/mkspecs post-extract: - cd ${SPEC} && ${CP} -r freebsd-g++46 freebsd-g++48 - cd ${SPEC} && ${CP} -r freebsd-g++46 freebsd-g++49 - cd ${SPEC} && ${REINPLACE_CMD} -e 's|46|48|' freebsd-g++48/qmake.conf - cd ${SPEC} && ${REINPLACE_CMD} -e 's|46|49|' freebsd-g++49/qmake.conf ${MKDIR} ${SPEC}/freebsd-clang cd ${SPEC} && ${SED} -e 's|\.\./\.\./|../|g' unsupported/freebsd-clang/qmake.conf > freebsd-clang/qmake.conf cd ${SPEC} && ${SED} -e 's|\.\./\.\./|../|g' unsupported/freebsd-clang/qplatformdefs.h > freebsd-clang/qplatformdefs.h Copied: branches/2016Q3/lang/phantomjs/files/patch-src_qt_qtbase_src_tools_qlalr_lalr.cpp (from r422327, head/lang/phantomjs/files/patch-src_qt_qtbase_src_tools_qlalr_lalr.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q3/lang/phantomjs/files/patch-src_qt_qtbase_src_tools_qlalr_lalr.cpp Sat Sep 17 14:39:38 2016 (r422328, copy of r422327, head/lang/phantomjs/files/patch-src_qt_qtbase_src_tools_qlalr_lalr.cpp) @@ -0,0 +1,34 @@ +--- src/qt/qtbase/src/tools/qlalr/lalr.cpp.orig 2015-01-24 02:19:52 UTC ++++ src/qt/qtbase/src/tools/qlalr/lalr.cpp +@@ -246,11 +246,11 @@ void Grammar::buildExtendedGrammar () + non_terminals.insert (accept_symbol); + } + +-struct _Nullable: public std::unary_function ++struct Nullable: public std::unary_function + { + Automaton *_M_automaton; + +- _Nullable (Automaton *aut): ++ Nullable (Automaton *aut): + _M_automaton (aut) {} + + bool operator () (Name name) const +@@ -308,7 +308,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; +@@ -643,7 +643,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; +