summaryrefslogtreecommitdiff
path: root/extra/phonon
diff options
context:
space:
mode:
authorNicolas Reynolds <fauno@kiwwwi.com.ar>2012-01-09 10:55:19 -0300
committerNicolas Reynolds <fauno@kiwwwi.com.ar>2012-01-09 10:55:19 -0300
commit149750d28420a7b59fab5501ab9aaca095f6fa46 (patch)
treeb263a29e10663635bb00dff7dde4c7c7ac8f30d7 /extra/phonon
parent1c0a9e2b2298f550629181080e63053fcb440743 (diff)
parent7a3611f5caa5e34c1f2b582640f97b733110ae63 (diff)
Lots of removed PKGBUILDs, kept mplayer2
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el Conflicts: community-testing/vdrift/PKGBUILD community/acpitool/PKGBUILD community/amaya/PKGBUILD community/apparix/PKGBUILD community/avant-window-navigator/PKGBUILD community/awn-extras-applets/PKGBUILD community/bmpanel/PKGBUILD community/clipgrab/PKGBUILD community/compizconfig-backend-kconfig4/PKGBUILD community/conkeror-git/PKGBUILD community/cross-arm-elf-binutils/PKGBUILD community/cross-arm-elf-gcc-base/PKGBUILD community/cross-arm-wince-cegcc-binutils/PKGBUILD community/cross-arm-wince-cegcc-cegccdll-dummy/PKGBUILD community/cross-arm-wince-cegcc-cegccdll/PKGBUILD community/cross-arm-wince-cegcc-cegccthrddll/PKGBUILD community/cross-arm-wince-cegcc-gcc-base/PKGBUILD community/cross-arm-wince-cegcc-gcc/PKGBUILD community/cross-arm-wince-cegcc-libstdcppdll/PKGBUILD community/cross-arm-wince-cegcc-newlib/PKGBUILD community/cross-arm-wince-cegcc-profile/PKGBUILD community/cross-arm-wince-cegcc-w32api/PKGBUILD community/dar/PKGBUILD community/driftnet/PKGBUILD community/duff/PKGBUILD community/dvdstyler/PKGBUILD community/eiciel/PKGBUILD community/emesene/PKGBUILD community/eterm/PKGBUILD community/extrema/PKGBUILD community/fail2ban/PKGBUILD community/fgetty/PKGBUILD community/fio/PKGBUILD community/flvstreamer/PKGBUILD community/fotoxx/PKGBUILD community/ghdl/PKGBUILD community/gnofract4d/PKGBUILD community/gnome-do/PKGBUILD community/grass/PKGBUILD community/gri/PKGBUILD community/gromacs/PKGBUILD community/gtk-gnutella/PKGBUILD community/gtk-rezlooks-engine/PKGBUILD community/handbrake/PKGBUILD community/jogl/PKGBUILD community/kydpdict/PKGBUILD community/libast/PKGBUILD community/libcgi/PKGBUILD community/libxnvctrl/PKGBUILD community/mhwaveedit/PKGBUILD community/microblog-purple/PKGBUILD community/mms_client/PKGBUILD community/mplayer2/PKGBUILD community/multiget/PKGBUILD community/multimux/PKGBUILD community/musescore/PKGBUILD community/mysql-ruby/PKGBUILD community/mysql-workbench/PKGBUILD community/nas/PKGBUILD community/ocaml-extlib/PKGBUILD community/ocaml-ounit/PKGBUILD community/paraview/fix-boost-graph-api-changes.diff community/pcb/PKGBUILD community/pdftrans/PKGBUILD community/python-daap/PKGBUILD community/python2-cheetah/PKGBUILD community/qdevelop/PKGBUILD community/qtoctave/PKGBUILD community/rep-gtk/PKGBUILD community/sauerbraten/PKGBUILD community/sawfish/PKGBUILD community/scilab/PKGBUILD community/superswitcher/PKGBUILD community/tagtool/PKGBUILD community/tora/PKGBUILD community/wml/PKGBUILD community/wxsvg/PKGBUILD community/xskat/PKGBUILD core/eglibc/glibc.install core/eglibc/locale-gen core/eglibc/locale.gen.txt core/eglibc/nscd core/syslog-ng/PKGBUILD extra/blender/PKGBUILD extra/cups/PKGBUILD extra/hplip/PKGBUILD extra/kile/PKGBUILD extra/monodevelop-debugger-mdb/PKGBUILD extra/perl-ev/PKGBUILD multilib/lib32-qt/PKGBUILD testing/kaffeine/kaffeine.install testing/kdebase-runtime/PKGBUILD testing/kdebase-runtime/kdebase-runtime.install testing/kdebase-runtime/libqzeitgeist08.patch testing/libdrm/PKGBUILD testing/libdrm/no-pthread-stubs.patch
Diffstat (limited to 'extra/phonon')
-rw-r--r--extra/phonon/libqzeitgeist08.patch150
1 files changed, 0 insertions, 150 deletions
diff --git a/extra/phonon/libqzeitgeist08.patch b/extra/phonon/libqzeitgeist08.patch
deleted file mode 100644
index 7a99101c4..000000000
--- a/extra/phonon/libqzeitgeist08.patch
+++ /dev/null
@@ -1,150 +0,0 @@
---- 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})