From owner-svn-ports-head@FreeBSD.ORG Mon Feb 10 15:18:57 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AD490E61; Mon, 10 Feb 2014 15:18:57 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 7E6E61700; Mon, 10 Feb 2014 15:18:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1AFIv5v077784; Mon, 10 Feb 2014 15:18:57 GMT (envelope-from rakuco@svn.freebsd.org) Received: (from rakuco@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1AFIvaM077782; Mon, 10 Feb 2014 15:18:57 GMT (envelope-from rakuco@svn.freebsd.org) Message-Id: <201402101518.s1AFIvaM077782@svn.freebsd.org> From: Raphael Kubo da Costa Date: Mon, 10 Feb 2014 15:18:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r343646 - in head/devel/qt4-moc: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Feb 2014 15:18:57 -0000 Author: rakuco Date: Mon Feb 10 15:18:56 2014 New Revision: 343646 URL: http://svnweb.freebsd.org/changeset/ports/343646 QAT: https://qat.redports.org/buildarchive/r343646/ Log: Add patch to work around more integration issues between moc and boost. science/avogadro started failing to build after boost was updated to 1.55. Add a patch from Fedora to special-case more boost defines so that everything works again. Obtained from: Fedora Project (qt.git repository) Added: head/devel/qt4-moc/files/ head/devel/qt4-moc/files/patch-src__tools__moc__main.cpp (contents, props changed) Modified: head/devel/qt4-moc/Makefile Modified: head/devel/qt4-moc/Makefile ============================================================================== --- head/devel/qt4-moc/Makefile Mon Feb 10 15:08:02 2014 (r343645) +++ head/devel/qt4-moc/Makefile Mon Feb 10 15:18:56 2014 (r343646) @@ -3,6 +3,7 @@ PORTNAME= moc DISTVERSION= ${QT4_VERSION} +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt4- Added: head/devel/qt4-moc/files/patch-src__tools__moc__main.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/qt4-moc/files/patch-src__tools__moc__main.cpp Mon Feb 10 15:18:56 2014 (r343646) @@ -0,0 +1,21 @@ +Work around additional moc + Boost bugs that showed up after the Boost +upgrade from 1.52 to 1.55. This should make science/avogadro buildable +again. + +See the discussion in QTBUG-22829. + +Obtained from: Fedora Project +http://pkgs.fedoraproject.org/cgit/qt.git/tree/qt-everywhere-opensource-src-4.8.5-QTBUG-22829.patch +--- src/tools/moc/main.cpp 2013-06-09 17:04:02.762459323 -0500 ++++ src/tools/moc/main.cpp 2013-06-09 17:08:20.409680813 -0500 +@@ -188,8 +188,9 @@ int runMoc(int _argc, char **_argv) + pp.macros["Q_MOC_RUN"]; + pp.macros["__cplusplus"]; + +- // Workaround a bug while parsing the boost/type_traits/has_operator.hpp header. See QTBUG-22829 ++ // Workaround bugs while parsing some boost headers. See QTBUG-22829 + pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"]; ++ pp.macros["BOOST_LEXICAL_CAST_INCLUDED"]; + + QByteArray filename; + QByteArray output;