phonon correction deps

3 files changed, 157 insertions, 4 deletions

diff --git a/extra/phonon/.md5sum.x86_64 b/extra/phonon/.md5sum.x86_64
index 19e59e221..6fd234d98 100644
--- a/extra/phonon/.md5sum.x86_64
+++ b/extra/phonon/.md5sum.x86_64
@@ -1,3 +1,4 @@
 44c0339046c343835df64d9cbc2c26d5  FindPulseAudio.cmake
+e5c997f39d618d36ced0c857e63c8f83  libqzeitgeist08.patch
 3df071b7f9996afcd67b18958955ecdd  phonon-4.5.1.tar.xz
 40aba68801b58fc5e17fc96446ad777a  pulsestream.cpp
diff --git a/extra/phonon/Pkgfile b/extra/phonon/Pkgfile
index 595a9fe97..79e2e8330 100644
--- a/extra/phonon/Pkgfile
+++ b/extra/phonon/Pkgfile
@@ -2,18 +2,20 @@
 # URL: http://phonon.kde.org
 # Maintainer: NuTyX core team
 # Packager: thierryn1 at hispeed dot ch
-# Depends on: qt, xine-lib, cmake, gst-plugins-base, automoc4,sip
-# Run on: qt,xine-lib,gst-plugins-base,sip
+# Depends on: qt, xine-lib, cmake, gst-plugins-base, automoc4,sip,libqzeitgeist
+# Run on: qt,xine-lib,gst-plugins-base,sip,libqzeitgeist
 
 name=phonon
 version=4.5.1
