rpms/kdebindings/devel kdebindings-4.3.80-fix-build.patch,1.5,1.6

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/kdebindings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6184/devel

Modified Files:
	kdebindings-4.3.80-fix-build.patch 
Log Message:
Remove more of the new stuff which doesn't build due to the AWOL abstractaudiooutput.sip file.

kdebindings-4.3.80-fix-build.patch:
 python/pykde4/sip/akonadi/agentfilterproxymodel.sip |    6 ------
 python/pykde4/sip/akonadi/preprocessorbase.sip      |    6 ------
 python/pykde4/sip/phonon/medianode.sip              |   10 +---------
 python/pykde4/sip/phonon/phononmod.sip              |    3 ---
 smoke/nepomuk/smokeconfig.xml                       |    1 +
 5 files changed, 2 insertions(+), 24 deletions(-)

Index: kdebindings-4.3.80-fix-build.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings-4.3.80-fix-build.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- kdebindings-4.3.80-fix-build.patch	12 Dec 2009 03:33:41 -0000	1.5
+++ kdebindings-4.3.80-fix-build.patch	12 Dec 2009 04:12:12 -0000	1.6
@@ -58,6 +58,34 @@ diff -ur kdebindings-4.3.80/python/pykde
      else if (dynamic_cast<Akonadi::StatisticsProxyModel*>(sipCpp))
          sipClass = sipClass_Akonadi_StatisticsProxyModel;
      else if (dynamic_cast<Akonadi::ItemModel*>(sipCpp))
+diff -ur kdebindings-4.3.80/python/pykde4/sip/phonon/medianode.sip kdebindings-4.3.80-fix-build/python/pykde4/sip/phonon/medianode.sip
+--- kdebindings-4.3.80/python/pykde4/sip/phonon/medianode.sip	2009-11-21 10:43:24.000000000 +0100
++++ kdebindings-4.3.80-fix-build/python/pykde4/sip/phonon/medianode.sip	2009-12-12 05:11:05.000000000 +0100
+@@ -41,13 +41,7 @@
+     // CTSCC for subclasses of 'MediaNode'
+     sipType = NULL;
+ 
+-    if (dynamic_cast<Phonon::AbstractAudioOutput*>(sipCpp))
+-        {
+-        sipType = sipType_Phonon_AbstractAudioOutput;
+-        if (dynamic_cast<Phonon::AudioDataOutput*>(sipCpp))
+-            sipType = sipType_Phonon_AudioDataOutput;
+-        }
+-    else if (dynamic_cast<Phonon::AbstractVideoOutput*>(sipCpp))
++    if (dynamic_cast<Phonon::AbstractVideoOutput*>(sipCpp))
+         sipType = sipType_Phonon_AbstractVideoOutput;
+     else if (dynamic_cast<Phonon::Effect*>(sipCpp))
+         {
+@@ -67,9 +61,7 @@
+ 
+ %ModuleHeaderCode
+ //ctscc
+-#include <phonon/abstractaudiooutput.h>
+ #include <phonon/abstractvideooutput.h>
+-#include <phonon/audiodataoutput.h>
+ #include <phonon/effect.h>
+ #include <phonon/medianode.h>
+ #include <phonon/mediaobject.h>
 diff -ur kdebindings-4.3.80/python/pykde4/sip/phonon/phononmod.sip kdebindings-4.3.80-fix-build/python/pykde4/sip/phonon/phononmod.sip
 --- kdebindings-4.3.80/python/pykde4/sip/phonon/phononmod.sip	2009-11-21 10:43:24.000000000 +0100
 +++ kdebindings-4.3.80-fix-build/python/pykde4/sip/phonon/phononmod.sip	2009-12-12 04:28:58.000000000 +0100