← Back to branch summary

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

« back to all changes in this revision

Viewing changes to debian/patches/debian/qt_4.5.2-1_phonon_ftbfs_fix.diff

  • Committer: Bazaar Package Importer
  • Author(s): Alessandro Ghersi
  • Date: 2009-12-08 19:17:41 UTC
  • mfrom: (1.2.1 upstream) (0.7.12 sid)
  • Revision ID: james.westby@ubuntu.com-20091208191741-lqlq0xvnlv8ki19u
Tags: 3.3.1+dfsg.1-1ubuntu1
* Merge with Debian Testing remaining changes:
  - Build-depend directly on libboost-serialization1.40-dev since
    libboost-serialization-dev from boost-defaults is not in Main
  - Add in rules: include /usr/lib/kubuntu-desktop-i18n/debhelper/kubuntu.mk
  - Don't use dpkg-source 3.0 format
  - Add quilt to build-depends

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/debian/qt_4.5.2-1_phonon_ftbfs_fix.diff
1
 
From: Modestas Vainius <modestas@vainius.eu>
2
 
Subject: [PATCH] debian/qt_4.5.2-1_phonon_ftbfs_fix
3
 
 
4
 
A workaround for FTBFS against broken Qt 4.5.2-1 phonon headers.
5
 
 
6
 
Signed-off-by: Modestas Vainius <modestas@vainius.eu>
7
 
 
8
 
---
9
 
 plugins/mediaplayer/videowidget.h |    2 +-
10
 
 1 files changed, 1 insertions(+), 1 deletions(-)
11
 
 
12
 
diff --git a/plugins/mediaplayer/videowidget.h b/plugins/mediaplayer/videowidget.h
13
 
index 157165e..2f228a3 100644
14
 
--- a/plugins/mediaplayer/videowidget.h
15
 
+++ b/plugins/mediaplayer/videowidget.h
16
 
@@ -22,7 +22,7 @@
17
 
 #define KTVIDEOWIDGET_H
18
 
 
19
 
 #include <QWidget>
20
 
-#include <Phonon/VideoWidget>
21
 
+#include <phonon/videowidget.h>
22
 
 #include <Phonon/MediaObject>
23
 
 #include <Phonon/SeekSlider>
24
 
 #include <Phonon/VolumeSlider>
25
 
tg: (69c25da..) debian/qt_4.5.2-1_phonon_ftbfs_fix (depends on: upstream)