~ubuntu-branches/ubuntu/lucid/ktorrent/lucid

« back to all changes in this revision

Viewing changes to debian/patches/kubuntu_02_qt_phonon.diff

  • Committer: Bazaar Package Importer
  • Author(s): Roderick B. Greening
  • Date: 2009-05-24 21:24:15 UTC
  • Revision ID: james.westby@ubuntu.com-20090524212415-grrcfmu4g4g5ugbx
Tags: 3.2.1+dfsg.1-0ubuntu4
* Update build-deps for libqt4-phonon-dev 
* Patch plugins to support new phonon

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
--- ktorrent-3.2.1+dfsg.1/plugins/mediaplayer/videowidget.cpp   2009-04-06 05:02:11.000000000 -0230
 
2
+++ ktorrent-3.2.1+dfsg.1/plugins/mediaplayer/videowidget.cpp.new       2009-05-25 05:24:39.244344257 -0230
 
3
@@ -28,7 +28,7 @@
 
4
 #include <KToggleFullScreenAction>
 
5
 #include <Phonon/Path>
 
6
 #include <Phonon/AudioOutput>
 
7
-#include <Phonon/Global>
 
8
+#include <Phonon/phononnamespace.h>
 
9
 #include <Phonon/SeekSlider>
 
10
 #include <Phonon/VolumeSlider>
 
11
 #include "videowidget.h"
 
12
--- ktorrent-3.2.1+dfsg.1/plugins/mediaplayer/mediaplayer.cpp   2009-04-06 05:02:11.000000000 -0230
 
13
+++ ktorrent-3.2.1+dfsg.1/plugins/mediaplayer/mediaplayer.cpp.new       2009-05-25 05:26:04.189343723 -0230
 
14
@@ -21,7 +21,7 @@
 
15
 
 
16
 #include <Phonon/Path>
 
17
 #include <Phonon/AudioOutput>
 
18
-#include <Phonon/Global>
 
19
+#include <Phonon/phononnamespace.h>
 
20
 
 
21
 #include <util/log.h>
 
22
 #include "mediaplayer.h"