Date: Mon, 10 Feb 2014 15:18:57 +0000 (UTC) From: Raphael Kubo da Costa <rakuco@FreeBSD.org> 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 Message-ID: <201402101518.s1AFIvaM077782@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402101518.s1AFIvaM077782>