| 1 |
reavertm 10/11/28 18:12:32 |
| 2 |
|
| 3 |
Added: phonon-kde-4.5.3-duplicated-definitions.patch |
| 4 |
Log: |
| 5 |
Backport small patch from 4.5 branch to fix phonon-4.4.3 compatibility, bug 346951. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha6/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 kde-base/phonon-kde/files/phonon-kde-4.5.3-duplicated-definitions.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/phonon-kde/files/phonon-kde-4.5.3-duplicated-definitions.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/phonon-kde/files/phonon-kde-4.5.3-duplicated-definitions.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: phonon-kde-4.5.3-duplicated-definitions.patch |
| 16 |
=================================================================== |
| 17 |
Index: phonon/platform_kde/kdeplatformplugin.cpp |
| 18 |
=================================================================== |
| 19 |
--- phonon/platform_kde/kdeplatformplugin.cpp (revision 1191216) |
| 20 |
+++ phonon/platform_kde/kdeplatformplugin.cpp (revision 1197039) |
| 21 |
@@ -43,9 +43,11 @@ |
| 22 |
|
| 23 |
typedef QPair<QByteArray, QString> PhononDeviceAccess; |
| 24 |
typedef QList<PhononDeviceAccess> PhononDeviceAccessList; |
| 25 |
+#if (PHONON_VERSION < PHONON_VERSION_CHECK(4, 4, 3)) |
| 26 |
#ifndef KDE_USE_FINAL |
| 27 |
Q_DECLARE_METATYPE(PhononDeviceAccessList) |
| 28 |
#endif |
| 29 |
+#endif |
| 30 |
namespace Phonon |
| 31 |
{ |
| 32 |
|
| 33 |
Index: phonon/platform_kde/devicelisting.cpp |
| 34 |
=================================================================== |
| 35 |
--- phonon/platform_kde/devicelisting.cpp (revision 1191216) |
| 36 |
+++ phonon/platform_kde/devicelisting.cpp (revision 1197039) |
| 37 |
@@ -28,6 +28,7 @@ |
| 38 |
#include <kdebug.h> |
| 39 |
#include <klocale.h> |
| 40 |
#include <ksharedconfig.h> |
| 41 |
+#include <phonon/phononnamespace.h> |
| 42 |
|
| 43 |
#include <../config-alsa.h> |
| 44 |
#ifdef HAVE_ALSA_ASOUNDLIB_H |
| 45 |
@@ -35,7 +36,9 @@ |
| 46 |
#endif // HAVE_ALSA_ASOUNDLIB_H |
| 47 |
|
| 48 |
typedef QList<QPair<QByteArray, QString> > PhononDeviceAccessList; |
| 49 |
+#if (PHONON_VERSION < PHONON_VERSION_CHECK(4, 4, 3)) |
| 50 |
Q_DECLARE_METATYPE(PhononDeviceAccessList) |
| 51 |
+#endif |
| 52 |
|
| 53 |
static void installAlsaPhononDeviceHandle() |
| 54 |
{ |
| 55 |
Index: phonon/kded-module/phononserver.cpp |
| 56 |
=================================================================== |
| 57 |
--- phonon/kded-module/phononserver.cpp (revision 1191216) |
| 58 |
+++ phonon/kded-module/phononserver.cpp (revision 1197039) |
| 59 |
@@ -44,6 +44,7 @@ |
| 60 |
#include <Solid/GenericInterface> |
| 61 |
#include <Solid/Device> |
| 62 |
#include <Solid/DeviceNotifier> |
| 63 |
+#include <phonon/phononnamespace.h> |
| 64 |
|
| 65 |
#include <../config-alsa.h> |
| 66 |
#ifdef HAVE_LIBASOUND2 |
| 67 |
@@ -56,7 +57,9 @@ |
| 68 |
K_EXPORT_PLUGIN(PhononServerFactory("phononserver")) |
| 69 |
|
| 70 |
typedef QList<QPair<QByteArray, QString> > PhononDeviceAccessList; |
| 71 |
+#if (PHONON_VERSION < PHONON_VERSION_CHECK(4, 4, 3)) |
| 72 |
Q_DECLARE_METATYPE(PhononDeviceAccessList) |
| 73 |
+#endif |
| 74 |
|
| 75 |
PhononServer::PhononServer(QObject *parent, const QList<QVariant> &) |
| 76 |
: KDEDModule(parent), |
Archives