rpms/gnash/devel gnash-0.8.3-fix-kde4-port.patch, NONE, 1.1 gnash.spec, 1.32, 1.33

[Kevin Kofler]

Author: kkofler

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

Modified Files:
	gnash.spec 
Added Files:
	gnash-0.8.3-fix-kde4-port.patch 
Log Message:
* Thu Oct  4 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.8.3-5
- register KComponentData properly in KDE 4 KPart

gnash-0.8.3-fix-kde4-port.patch:

--- NEW FILE gnash-0.8.3-fix-kde4-port.patch ---
diff -ur gnash-0.8.3-port-to-kde4/plugin/klash4/klash_part.cpp gnash-0.8.3-fix-kde4-port/plugin/klash4/klash_part.cpp
--- gnash-0.8.3-port-to-kde4/plugin/klash4/klash_part.cpp	2008-10-09 02:00:33.000000000 +0200
+++ gnash-0.8.3-fix-kde4-port/plugin/klash4/klash_part.cpp	2008-10-09 02:03:42.000000000 +0200
@@ -100,7 +100,7 @@
    m_started_emited (false) {
     //kdDebug () << "KlashPart(" << this << ")::KlashPart ()" << endl;
     bool show_fullscreen = false;
-    // FIXME what is the right replacement for this? setInstance (KlashFactory::instance (), true);
+    setComponentData (*KlashFactory::instance ());
     KAction *playact = new KAction(this);
     playact->setText(i18n("P&lay"));
     connect(playact, SIGNAL(triggered()), this, SLOT(play()));


Index: gnash.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnash/devel/gnash.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- gnash.spec	8 Oct 2008 21:06:03 -0000	1.32
+++ gnash.spec	9 Oct 2008 00:07:19 -0000	1.33
@@ -11,6 +11,8 @@
 Patch1:         gnash-0.8.3-glib_link.patch
 # patch by Benjamin Wolsey and Bernhard Rosenkränzer
 Patch2:         gnash-0.8.3-port-to-kde4.patch
+# register KComponentData properly in KDE 4 KPart
+Patch3:         gnash-0.8.3-fix-kde4-port.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libxml2-devel libpng-devel libjpeg-devel libogg-devel
@@ -83,6 +85,7 @@
 %patch0 -p1 -b .manual
 %patch1 -p1 -b .glib_link
 %patch2 -p1 -b .kde4
+%patch3 -p1 -b .fix-kde4
 # handle the /usr/lib(64)/kde4/devel hack
 # If only this package used cmake, this wouldn't be necessary...
 sed -i -e 's!KDECORE="-lkdecore"!KDECORE="-L$KDE/$LibDir/kde4/devel -lkdecore"!g' macros/kde4.m4
@@ -241,6 +244,9 @@
 %{_mandir}/man1/cygnal.1*
 
 %changelog
+* Thu Oct  4 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.8.3-5
+- register KComponentData properly in KDE 4 KPart
+
 * Wed Oct  3 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.8.3-4
 - KDE 4 port of klash by Benjamin Wolsey and Bernhard Rosenkränzer