From b60041e2af11b9dcbd854f9dbf75d6ab88dfc1b8 Mon Sep 17 00:00:00 2001
From: Jonathan Callen <abcd@gentoo.org>
Date: Mon, 12 Dec 2011 01:31:22 +0000
Subject: rm old files

(Portage version: 2.2.0_alpha80/cvs/Linux x86_64)
---
 kde-base/phonon-kde/ChangeLog                      |  6 ++-
 .../phonon-kde-4.5.3-duplicated-definitions.patch  | 60 ----------------------
 2 files changed, 5 insertions(+), 61 deletions(-)
 delete mode 100644 kde-base/phonon-kde/files/phonon-kde-4.5.3-duplicated-definitions.patch

(limited to 'kde-base/phonon-kde')

diff --git a/kde-base/phonon-kde/ChangeLog b/kde-base/phonon-kde/ChangeLog
index e35fe220252b..83cd1940010a 100644
--- a/kde-base/phonon-kde/ChangeLog
+++ b/kde-base/phonon-kde/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/phonon-kde
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/phonon-kde/ChangeLog,v 1.102 2011/12/11 18:52:22 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/phonon-kde/ChangeLog,v 1.103 2011/12/12 01:31:22 abcd Exp $
+
+  12 Dec 2011; Jonathan Callen <abcd@gentoo.org>
+  -files/phonon-kde-4.5.3-duplicated-definitions.patch:
+  rm old files
 
 *phonon-kde-4.7.4 (11 Dec 2011)
 
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
deleted file mode 100644
index 716bd5e62987..000000000000
--- a/kde-base/phonon-kde/files/phonon-kde-4.5.3-duplicated-definitions.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-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),
-- 
cgit v1.2.3-65-gdbad