-release=1
+release=2
 source=(ftp://ftp.kde.org/pub/kde/stable/phonon/$version/src//$name-$version.tar.xz
 	FindPulseAudio.cmake
-	pulsestream.cpp)
+	pulsestream.cpp
+	libqzeitgeist08.patch)
 
 build() {
 	cd $name-$version
+	patch -Np1 -i ../libqzeitgeist08.patch
 	cp -f ../FindPulseAudio.cmake cmake/
 	cp -f ../pulsestream.cpp phonon/
 	cd ..
diff --git a/extra/phonon/libqzeitgeist08.patch b/extra/phonon/libqzeitgeist08.patch
new file mode 100644
index 000000000..4d0d6326b
--- /dev/null
+++ b/extra/phonon/libqzeitgeist08.patch
@@ -0,0 +1,150 @@
+--- phonon-4.5.1/phonon/mediaobject.cpp~	2011-10-29 13:04:16.499027830 +0000
++++ phonon-4.5.1/phonon/mediaobject.cpp	2011-10-29 13:09:49.222080364 +0000
+@@ -38,12 +38,12 @@
+ #include <QtCore/QUrl>
+
+ #ifdef HAVE_QZEITGEIST
+-#include <QtZeitgeist/DataModel/Event>
+-#include <QtZeitgeist/Interpretation>
+-#include <QtZeitgeist/Log>
+-#include <QtZeitgeist/Manifestation>
+-#include <QtZeitgeist/QtZeitgeist>
+-#endif
++#include <QZeitgeist/DataModel/Event>
++#include <QZeitgeist/Interpretation>
++#include <QZeitgeist/Log>
++#include <QZeitgeist/Manifestation>
++#include <QZeitgeist/QZeitgeist>
++#endif
+
+ #include "phononnamespace_p.h"
+ #include "platform_p.h"
+@@ -330,7 +330,7 @@
+                                          const QString &subject_mimetype)
+ {
+ #ifdef HAVE_QZEITGEIST
+-    QtZeitgeist::DataModel::Subject subject;
++    QZeitgeist::DataModel::Subject subject;
+     QString url = subject_uri.toString();
+     QString path = url.left(url.lastIndexOf(QLatin1Char('/')));
+     subject.setUri(url);
+@@ -340,20 +340,20 @@
+     subject.setOrigin(path);
+     subject.setMimeType(subject_mimetype);
+
+-    QtZeitgeist::DataModel::SubjectList subjects;
++    QZeitgeist::DataModel::SubjectList subjects;
+     subjects << subject;
+
+-    QtZeitgeist::DataModel::Event event;
++    QZeitgeist::DataModel::Event event;
+     event.setTimestamp(subject_timestamp);
+     event.setInterpretation(event_interpretation);
+     event.setManifestation(event_manifestation);
+     event.setActor(event_actor);
+     event.setSubjects(subjects);
+
+-    QtZeitgeist::DataModel::EventList events;
++    QZeitgeist::DataModel::EventList events;
+     events << event;
+
+-    QDBusPendingReply<QtZeitgeist::DataModel::EventIdList> reply =
++    QDBusPendingReply<QZeitgeist::DataModel::EventIdList> reply =
+         log->insertEvents(events);
+ #else
+     Q_UNUSED(event_interpretation)
+@@ -377,11 +377,11 @@
+         QString eventInterpretation;
+         switch (eventState) {
+         case PlayingState:
+-            eventInterpretation = QtZeitgeist::Interpretation::Event::ZGAccessEvent;
++            eventInterpretation = QZeitgeist::Interpretation::Event::ZGAccessEvent;
+             break;
+         case ErrorState:
+         case StoppedState:
+-            eventInterpretation = QtZeitgeist::Interpretation::Event::ZGLeaveEvent;
++            eventInterpretation = QZeitgeist::Interpretation::Event::ZGLeaveEvent;
+             break;
+         //These states are not signifigant events.
+         case LoadingState:
+@@ -409,10 +409,10 @@
+         QString mime;
+         QString subjectInterpretation;
+         if (q->hasVideo()) {
+-            subjectInterpretation = QtZeitgeist::Interpretation::Subject::NFOVideo;
++            subjectInterpretation = QZeitgeist::Interpretation::Subject::NFOVideo;
+             mime = "video/raw";
+         } else {
+-            subjectInterpretation = QtZeitgeist::Interpretation::Subject::NFOAudio;
++            subjectInterpretation = QZeitgeist::Interpretation::Subject::NFOAudio;
+             mime = "audio/raw";
+         }
+         pDebug() << "Zeitgeist mime type:" << mime;
+@@ -425,20 +425,20 @@
+         case MediaSource::Invalid:
+             return;
+         case MediaSource::Url:
+-            subjectType = QtZeitgeist::Manifestation::Subject::NFORemoteDataObject;
++            subjectType = QZeitgeist::Manifestation::Subject::NFORemoteDataObject;
+             break;
+         case MediaSource::CaptureDevice:
+         case MediaSource::Disc:
+         case MediaSource::Stream:
+-            subjectType = QtZeitgeist::Manifestation::Subject::NFOMediaStream;
++            subjectType = QZeitgeist::Manifestation::Subject::NFOMediaStream;
+             break;
+         case MediaSource::LocalFile:
+-            subjectType = QtZeitgeist::Manifestation::Subject::NFOFileDataObject;
++            subjectType = QZeitgeist::Manifestation::Subject::NFOFileDataObject;
+             break;
+         }
+
+         sendToZeitgeist(eventInterpretation,
+-                        QtZeitgeist::Manifestation::Event::ZGUserActivity,
++                        QZeitgeist::Manifestation::Event::ZGUserActivity,
+                         QLatin1Literal("app://" ) % Platform::applicationName() % QLatin1Literal(".desktop"),
+                         QDateTime::currentDateTime(),
+                         mediaSource.url(),
+--- phonon-4.5.1/phonon/mediaobject_p.h~	2011-10-29 13:04:34.982530678 +0000
++++ phonon-4.5.1/phonon/mediaobject_p.h	2011-10-29 15:27:44.679123431 +0000
+@@ -30,8 +30,8 @@
+ #include "mediasource.h"
+ #include <QtCore/QQueue>
+ #ifdef HAVE_QZEITGEIST
+-#include <QtZeitgeist/Log>
+-#include <QtZeitgeist/QtZeitgeist>
++#include <QZeitgeist/Log>
++#include <QZeitgeist/QZeitgeist>
+ #endif
+
+ QT_BEGIN_NAMESPACE
+@@ -114,8 +114,7 @@
+ #endif //QT_NO_PHONON_ABSTRACTMEDIASTREAM
+         {
+ #ifdef HAVE_QZEITGEIST
+-            QtZeitgeist::init();
+-            log = new QtZeitgeist::Log(qObject());
++            log = new QZeitgeist::Log(qObject());
+ #endif
+         }
+
+@@ -142,7 +141,7 @@
+         MediaSource mediaSource;
+         QQueue<MediaSource> sourceQueue;
+ #ifdef HAVE_QZEITGEIST
+-        QtZeitgeist::Log *log;
++        QZeitgeist::Log *log;
+ #endif
+ };
+ }
+--- phonon-4.5.1/phonon/CMakeLists.txt~	2011-10-29 15:30:07.640468718 +0000
++++ phonon-4.5.1/phonon/CMakeLists.txt	2011-10-29 15:30:26.643980831 +0000
+@@ -21,7 +21,7 @@
+ endif(GLIB2_FOUND AND PULSEAUDIO_FOUND)
+
+ macro_optional_find_package(QZeitgeist)
+-macro_log_feature(QZEITGEIST_FOUND "QtZeitgeist" "Qt bindings for Zeitgeist" "http://gitorious.org/kde-zeitgeist/libqzeitgeist/" FALSE)
++macro_log_feature(QZEITGEIST_FOUND "QZeitgeist" "Qt bindings for Zeitgeist" "http://gitorious.org/kde-zeitgeist/libqzeitgeist/" FALSE)
+ if (QZEITGEIST_FOUND)
+     add_definitions(-DHAVE_QZEITGEIST)
+     include_directories(${QZEITGEIST_INCLUDE_DIR})