rpms/kdesdk/F-9 kdesdk-4.0.5-kde#156559.patch, NONE, 1.1 kdesdk.spec, 1.99, 1.100

[Kevin Kofler (kkofler)]

Author: kkofler

Update of /cvs/pkgs/rpms/kdesdk/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26620/F-9

Modified Files:
	kdesdk.spec 
Added Files:
	kdesdk-4.0.5-kde#156559.patch 
Log Message:
* Mon Jun 23 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.5-3
- backport fix for Kate symbol viewer crash from 4.1 (#452054, kde#156559)

kdesdk-4.0.5-kde#156559.patch:

--- NEW FILE kdesdk-4.0.5-kde#156559.patch ---
Index: kate/plugins/symbolviewer/plugin_katesymbolviewer.h
===================================================================
--- kate/plugins/symbolviewer/plugin_katesymbolviewer.h	(revision 775582)
+++ kate/plugins/symbolviewer/plugin_katesymbolviewer.h	(revision 775583)
@@ -40,6 +40,19 @@
 #include <kiconloader.h>
 #include <kconfig.h>
 
+class KatePluginSymbolViewerView;
+class KatePluginSymbolViewerView2 : public Kate::PluginView
+{
+  Q_OBJECT
+
+  public:
+    KatePluginSymbolViewerView2 (Kate::MainWindow *w);
+    virtual ~KatePluginSymbolViewerView2 ();
+    KatePluginSymbolViewerView* view();
+  private:
+    KatePluginSymbolViewerView *m_view;
+};
+
 class KatePluginSymbolViewerView : public QObject, public KXMLGUIClient
 {
   Q_OBJECT
Index: kate/plugins/symbolviewer/plugin_katesymbolviewer.cpp
===================================================================
--- kate/plugins/symbolviewer/plugin_katesymbolviewer.cpp	(revision 775582)
+++ kate/plugins/symbolviewer/plugin_katesymbolviewer.cpp	(revision 775583)
@@ -58,6 +58,23 @@
 
 K_EXPORT_COMPONENT_FACTORY( katesymbolviewerplugin, KGenericFactory<KatePluginSymbolViewer>( "katesymbolviewer" ) )
 
+
+KatePluginSymbolViewerView2::KatePluginSymbolViewerView2 (Kate::MainWindow *w)
+    : Kate::PluginView(w)
+{
+    m_view = new KatePluginSymbolViewerView(w);
+}
+
+KatePluginSymbolViewerView2::~KatePluginSymbolViewerView2 ()
+{
+    delete m_view;
+}
+
+KatePluginSymbolViewerView* KatePluginSymbolViewerView2::view()
+{
+    return m_view;
+}
+
 KatePluginSymbolViewerView::KatePluginSymbolViewerView(Kate::MainWindow *w)
 {
     KGlobal::locale()->insertCatalog("katesymbolviewer");
@@ -279,9 +296,9 @@
 
 Kate::PluginView *KatePluginSymbolViewer::createView (Kate::MainWindow *mainWindow)
 {
-  KatePluginSymbolViewerView *view = new KatePluginSymbolViewerView (mainWindow);
-  m_views.append (view);
-  return (Kate::PluginView *)view;
+  KatePluginSymbolViewerView2 *view = new KatePluginSymbolViewerView2 (mainWindow);
+  m_views.append (view->view());
+  return view;
   //return new KatePluginSymbolViewerView2 (mainWindow);
 }
 


Index: kdesdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdesdk/F-9/kdesdk.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- kdesdk.spec	1 Jun 2008 20:04:12 -0000	1.99
+++ kdesdk.spec	23 Jun 2008 05:18:46 -0000	1.100
@@ -1,7 +1,7 @@
 
 Name:           kdesdk
 Version:        4.0.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        The KDE Software Development Kit (SDK)
 
 Group:          User Interface/Desktops
@@ -13,6 +13,9 @@
 
 # http://bugzilla.redhat.com/433399, kate missing Category=Utility
 Patch1: kdesdk-4.0.1-rh#433399.patch
+# backport http://websvn.kde.org/?view=rev&revision=775583 from 4.1
+# (#452054 "Use of the Symbol Viewer plugin crashes kate", kde#156559)
+Patch100: kdesdk-4.0.5-kde#156559.patch
 
 BuildRequires:  kde-filesystem >= 4
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
@@ -82,6 +85,7 @@
 %setup -q
 
 %patch1 -p1 -b .rh#433399
+%patch100 -p0 -b .kde#156559
 
 %build
 
@@ -196,6 +200,9 @@
 
 
 %changelog
+* Mon Jun 23 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.5-3
+- backport fix for Kate symbol viewer crash from 4.1 (#452054, kde#156559)
+
 * Sun Jun 01 2008 Than Ngo <than at redhat.com> 4.0.5-2
 - 4.0.5