commit: b7cd10a1f1569227186bc9d22b0aa66376f446b9 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Wed Jan 9 18:39:31 2019 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Wed Jan 9 18:39:31 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7cd10a1
media-libs/phonon: Drop 4.10.1-r1 Package-Manager: Portage-2.3.54, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../files/phonon-4.10.1-pulseaudio-qt-5.12.patch | 28 ----------- media-libs/phonon/phonon-4.10.1-r1.ebuild | 58 ---------------------- 2 files changed, 86 deletions(-) diff --git a/media-libs/phonon/files/phonon-4.10.1-pulseaudio-qt-5.12.patch b/media-libs/phonon/files/phonon-4.10.1-pulseaudio-qt-5.12.patch deleted file mode 100644 index 4b1dc5b6fbc..00000000000 --- a/media-libs/phonon/files/phonon-4.10.1-pulseaudio-qt-5.12.patch +++ /dev/null @@ -1,28 +0,0 @@ -From eef6dae58a19da4c6af90a0b7cce6378e527683d Mon Sep 17 00:00:00 2001 -From: Antonio Rojas <aro...@archlinux.org> -Date: Mon, 10 Dec 2018 21:10:13 +0100 -Subject: Fix PulseAudio support with Qt 5.12 - -QAbstractEventDispatcher::instance()->metaObject()->className() now returns "QXcbGlibEventDispatcher", so the glib event loop test fails - -Differential Revision: https://phabricator.kde.org/D17486 ---- - phonon/pulsesupport.cpp | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/phonon/pulsesupport.cpp b/phonon/pulsesupport.cpp -index b7009b1..d324084 100644 ---- a/phonon/pulsesupport.cpp -+++ b/phonon/pulsesupport.cpp -@@ -840,7 +840,8 @@ PulseSupport::PulseSupport() - } - - // We require a glib event loop -- if (!QByteArray(QAbstractEventDispatcher::instance()->metaObject()->className()).contains("EventDispatcherGlib")) { -+ if (!QByteArray(QAbstractEventDispatcher::instance()->metaObject()->className()).contains("EventDispatcherGlib") && -+ !QByteArray(QAbstractEventDispatcher::instance()->metaObject()->className()).contains("GlibEventDispatcher")) { - qWarning("WARNING: Disabling PulseAudio integration for lack of GLib event loop."); - return; - } --- -cgit v1.1 diff --git a/media-libs/phonon/phonon-4.10.1-r1.ebuild b/media-libs/phonon/phonon-4.10.1-r1.ebuild deleted file mode 100644 index 011e7d0ba88..00000000000 --- a/media-libs/phonon/phonon-4.10.1-r1.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -if [[ ${PV} != *9999* ]]; then - SRC_URI="mirror://kde/stable/phonon/${PV}/${P}.tar.xz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-fbsd" -else - EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" ) - inherit git-r3 -fi - -inherit cmake-utils qmake-utils - -DESCRIPTION="KDE multimedia API" -HOMEPAGE="https://phonon.kde.org/"; - -LICENSE="|| ( LGPL-2.1 LGPL-3 )" -SLOT="0" -IUSE="debug designer gstreamer pulseaudio +vlc" - -RDEPEND=" - !!dev-qt/qtphonon:4 - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - designer? ( dev-qt/designer:5 ) - pulseaudio? ( - dev-libs/glib:2 - >=media-sound/pulseaudio-0.9.21[glib] - ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - kde-frameworks/extra-cmake-modules:5 - virtual/pkgconfig -" -PDEPEND=" - gstreamer? ( >=media-libs/phonon-gstreamer-4.9.0[qt5(+)] ) - vlc? ( >=media-libs/phonon-vlc-0.9.0[qt5(+)] ) -" - -PATCHES=( "${FILESDIR}/${P}-pulseaudio-qt-5.12.patch" ) - -src_configure() { - local mycmakeargs=( - -DPHONON_BUILD_PHONON4QT5=ON - -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=TRUE - -DPHONON_BUILD_DESIGNER_PLUGIN=$(usex designer) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Declarative=ON - -DWITH_GLIB2=$(usex pulseaudio) - -DWITH_PulseAudio=$(usex pulseaudio) - -DQT_QMAKE_EXECUTABLE="$(qt5_get_bindir)"/qmake - ) - cmake-utils_src_configure -}
