rpms/gnash/devel gnash-0.8.3-port-to-kde4.patch,1.2,1.3

[Kevin Kofler]

Author: kkofler

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

Modified Files:
	gnash-0.8.3-port-to-kde4.patch 
Log Message:
Fix build of the KDE 4 frontend against Gnash 0.8.3 (it was written for trunk): add dummy Kde4Gui::createMenu() and Kde4Gui::setupEvents() functions (just return true as in the KDE 3 GUI).

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

Index: gnash-0.8.3-port-to-kde4.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnash/devel/gnash-0.8.3-port-to-kde4.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnash-0.8.3-port-to-kde4.patch	8 Oct 2008 18:23:46 -0000	1.2
+++ gnash-0.8.3-port-to-kde4.patch	8 Oct 2008 19:56:23 -0000	1.3
@@ -545,8 +545,8 @@
 +} // namespace gnash
 diff -Nur gnash-0.8.3/gui/Kde4Gui.cpp gnash-0.8.3-port-to-kde4/gui/Kde4Gui.cpp
 --- gnash-0.8.3/gui/Kde4Gui.cpp	1970-01-01 01:00:00.000000000 +0100
-+++ gnash-0.8.3-port-to-kde4/gui/Kde4Gui.cpp	2008-10-08 18:57:44.000000000 +0200
-@@ -0,0 +1,530 @@
++++ gnash-0.8.3-port-to-kde4/gui/Kde4Gui.cpp	2008-10-08 21:54:07.000000000 +0200
+@@ -0,0 +1,541 @@
 +// kde.cpp:  K Development Environment top level window, for Gnash.
 +// 
 +//   Copyright (C) 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
@@ -647,6 +647,17 @@
 +    return _application->exec();
 +}
 +
++bool
++Kde4Gui::createMenu()
++{
++    return true;
++}
++
++bool
++Kde4Gui::setupEvents()
++{
++    return true;
++}
 +
 +bool
 +Kde4Gui::createWindow(const char* windowtitle, int width, int height)
@@ -1079,8 +1090,8 @@
 +
 diff -Nur gnash-0.8.3/gui/Kde4Gui.h gnash-0.8.3-port-to-kde4/gui/Kde4Gui.h
 --- gnash-0.8.3/gui/Kde4Gui.h	1970-01-01 01:00:00.000000000 +0100
-+++ gnash-0.8.3-port-to-kde4/gui/Kde4Gui.h	2008-10-08 18:57:44.000000000 +0200
-@@ -0,0 +1,170 @@
++++ gnash-0.8.3-port-to-kde4/gui/Kde4Gui.h	2008-10-08 21:53:05.000000000 +0200
+@@ -0,0 +1,172 @@
 +// 
 +//   Copyright (C) 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 +// 
@@ -1174,6 +1185,8 @@
 +    virtual bool init(int argc, char **argv[]);
 +    virtual bool createWindow(const char* windowtitle, int width, int height);
 +    virtual bool run();
++    virtual bool createMenu();
++    virtual bool setupEvents();
 +    virtual void renderBuffer();
 +    virtual void setInterval(unsigned int interval);
 +    virtual void setTimeout(unsigned int timeout);