Hello community,
here is the log from the commit of package kdebindings4 for openSUSE:Factory
checked in at Thu Apr 21 12:23:58 CEST 2011.
--------
--- KDE/kdebindings4/kdebindings4.changes 2011-04-03 15:53:40.000000000
+0200
+++ /mounts/work_src_done/STABLE/kdebindings4/kdebindings4.changes
2011-04-16 12:36:43.000000000 +0200
@@ -1,0 +2,7 @@
+Sat Apr 16 10:14:09 UTC 2011 - ei...@heavensinferno.net
+
+- Add pykde4_fix_phonon.patch: Fixes the use of Phonon.VideoWidget
+ and Phonon.AudioOutput in Python. Fix for bugs.kde.org 188315,
+ taken from KDE SVN rev 1228245
+
+-------------------------------------------------------------------
@@ -14 +20,0 @@
-
@@ -22 +27,0 @@
-
@@ -29 +33,0 @@
-
@@ -42 +45,0 @@
-
@@ -57 +59,0 @@
-
@@ -66 +67,0 @@
-
@@ -74 +74,0 @@
-
@@ -125 +124,0 @@
-
@@ -132 +130,0 @@
-
--- KDE/kdebindings4/mono-kde4.changes 2011-04-01 14:11:57.000000000 +0200
+++ /mounts/work_src_done/STABLE/kdebindings4/mono-kde4.changes 2011-04-16
12:49:09.000000000 +0200
@@ -1,0 +2,13 @@
+Sat Apr 16 10:14:09 UTC 2011 - ei...@heavensinferno.net
+
+- Add pykde4_fix_phonon.patch: Fixes the use of Phonon.VideoWidget
+ and Phonon.AudioOutput in Python. Fix for bugs.kde.org 188315,
+ taken from KDE SVN rev 1228245
+
+-------------------------------------------------------------------
+Sun Apr 3 09:00:49 UTC 2011 - idoen...@novell.com
+
+- Add phonon_smoke_deprecated.patch: fix phonon compilation,
+ patch taken from KDE SVN revision 1208598
+
+-------------------------------------------------------------------
@@ -8 +20,0 @@
-
@@ -16 +27,0 @@
-
@@ -23 +33,0 @@
-
@@ -36 +45,0 @@
-
@@ -51 +59,0 @@
-
@@ -60 +67,0 @@
-
@@ -68 +74,0 @@
-
@@ -119 +124,0 @@
-
@@ -126 +130,0 @@
-
perl-kde4.changes: same change
python-kde4.changes: same change
ruby-kde4.changes: same change
calling whatdependson for head-i586
Old:
----
phonon_smoke_deprecated.patch
New:
----
pykde4_fix_phonon.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdebindings4.spec ++++++
--- /var/tmp/diff_new_pack.vYUjRl/_old 2011-04-21 12:22:47.000000000 +0200
+++ /var/tmp/diff_new_pack.vYUjRl/_new 2011-04-21 12:22:47.000000000 +0200
@@ -32,7 +32,7 @@
Summary: Smoke stand-alone generator for bindings for KDE 4.x libraries
%endif
Version: 4.6.2
-Release: 1
+Release: 3
Source0: kdebindings-%{version}.tar.bz2
BuildRequires: bash okular-devel python
BuildRequires: libQtWebKit-devel
@@ -58,8 +58,9 @@
%if %is_python
# PATCH-MISSING-TAG -- See http://en.opensuse.org/Packaging/Patches
Patch1: pykde4_fix_pykdeuic4.patch
+# PATCH-FIX-UPSTREAM -- pykde4_fix_phonon.patch bko #188315
+Patch2: pykde4_fix_phonon.patch
%endif
-Patch2: phonon_smoke_deprecated.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if %is_base
%define debug_package_requires libsmoke2 = %{version}-%{release}
@@ -172,8 +173,8 @@
%patch0 -p0
%if %is_python
%patch1 -p0
+%patch2 -p0
%endif
-%patch2
%build
rm -rf xparts php
++++++ mono-kde4.spec ++++++
--- /var/tmp/diff_new_pack.vYUjRl/_old 2011-04-21 12:22:47.000000000 +0200
+++ /var/tmp/diff_new_pack.vYUjRl/_new 2011-04-21 12:22:47.000000000 +0200
@@ -32,7 +32,7 @@
Summary: Smoke stand-alone generator for bindings for KDE 4.x libraries
%endif
Version: 4.6.2
-Release: 1
+Release: 2
Source0: kdebindings-%{version}.tar.bz2
BuildRequires: mono-devel monodoc okular-devel
BuildRequires: libQtWebKit-devel
@@ -58,6 +58,8 @@
%if %is_python
# PATCH-MISSING-TAG -- See http://en.opensuse.org/Packaging/Patches
Patch1: pykde4_fix_pykdeuic4.patch
+# PATCH-FIX-UPSTREAM -- pykde4_fix_phonon.patch bko #188315
+Patch2: pykde4_fix_phonon.patch
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if %is_base
@@ -171,6 +173,7 @@
%patch0 -p0
%if %is_python
%patch1 -p0
+%patch2 -p0
%endif
%build
perl-kde4.spec: same change
python-kde4.spec: same change
ruby-kde4.spec: same change
++++++ kdebindings-4.6.2.tar.bz2 ++++++
KDE/kdebindings4/kdebindings-4.6.2.tar.bz2
/mounts/work_src_done/STABLE/kdebindings4/kdebindings-4.6.2.tar.bz2 differ:
char 11, line 1
++++++ kdebindings4.spec.in ++++++
--- /var/tmp/diff_new_pack.vYUjRl/_old 2011-04-21 12:22:47.000000000 +0200
+++ /var/tmp/diff_new_pack.vYUjRl/_new 2011-04-21 12:22:47.000000000 +0200
@@ -58,6 +58,8 @@
%if %is_python
# PATCH-MISSING-TAG -- See http://en.opensuse.org/Packaging/Patches
Patch1: pykde4_fix_pykdeuic4.patch
+# PATCH-FIX-UPSTREAM -- pykde4_fix_phonon.patch bko #188315
+Patch2: pykde4_fix_phonon.patch
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if %is_base
@@ -164,6 +166,7 @@
%patch0 -p0
%if %is_python
%patch1 -p0
+%patch2 -p0
%endif
%build
++++++ pykde4_fix_phonon.patch ++++++
Index: python/pykde4/sip/phonon/audiooutput.sip
===================================================================
--- python/pykde4/sip/phonon/audiooutput.sip (revision 944667)
+++ python/pykde4/sip/phonon/audiooutput.sip (working copy)
@@ -21,7 +21,7 @@
namespace Phonon
{
-class AudioOutput /NoDefaultCtors/
+class AudioOutput : Phonon::MediaNode /NoDefaultCtors/
{
%TypeHeaderCode
#include <phonon/audiooutput.h>
Index: python/pykde4/sip/phonon/videowidget.sip
===================================================================
--- python/pykde4/sip/phonon/videowidget.sip (revision 944667)
+++ python/pykde4/sip/phonon/videowidget.sip (working copy)
@@ -20,8 +20,11 @@
namespace Phonon
{
+%TypeHeaderCode
+#include <phonon/abstractvideooutput.h>
+%End
-class VideoWidget : QWidget
+class VideoWidget : QWidget, Phonon::AbstractVideoOutput
{
%TypeHeaderCode
#include <phonon/videowidget.h>
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
