commit: 987824056651cf713edc682f454588ad4711b494 Author: Johannes Huber <johu <AT> gentoo <DOT> org> AuthorDate: Thu Jun 11 17:09:39 2015 +0000 Commit: Johannes Huber <johu <AT> gentoo <DOT> org> CommitDate: Thu Jun 11 17:09:39 2015 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=98782405
[media-libs/qt-gstreamer] Remove patch, applied upstream Package-Manager: portage-2.2.20 .../files/qt-gstreamer-1.2.0-boost157.patch | 34 ---------------------- media-libs/qt-gstreamer/qt-gstreamer-9999.ebuild | 2 -- 2 files changed, 36 deletions(-) diff --git a/media-libs/qt-gstreamer/files/qt-gstreamer-1.2.0-boost157.patch b/media-libs/qt-gstreamer/files/qt-gstreamer-1.2.0-boost157.patch deleted file mode 100644 index a795420..0000000 --- a/media-libs/qt-gstreamer/files/qt-gstreamer-1.2.0-boost157.patch +++ /dev/null @@ -1,34 +0,0 @@ -From fbb9dc6e291eaa058f3ef1cd93711265bfbfd162 Mon Sep 17 00:00:00 2001 -From: Heiko Becker <[email protected]> -Date: Fri, 7 Nov 2014 00:11:02 +0100 -Subject: [PATCH] Workaround build failures with boost>=1.57 and moc - -Otherwise I get the following error message: -'usr/include/boost/type_traits/detail/has_binary_operator.hp:50: -Parse error at "BOOST_JOIN"'. See -https://bugreports.qt-project.org/browse/QTBUG-22829 for details. - -The old workaround to define BOOST_TT_HAS_OPERATOR_HPP_INCLUDED -doesn't seem to work here. ---- - src/QGlib/connect.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/QGlib/connect.cpp b/src/QGlib/connect.cpp -index 9ff6fde..58a3367 100644 ---- a/src/QGlib/connect.cpp -+++ b/src/QGlib/connect.cpp -@@ -21,8 +21,10 @@ - #include <QtCore/QHash> - #include <QtCore/QMutex> - #include <boost/multi_index_container.hpp> -+#ifndef Q_MOC_RUN // See: https://bugreports.qt-project.org/browse/QTBUG-22829 - #include <boost/multi_index/sequenced_index.hpp> - #include <boost/multi_index/ordered_index.hpp> -+#endif - #include <boost/multi_index/member.hpp> - - namespace QGlib { --- -2.1.3 - diff --git a/media-libs/qt-gstreamer/qt-gstreamer-9999.ebuild b/media-libs/qt-gstreamer/qt-gstreamer-9999.ebuild index 7a6527c..cbf031f 100644 --- a/media-libs/qt-gstreamer/qt-gstreamer-9999.ebuild +++ b/media-libs/qt-gstreamer/qt-gstreamer-9999.ebuild @@ -53,8 +53,6 @@ DEPEND=" ) " -PATCHES=( "${FILESDIR}/${PN}-1.2.0-boost157.patch" ) - # bug 497880 RESTRICT="test"
