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

Package-Manager: portage-2.2.0_alpha6/cvs/Linux x86_64

5 files changed, 81 insertions, 6 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/Manifest b/kde-base/phonon-kde/Manifest
index 84ba40161113..b42a0e8bfb08 100644
--- a/kde-base/phonon-kde/Manifest
+++ b/kde-base/phonon-kde/Manifest
@@ -1,6 +1,7 @@
+AUX phonon-kde-4.5.3-duplicated-definitions.patch 2021 RMD160 b01b95adbe71b70c594b5b3a80df9c7254bd06bd SHA1 be85d073a6a1748e42eacbc446e82f1c18982406 SHA256 ea55014d4429c0b337b800cb846426abc3b702f55c2b90fed8f7cbe404a19947
 DIST kdebase-runtime-4.4.5.tar.bz2 7332344 RMD160 4cc49e993e05adf4dfb4c5d4acdf992b5efbc114 SHA1 93c58fbef37cdf0c9c6b37c773f8cde054fae51f SHA256 3d3be43d2f53b40dea7fc566f1f5b07b30fcc6b4c69ad77c1e1be13637781428
 DIST kdebase-runtime-4.5.3.tar.bz2 5763543 RMD160 adcbe77cdb40183d53da5d747e4f9487f624ff36 SHA1 bef1ec6514d5e192a63fde30932e7559d0f0181c SHA256 fd07c60dba853dd0039b7dde427a9d8b6783c7a54edfbd393324f05d28ed10b9
-EBUILD phonon-kde-4.4.5.ebuild 718 RMD160 cae7dc2bf8a5bcbff4fda24afd5041555d0d50f3 SHA1 22f8d485ab6cc43112e94f30be37efa98342cf8c SHA256 d7cc080baf8e792873bfd3f33e24c821f4e20155bc6c21bb1139e7670744a520
-EBUILD phonon-kde-4.5.3.ebuild 720 RMD160 3137e867145a61c3098069210d61f5bae334e315 SHA1 b3f149e2b1fbee21c5be5c546f07155076479b38 SHA256 0584f73ec64cfd25db2e9afeac3a46cc19f3474f37de6c0bcdc9165fd0c0caf9
-MISC ChangeLog 8818 RMD160 ea9c6875c77d1077a3bac17669277c1c65206a59 SHA1 43c48f0ba69c13adad69d9a35f71ba686e7aa6a5 SHA256 c032b2439d1ddee395761e3dc783e3c37b0dac936caa945eb4c96e92a6c1f2a0
+EBUILD phonon-kde-4.4.5.ebuild 787 RMD160 a6b474450597a3baeee69b2e1c11da7ac55c64a8 SHA1 ab9036ec8193552098e63dc087a3239d7d654681 SHA256 497e2e14520ac7dc0a0d255af3d7d75a533f980585bd92c02dcad2df67c21ae2
+EBUILD phonon-kde-4.5.3.ebuild 782 RMD160 90ee375bfeba617cc8d52439076184e6586be63e SHA1 b775ca1b0041939c3ef6c89cc88cba88eb48aab8 SHA256 287266b93668d243bf86799a3ef1381400015f525b5c9979388390e08367e342
+MISC ChangeLog 9069 RMD160 7fa1697b090256735049d12a2f7c7f4d3f663d8f SHA1 abc113f6491691147f6a613cc950a7381a51e96f SHA256 3183bf1b877972c0e7e72ad55d2db9e447f6a300133c97d6947badea1844453b
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
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