Backport small patch from 4.5 branch to fix phonon-4.4.3 compatibility, bug 346951.

(Portage version: 2.2.0_alpha6/cvs/Linux x86_64)

4 files changed, 77 insertions, 3 deletions

diff --git a/kde-base/phonon-kde/ChangeLog b/kde-base/phonon-kde/ChangeLog
index 4935bd1146b9..2420b87985a5 100644
--- a/kde-base/phonon-kde/ChangeLog
+++ b/kde-base/phonon-kde/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/phonon-kde
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/phonon-kde/ChangeLog,v 1.70 2010/11/28 02:24:58 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/phonon-kde/ChangeLog,v 1.71 2010/11/28 18:12:32 reavertm Exp $
+
+  28 Nov 2010; Maciej Mrozowski <reavertm@gentoo.org>
+  phonon-kde-4.4.5.ebuild, phonon-kde-4.5.3.ebuild,
+  +files/phonon-kde-4.5.3-duplicated-definitions.patch:
+  Backport small patch from 4.5 branch to fix phonon-4.4.3 compatibility,
+  bug 346951.
 
   14 Nov 2010; Andreas K. Huettel <dilfridge@gentoo.org>
   phonon-kde-4.5.3.ebuild:
diff --git a/kde-base/phonon-kde/files/phonon-kde-4.5.3-duplicated-definitions.patch b/kde-base/phonon-kde/files/phonon-kde-4.5.3-duplicated-definitions.patch
new file mode 100644
index 000000000000..716bd5e62987
--- /dev/null
+++ b/kde-base/phonon-kde/files/phonon-kde-4.5.3-duplicated-definitions.patch
@@ -0,0 +1,60 @@
+Index: phonon/platform_kde/kdeplatformplugin.cpp
+===================================================================
+--- phonon/platform_kde/kdeplatformplugin.cpp	(revision 1191216)
++++ phonon/platform_kde/kdeplatformplugin.cpp	(revision 1197039)
+@@ -43,9 +43,11 @@
+ 
+ typedef QPair<QByteArray, QString> PhononDeviceAccess;
+ typedef QList<PhononDeviceAccess> PhononDeviceAccessList;
++#if (PHONON_VERSION < PHONON_VERSION_CHECK(4, 4, 3))
+ #ifndef KDE_USE_FINAL
+ Q_DECLARE_METATYPE(PhononDeviceAccessList)
+ #endif
++#endif
+ namespace Phonon
+ {
+ 
+Index: phonon/platform_kde/devicelisting.cpp
+===================================================================
+--- phonon/platform_kde/devicelisting.cpp	(revision 1191216)
++++ phonon/platform_kde/devicelisting.cpp	(revision 1197039)
+@@ -28,6 +28,7 @@
+ #include <kdebug.h>
+ #include <klocale.h>
+ #include <ksharedconfig.h>
++#include <phonon/phononnamespace.h>
+ 
+ #include <../config-alsa.h>
+ #ifdef HAVE_ALSA_ASOUNDLIB_H
+@@ -35,7 +36,9 @@
+ #endif // HAVE_ALSA_ASOUNDLIB_H
+ 
+ typedef QList<QPair<QByteArray, QString> > PhononDeviceAccessList;
++#if (PHONON_VERSION < PHONON_VERSION_CHECK(4, 4, 3))
+ Q_DECLARE_METATYPE(PhononDeviceAccessList)
++#endif
+ 
+ static void installAlsaPhononDeviceHandle()
+ {
+Index: phonon/kded-module/phononserver.cpp
+===================================================================
+--- phonon/kded-module/phononserver.cpp	(revision 1191216)
++++ phonon/kded-module/phononserver.cpp	(revision 1197039)
+@@ -44,6 +44,7 @@
+ #include <Solid/GenericInterface>
+ #include <Solid/Device>
+ #include <Solid/DeviceNotifier>
++#include <phonon/phononnamespace.h>
+ 
+ #include <../config-alsa.h>
+ #ifdef HAVE_LIBASOUND2
+@@ -56,7 +57,9 @@
+ K_EXPORT_PLUGIN(PhononServerFactory("phononserver"))
+ 
+ typedef QList<QPair<QByteArray, QString> > PhononDeviceAccessList;
++#if (PHONON_VERSION < PHONON_VERSION_CHECK(4, 4, 3))
+ Q_DECLARE_METATYPE(PhononDeviceAccessList)
++#endif
+ 
+ PhononServer::PhononServer(QObject *parent, const QList<QVariant> &)
+     : KDEDModule(parent),
diff --git a/kde-base/phonon-kde/phonon-kde-4.4.5.ebuild b/kde-base/phonon-kde/phonon-kde-4.4.5.ebuild
index 3a7f16ee4d09..33bc1ea44b41 100644
--- a/kde-base/phonon-kde/phonon-kde-4.4.5.ebuild
+++ b/kde-base/phonon-kde/phonon-kde-4.4.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/phonon-kde/phonon-kde-4.4.5.ebuild,v 1.7 2010/11/28 02:24:59 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/phonon-kde/phonon-kde-4.4.5.ebuild,v 1.8 2010/11/28 18:12:32 reavertm Exp $
 
 EAPI="3"
 
@@ -21,6 +21,10 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-4.5.3-duplicated-definitions.patch"
+)
+
 src_configure() {
 	mycmakeargs=(
 		-DBUILD_tests=OFF
diff --git a/kde-base/phonon-kde/phonon-kde-4.5.3.ebuild b/kde-base/phonon-kde/phonon-kde-4.5.3.ebuild
index 1b3ee4e55079..f0f49f4d0b28 100644
--- a/kde-base/phonon-kde/phonon-kde-4.5.3.ebuild
+++ b/kde-base/phonon-kde/phonon-kde-4.5.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/phonon-kde/phonon-kde-4.5.3.ebuild,v 1.4 2010/11/28 02:24:59 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/phonon-kde/phonon-kde-4.5.3.ebuild,v 1.5 2010/11/28 18:12:32 reavertm Exp $
 
 EAPI="3"
 
@@ -21,6 +21,10 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}/${P}-duplicated-definitions.patch"
+)
+
 src_configure() {
 	mycmakeargs=(
 		-DBUILD_tests=OFF