diff options
| author | rakuco <rakuco@FreeBSD.org> | 2014-02-10 23:18:56 +0800 |
|---|---|---|
| committer | rakuco <rakuco@FreeBSD.org> | 2014-02-10 23:18:56 +0800 |
| commit | d9ed98e3e21dda7a672c5a8b8d42f69d76b27ca4 (patch) | |
| tree | d20ea0a1bce36fa71bc50005785e22ab76a1b2ff /devel/qt4-moc | |
| parent | d5c4346cb730780084d069135f55e3c45a1623ac (diff) | |
| download | freebsd-ports-gnome-d9ed98e3e21dda7a672c5a8b8d42f69d76b27ca4.tar.gz freebsd-ports-gnome-d9ed98e3e21dda7a672c5a8b8d42f69d76b27ca4.tar.zst freebsd-ports-gnome-d9ed98e3e21dda7a672c5a8b8d42f69d76b27ca4.zip | |
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)
Diffstat (limited to 'devel/qt4-moc')
| -rw-r--r-- | devel/qt4-moc/Makefile | 1 | ||||
| -rw-r--r-- | devel/qt4-moc/files/patch-src__tools__moc__main.cpp | 21 |
2 files changed, 22 insertions, 0 deletions
diff --git a/devel/qt4-moc/Makefile b/devel/qt4-moc/Makefile index e965164faa35..f7ec899d0388 100644 --- a/devel/qt4-moc/Makefile +++ b/devel/qt4-moc/Makefile @@ -3,6 +3,7 @@ PORTNAME= moc DISTVERSION= ${QT4_VERSION} +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt4- diff --git a/devel/qt4-moc/files/patch-src__tools__moc__main.cpp b/devel/qt4-moc/files/patch-src__tools__moc__main.cpp new file mode 100644 index 000000000000..1c907ad3cf5f --- /dev/null +++ b/devel/qt4-moc/files/patch-src__tools__moc__main.cpp @@ -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; |