rpms/kdebindings/devel kdebindings-4.0.84-python-phonon.patch, NONE, 1.1 kdebindings.spec, 1.121, 1.122

[Kevin Kofler (kkofler)]

Author: kkofler

Update of /cvs/pkgs/rpms/kdebindings/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16027/devel

Modified Files:
	kdebindings.spec 
Added Files:
	kdebindings-4.0.84-python-phonon.patch 
Log Message:
* Sat Jun 28 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.84-2
- fix Python bindings for Phonon

kdebindings-4.0.84-python-phonon.patch:

--- NEW FILE kdebindings-4.0.84-python-phonon.patch ---
diff -Nur kdebindings-4.0.84/python/pykde4/sip/phonon/abstractmediastream2.sip kdebindings-4.0.84-python-phonon/python/pykde4/sip/phonon/abstractmediastream2.sip
--- kdebindings-4.0.84/python/pykde4/sip/phonon/abstractmediastream2.sip	2008-06-25 09:53:34.000000000 +0200
+++ kdebindings-4.0.84-python-phonon/python/pykde4/sip/phonon/abstractmediastream2.sip	1970-01-01 01:00:00.000000000 +0100
@@ -1,42 +0,0 @@
-//
-//     Copyright 2008 Simon Edwards <simon at simonzone.com>
-
-//                 Generated by twine
-//            PyKDE4 module phonon  version KDE 4.1.0
-
-// This file is part of PyKDE4.
-
-// PyKDE4 is free software; you can redistribute it and/or modify
-// it under the terms of the GNU Lesser General Public License as
-// published by the Free Software Foundation; either version 2.1 of
-// the License, or (at your option) any later version.
-
-// PyKDE4 is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-namespace Phonon
-{
-
-class AbstractMediaStream2 : Phonon::AbstractMediaStream
-{
-%TypeHeaderCode
-#include <phonon/abstractmediastream2.h>
-%End
-
-protected:
-    explicit                AbstractMediaStream2 (QObject* parent /TransferThis/ = 0);
-    void                    resetDone ();
-    void                    seekStreamDone ();
-    virtual void            needData (quint32 size) = 0;
-    bool                    event (QEvent* e);
-//ig                        AbstractMediaStream2 (AbstractMediaStream2Private& dd, QObject* parent /TransferThis/);
-};   // AbstractMediaStream2
-
-};   // Phonon
-
-
diff -Nur kdebindings-4.0.84/python/pykde4/sip/phonon/phononmod.sip kdebindings-4.0.84-python-phonon/python/pykde4/sip/phonon/phononmod.sip
--- kdebindings-4.0.84/python/pykde4/sip/phonon/phononmod.sip	2008-06-25 09:53:34.000000000 +0200
+++ kdebindings-4.0.84-python-phonon/python/pykde4/sip/phonon/phononmod.sip	2008-06-28 05:07:08.000000000 +0200
@@ -19,7 +19,6 @@
 %Include objectdescription.sip
 %Include objectdescriptionmodel.sip
 %Include abstractmediastream.sip
-%Include abstractmediastream2.sip
 %Include abstractvideooutput.sip
 %Include audiooutput.sip
 %Include backendcapabilities.sip
diff -Nur kdebindings-4.0.84/python/pykde4/sip/phonon/streaminterface.sip kdebindings-4.0.84-python-phonon/python/pykde4/sip/phonon/streaminterface.sip
--- kdebindings-4.0.84/python/pykde4/sip/phonon/streaminterface.sip	2008-06-25 09:53:34.000000000 +0200
+++ kdebindings-4.0.84-python-phonon/python/pykde4/sip/phonon/streaminterface.sip	2008-06-28 05:07:53.000000000 +0200
@@ -43,20 +43,6 @@
                             StreamInterface ();
 };   // StreamInterface
 
-
-class StreamInterface2 : QObject, Phonon::StreamInterface
-{
-%TypeHeaderCode
-#include <phonon/streaminterface.h>
-%End
-
-public:
-    void                    needData (quint32);
-
-protected:
-                            StreamInterface2 (QObject* parent /TransferThis/ = 0);
-};   // StreamInterface2
-
 };   // Phonon
 
 


Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- kdebindings.spec	27 Jun 2008 16:57:08 -0000	1.121
+++ kdebindings.spec	28 Jun 2008 03:10:55 -0000	1.122
@@ -18,13 +18,15 @@
 
 Name: kdebindings
 Version: 4.0.84
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: KDE bindings to non-C++ languages
 
 Group: User Interface/Desktops
 License: GPLv2
 URL: http://developer.kde.org/language-bindings/
 Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}.tar.bz2
+# fix Python bindings for Phonon not to reference classes which have been removed from Phonon 4.2
+Patch0: kdebindings-4.0.84-python-phonon.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kde-filesystem >= 4
@@ -84,6 +86,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .python-phonon
 
 
 %build
@@ -162,6 +165,9 @@
 
 
 %changelog
+* Sat Jun 28 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.84-2
+- fix Python bindings for Phonon
+
 * Fri Jun 27 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.84-1
 - 4.0.84