From ecf8d4814fde069659bf0d999ee5bddc3f27a18b Mon Sep 17 00:00:00 2001 From: Lars Wendler Date: Tue, 25 Aug 2015 10:12:02 +0200 Subject: [PATCH] media-sound/clementine: Added subslot dependency for media-libs/glew and slot dependency for dev-db/sqlite. Fixed compilation with >=dev-libs/boost-1.57.0 (bug #542528). Package-Manager: portage-2.2.20.1 Signed-off-by: Lars Wendler --- .../clementine/clementine-1.2.3.ebuild | 7 +- ...1.2.3-hide_boost_includes_from_q_moc.patch | 181 ++++++++++++++++++ 2 files changed, 185 insertions(+), 3 deletions(-) create mode 100644 media-sound/clementine/files/clementine-1.2.3-hide_boost_includes_from_q_moc.patch diff --git a/media-sound/clementine/clementine-1.2.3.ebuild b/media-sound/clementine/clementine-1.2.3.ebuild index d9410eb7e4ba..eb76fd143a81 100644 --- a/media-sound/clementine/clementine-1.2.3.ebuild +++ b/media-sound/clementine/clementine-1.2.3.ebuild @@ -36,7 +36,7 @@ COMMON_DEPEND=" dbus? ( >=dev-qt/qtdbus-4.5:4 ) >=dev-qt/qtopengl-4.5:4 >=dev-qt/qtsql-4.5:4[sqlite] - system-sqlite? ( dev-db/sqlite[fts3(+)] ) + system-sqlite? ( dev-db/sqlite:3[fts3(+)] ) >=media-libs/taglib-1.8[mp4] >=dev-libs/glib-2.24.1-r1 dev-libs/libxml2 @@ -57,7 +57,7 @@ COMMON_DEPEND=" lastfm? ( >=media-libs/liblastfm-1 ) mtp? ( >=media-libs/libmtp-1.0.0 ) moodbar? ( sci-libs/fftw:3.0 ) - projectm? ( media-libs/glew ) + projectm? ( media-libs/glew:= ) " # now only presets are used, libprojectm is internal # https://github.com/clementine-player/Clementine/tree/master/3rdparty/libprojectm/patches @@ -94,7 +94,8 @@ RESTRICT="test" S="${WORKDIR}/${P^}" PATCHES=( - "${FILESDIR}"/clementine-1.2.3-namespaces.patch + "${FILESDIR}/${PN}-1.2.3-namespaces.patch" + "${FILESDIR}/${P}-hide_boost_includes_from_q_moc.patch" ) src_prepare() { diff --git a/media-sound/clementine/files/clementine-1.2.3-hide_boost_includes_from_q_moc.patch b/media-sound/clementine/files/clementine-1.2.3-hide_boost_includes_from_q_moc.patch new file mode 100644 index 000000000000..c582d7a86e32 --- /dev/null +++ b/media-sound/clementine/files/clementine-1.2.3-hide_boost_includes_from_q_moc.patch @@ -0,0 +1,181 @@ +Description: Wrap boost includes to avoid FTBFS due to qt4 moc. +Author: Robert Bruce Park +Bug-Debian: https://bugs.debian.org/795144 +Last-Update: <2015-04-13> + +--- a/src/core/boundfuturewatcher.h ++++ b/src/core/boundfuturewatcher.h +@@ -3,7 +3,9 @@ + + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + template + class BoundFutureWatcher : public QFutureWatcher, boost::noncopyable { +--- a/src/core/database.cpp ++++ b/src/core/database.cpp +@@ -23,7 +23,9 @@ + #include "core/logging.h" + #include "core/taskmanager.h" + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include + #include +--- a/src/core/macglobalshortcutbackend.mm ++++ b/src/core/macglobalshortcutbackend.mm +@@ -22,7 +22,9 @@ + #include "mac_startup.h" + #import "mac_utilities.h" + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include + #include +--- a/src/core/mergedproxymodel.h ++++ b/src/core/mergedproxymodel.h +@@ -25,10 +25,12 @@ + using std::placeholders::_1; + using std::placeholders::_2; + ++#ifndef Q_MOC_RUN + #include + #include + #include + #include ++#endif + + using boost::multi_index::multi_index_container; + using boost::multi_index::indexed_by; +--- a/src/core/scopedtransaction.h ++++ b/src/core/scopedtransaction.h +@@ -18,7 +18,9 @@ + #ifndef SCOPEDTRANSACTION_H + #define SCOPEDTRANSACTION_H + ++#ifndef Q_MOC_RUN + #include ++#endif + + class QSqlDatabase; + +--- a/src/core/signalchecker.h ++++ b/src/core/signalchecker.h +@@ -20,8 +20,10 @@ + + #include + ++#ifndef Q_MOC_RUN + #include + #include ++#endif + + // Do not call this directly, use CHECKED_GCONNECT instead. + bool CheckedGConnect( +--- a/src/devices/macdevicelister.mm ++++ b/src/devices/macdevicelister.mm +@@ -38,7 +38,9 @@ + #import + #import + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include + +--- a/src/library/groupbydialog.h ++++ b/src/library/groupbydialog.h +@@ -25,9 +25,11 @@ + using std::placeholders::_1; + using std::placeholders::_2; + ++#ifndef Q_MOC_RUN + #include + #include + #include ++#endif + + #include "librarymodel.h" + +--- a/tests/database_test.cpp ++++ b/tests/database_test.cpp +@@ -20,7 +20,9 @@ + + #include "core/database.h" + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include + #include +--- a/tests/librarybackend_test.cpp ++++ b/tests/librarybackend_test.cpp +@@ -23,7 +23,9 @@ + #include "core/song.h" + #include "core/database.h" + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include + #include +--- a/tests/plsparser_test.cpp ++++ b/tests/plsparser_test.cpp +@@ -27,7 +27,9 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif + + using boost::shared_ptr; + +--- a/tests/songloader_test.cpp ++++ b/tests/songloader_test.cpp +@@ -29,7 +29,10 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include ++#endif ++ + #include + + using ::testing::_; +--- a/tests/songplaylistitem_test.cpp ++++ b/tests/songplaylistitem_test.cpp +@@ -19,7 +19,10 @@ + #include "test_utils.h" + + #include ++ ++#ifndef Q_MOC_RUN + #include ++#endif + + #include + #include +--- a/tests/utilities_test.cpp ++++ b/tests/utilities_test.cpp +@@ -21,7 +21,9 @@ + + #include "core/utilities.h" + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include + -- 2.26.2