[arch-commits] Commit in kdebase-runtime/trunk (PKGBUILD phonon4.4.3.patch)

[Andrea Scarpino]

    Date: Monday, November 29, 2010 @ 08:43:55
  Author: andrea
Revision: 101556

KDE 4.5.4

Added:
  kdebase-runtime/trunk/phonon4.4.3.patch
Modified:
  kdebase-runtime/trunk/PKGBUILD

-------------------+
 PKGBUILD          |   13 ++++--
 phonon4.4.3.patch |  100 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 109 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-11-29 13:43:50 UTC (rev 101555)
+++ PKGBUILD	2010-11-29 13:43:55 UTC (rev 101556)
@@ -3,7 +3,7 @@
 # Contributor: Pierre Schmitz <pierre at archlinux.de>
 
 pkgname=kdebase-runtime
-pkgver=4.5.3
+pkgver=4.5.4
 pkgrel=1
 pkgdesc="KDE Base Runtime Environment"
 arch=('i686' 'x86_64')
@@ -16,11 +16,16 @@
 optdepends=('htdig: to build the search index'
             'gdb: drkonq crash handler')
 install="${pkgname}.install"
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('bef1ec6514d5e192a63fde30932e7559d0f0181c')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
+        'phonon4.4.3.patch')
+sha1sums=('120289753a6c0e3c9611ab21da0157abf0e6e351'
+          '31658a8116553847d5654044fc4286adfd821f95')
 
 build() {
-	cd ${srcdir}
+	cd ${srcdir}/${pkgname}-${pkgver}
+    patch -Np0 -i ${srcdir}/phonon4.4.3.patch
+
+    cd ${srcdir}
 	mkdir build
 	cd build
 	cmake ../${pkgname}-${pkgver} \

Added: phonon4.4.3.patch
===================================================================
--- phonon4.4.3.patch	                        (rev 0)
+++ phonon4.4.3.patch	2010-11-29 13:43:55 UTC (rev 101556)
@@ -0,0 +1,100 @@
+Index: phonon/platform_kde/kdeplatformplugin.cpp
+===================================================================
+--- phonon/platform_kde/kdeplatformplugin.cpp	(revision 1196218)
++++ phonon/platform_kde/kdeplatformplugin.cpp	(revision 1196219)
+@@ -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 1196218)
++++ phonon/platform_kde/devicelisting.cpp	(revision 1196219)
+@@ -19,6 +19,7 @@
+ */
+ 
+ #include "devicelisting.h"
++#include "phononnamespace.h"
+ 
+ #include <QtCore/QFile>
+ #include <QtDBus/QDBusReply>
+@@ -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 1196218)
++++ phonon/kded-module/phononserver.cpp	(revision 1196219)
+@@ -18,6 +18,7 @@
+ 
+ */
+ 
++#include "phononnamespace.h"
+ #include "phononserver.h"
+ #include "audiodevice.h"
+ 
+@@ -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),
+Index: phonon/platform_kde/devicelisting.cpp
+===================================================================
+--- phonon/platform_kde/devicelisting.cpp	(revision 1197038)
++++ phonon/platform_kde/devicelisting.cpp	(revision 1197039)
+@@ -19,7 +19,6 @@
+ */
+ 
+ #include "devicelisting.h"
+-#include "phononnamespace.h"
+ 
+ #include <QtCore/QFile>
+ #include <QtDBus/QDBusReply>
+@@ -29,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
+Index: phonon/kded-module/phononserver.cpp
+===================================================================
+--- phonon/kded-module/phononserver.cpp	(revision 1197038)
++++ phonon/kded-module/phononserver.cpp	(revision 1197039)
+@@ -18,7 +18,6 @@
+ 
+ */
+ 
+-#include "phononnamespace.h"
+ #include "phononserver.h"
+ #include "audiodevice.h"
+ 
+@@ -45,6 +44,7 @@
+ #include <Solid/GenericInterface>
+ #include <Solid/Device>
+ #include <Solid/DeviceNotifier>
++#include <phonon/phononnamespace.h>
+ 
+ #include <../config-alsa.h>
+ #ifdef HAVE_LIBASOUND2