← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/kdebindings/oneiric

« back to all changes in this revision

Viewing changes to debian/patches/smokegen_phonon.diff

  • Committer: Package Import Robot
  • Author(s): Felix Geyer, Tarun Kumar Mall, Philip Muškovac, Felix Geyer
  • Date: 2011-05-31 19:04:11 UTC
  • mfrom: (1.1.47 upstream)
  • Revision ID: package-import@ubuntu.com-20110531190411-z6nkrbfcveh78cbj
Tags: 4:4.6.3-0ubuntu1
[ Tarun Kumar Mall ]
* New upstream release
* Update kde-sc-dev-latest version

[ Philip Muškovac ]
* Make Vcs links point to the right place
* Refresh fix-pykdeuic4.patch

[ Felix Geyer ]
* Add smokegen_phonon.diff from Debian to fix FTBFS.
* Don't hardcode the python version, change pulled from Debian.
* Drop libqyotoshared2 package, the library has been merged into libqyoto.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/smokegen_phonon.diff
 
1
Author: Pino Toscano <pino@kde.org>
 
2
Description: Fix compilation with newer Phonon.
 
3
 This includes two patches committed upstream, slightly adapted to support old
 
4
 smokegen (which does not define __SMOKEGEN_RUN__ when running).
 
5
Forwarded: not-needed
 
6
Origin: vendor
 
7
Last-Update: 2011-05-09
 
8
 
 
9
--- a/smoke/qt/phonon/phonon_includes.h
 
10
+++ b/smoke/qt/phonon/phonon_includes.h
 
11
@@ -1,6 +1,7 @@
 
12
 #ifdef __SMOKEGEN_RUN__
 
13
 #  define PHONON_EXPORT
 
14
 #  define PHONON_DEPRECATED
 
15
+#  define PHONON_EXPORT_DEPRECATED
 
16
 #endif
 
17
 
 
18
 #include <phonon/abstractaudiooutput.h>