rpms/gnash/F-10 gnash-0.8.4-fix-kde4-port-2.patch, NONE, 1.1 gnash.spec, 1.44, 1.45

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/gnash/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv677/F-10

Modified Files:
	gnash.spec 
Added Files:
	gnash-0.8.4-fix-kde4-port-2.patch 
Log Message:
* Thu Nov 13 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.8.4-5
- add missing portions of KDE 4 port from upstream kde4 branch

Revert "reenable use_kde3_executable, KDE 4 viewer still not working".

gnash-0.8.4-fix-kde4-port-2.patch:

--- NEW FILE gnash-0.8.4-fix-kde4-port-2.patch ---
diff -ur gnash-0.8.4-kde/gui/gui.h gnash-0.8.4-kde-fixed/gui/gui.h
--- gnash-0.8.4-kde/gui/gui.h	2008-10-12 15:03:29.000000000 +0200
+++ gnash-0.8.4-kde-fixed/gui/gui.h	2008-11-13 22:49:18.000000000 +0100
@@ -518,6 +518,7 @@
 /// Named constructors
 std::auto_ptr<Gui> createGTKGui(unsigned long xid, float scale, bool loop, unsigned int depth);
 std::auto_ptr<Gui> createKDEGui(unsigned long xid, float scale, bool loop, unsigned int depth);
+std::auto_ptr<Gui> createKDE4Gui(unsigned long xid, float scale, bool loop, unsigned int depth);
 std::auto_ptr<Gui> createSDLGui(unsigned long xid, float scale, bool loop, unsigned int depth);
 std::auto_ptr<Gui> createFLTKGui(unsigned long xid, float scale, bool loop, unsigned int depth);
 std::auto_ptr<Gui> createFBGui(unsigned long xid, float scale, bool loop, unsigned int depth);
diff -ur gnash-0.8.4-kde/gui/Player.cpp gnash-0.8.4-kde-fixed/gui/Player.cpp
--- gnash-0.8.4-kde/gui/Player.cpp	2008-10-12 15:03:29.000000000 +0200
+++ gnash-0.8.4-kde-fixed/gui/Player.cpp	2008-11-13 22:49:55.000000000 +0100
@@ -653,6 +653,10 @@
     return createKDEGui(_windowID, _scale, _doLoop, _bitDepth);
 #endif
 
+#ifdef GUI_KDE4
+    return createKDE4Gui(_windowID, _scale, _doLoop, _bitDepth);
+#endif
+
 #ifdef GUI_SDL
     return createSDLGui(_windowID, _scale, _doLoop, _bitDepth);
 #endif


Index: gnash.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnash/F-10/gnash.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- gnash.spec	13 Nov 2008 20:52:04 -0000	1.44
+++ gnash.spec	13 Nov 2008 21:57:20 -0000	1.45
@@ -1,7 +1,7 @@
-# The KDE 4 executable is still not working.
+# The KDE 4 executable should be working now.
 # set this to 1 to use the KDE 3 one with the KDE 4 KPart (for use in Konq 4)
 # (It uses XEmbed, so it doesn't actually link KDE 3 stuff into Konqueror 4.)
-%define use_kde3_executable 1
+%define use_kde3_executable 0
 
 Name:           gnash
 Version:        0.8.4
@@ -30,6 +30,8 @@
 Patch5:         gnash-kde4-x11embed.patch
 # XEmbed resizing patch (from bero)
 Patch6:         gnash-kde4-x11embed-resize.patch
+# Missing hunks in the port-to-kde4 patch (from the upstream kde4 branch)
+Patch7:         gnash-0.8.4-fix-kde4-port-2.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libxml2-devel libpng-devel libjpeg-devel libogg-devel
@@ -112,6 +114,7 @@
 %patch4 -p1 -b .kde4-linkage
 %patch5 -p1 -b .xembed
 %patch6 -p1 -b .xembed-resize
+%patch7 -p1 -b .fix-kde4-2
 # 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
@@ -340,7 +343,7 @@
 
 %changelog
 * Thu Nov 13 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.8.4-5
-- reenable use_kde3_executable, KDE 4 viewer still not working
+- add missing portions of KDE 4 port from upstream kde4 branch
 
 * Thu Nov 13 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.8.4-4
 - add 3 more patches from bero to fix the KDE 4 viewer executable