Update to KDE SC 4.10.2

bugfixes, other quality improvements, new and improved KDE Applications

5 files changed, 32 insertions, 67 deletions

diff --git a/misc/rocs/patches/patch-RocsCore_LoadSave_Plugins_CMakeLists.txt b/misc/rocs/patches/patch-RocsCore_LoadSave_Plugins_CMakeLists.txt
new file mode 100644
index 00000000000..62edf44bed6
--- /dev/null
+++ b/misc/rocs/patches/patch-RocsCore_LoadSave_Plugins_CMakeLists.txt
@@ -0,0 +1,32 @@
+$NetBSD: patch-RocsCore_LoadSave_Plugins_CMakeLists.txt,v 1.1 2013/04/03 10:52:25 markd Exp $
+
+Disable dotFileFormat plugin -- causes g++ Internal error on
+NetBSD 6.x
+
+--- RocsCore/LoadSave/Plugins/CMakeLists.txt.orig	2013-03-01 06:51:29.000000000 +0000
++++ RocsCore/LoadSave/Plugins/CMakeLists.txt
+@@ -19,15 +19,15 @@
+ add_subdirectory(tgfFileFormat)
+ add_subdirectory(tikzFileFormat)
+ 
+-# require Boost >= 1.49 for DOT file format
+-if(${Boost_VERSION} VERSION_LESS 104900)
+-    add_feature_info(DotFileFormat
+-        OFF
+-        "Building of DOT file format support needs Boost >= 1.49."
+-    )
+-else(${Boost_VERSION} VERSION_LESS 104900)
+-    add_subdirectory(dotFileFormat)
+-endif(${Boost_VERSION} VERSION_LESS 104900)
++## require Boost >= 1.49 for DOT file format
++#if(${Boost_VERSION} VERSION_LESS 104900)
++#    add_feature_info(DotFileFormat
++#        OFF
++#        "Building of DOT file format support needs Boost >= 1.49."
++#    )
++#else(${Boost_VERSION} VERSION_LESS 104900)
++#    add_subdirectory(dotFileFormat)
++#endif(${Boost_VERSION} VERSION_LESS 104900)
+ 
+ # these plugins are in an unstable state and are not suited for end users
+ if (ROCS_BUILD_LOADSAVE)
diff --git a/misc/rocs/patches/patch-src_Plugins_AssignValues_assignvalueswidget.h b/misc/rocs/patches/patch-src_Plugins_AssignValues_assignvalueswidget.h
deleted file mode 100644
index 7d3532acd66..00000000000
--- a/misc/rocs/patches/patch-src_Plugins_AssignValues_assignvalueswidget.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_Plugins_AssignValues_assignvalueswidget.h,v 1.1 2013/02/26 23:37:32 joerg Exp $
-
---- src/Plugins/AssignValues/assignvalueswidget.h.orig	2011-11-17 20:57:24.000000000 +0000
-+++ src/Plugins/AssignValues/assignvalueswidget.h
-@@ -21,8 +21,10 @@
- 
- #include <QWidget>
- 
-+#ifndef Q_MOC_RUN
- #include <boost/graph/adjacency_list.hpp>
- #include <boost/graph/topology.hpp>
-+#endif
- #include <KDialog>
- #include "Rocs_Typedefs.h"
- 
diff --git a/misc/rocs/patches/patch-src_Plugins_DataStructure_Graph_GraphStructure.cpp b/misc/rocs/patches/patch-src_Plugins_DataStructure_Graph_GraphStructure.cpp
deleted file mode 100644
index 2db4c368748..00000000000
--- a/misc/rocs/patches/patch-src_Plugins_DataStructure_Graph_GraphStructure.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-src_Plugins_DataStructure_Graph_GraphStructure.cpp,v 1.1 2013/02/26 23:37:32 joerg Exp $
-
---- src/Plugins/DataStructure/Graph/GraphStructure.cpp.orig	2013-02-26 22:55:07.000000000 +0000
-+++ src/Plugins/DataStructure/Graph/GraphStructure.cpp
-@@ -153,7 +153,7 @@ QScriptValue Rocs::GraphStructure::dijks
-     BOOST_FOREACH( PointerPtr p, this->pointers() )
-     {
-          edges[counter] = Edge(node_mapping[p->from().get()], node_mapping[p->to().get()]);
--         edge_mapping[std::make_pair<int,int>(node_mapping[p->from().get()], node_mapping[p->to().get()])] = p;
-+         edge_mapping[std::make_pair(node_mapping[p->from().get()], node_mapping[p->to().get()])] = p;
-          if (!p->value().isEmpty()) {
-               weights[counter] = p->value().toDouble();
-          } else {
-@@ -163,7 +163,7 @@ QScriptValue Rocs::GraphStructure::dijks
-          // if graph is directed, also add back-edges
-          if(!this->directed()) {
-               edges[counter] = Edge(node_mapping[p->to().get()], node_mapping[p->from().get()]);
--              edge_mapping[std::make_pair<int,int>(node_mapping[p->to().get()], node_mapping[p->from().get()])] = p;
-+              edge_mapping[std::make_pair(node_mapping[p->to().get()], node_mapping[p->from().get()])] = p;
-               if (!p->value().isEmpty()) {
-                     weights[counter] = p->value().toDouble();
-               } else {
diff --git a/misc/rocs/patches/patch-src_Plugins_GenerateGraph_generategraphwidget.h b/misc/rocs/patches/patch-src_Plugins_GenerateGraph_generategraphwidget.h
deleted file mode 100644
index e249a5c77dc..00000000000
--- a/misc/rocs/patches/patch-src_Plugins_GenerateGraph_generategraphwidget.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_Plugins_GenerateGraph_generategraphwidget.h,v 1.1 2013/02/26 23:37:32 joerg Exp $
-
---- src/Plugins/GenerateGraph/generategraphwidget.h.orig	2012-01-02 19:52:41.000000000 +0000
-+++ src/Plugins/GenerateGraph/generategraphwidget.h
-@@ -22,8 +22,10 @@
- #include <QWidget>
- #include <KDialog>
- 
-+#ifndef Q_MOC_RUN
- #include <boost/graph/adjacency_list.hpp>
- #include <boost/graph/topology.hpp>
-+#endif
- 
- class QGridLayout;
- class Document;
diff --git a/misc/rocs/patches/patch-src_Plugins_TransformEdges_transformedgeswidget.h b/misc/rocs/patches/patch-src_Plugins_TransformEdges_transformedgeswidget.h
deleted file mode 100644
index f5ab054e359..00000000000
--- a/misc/rocs/patches/patch-src_Plugins_TransformEdges_transformedgeswidget.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_Plugins_TransformEdges_transformedgeswidget.h,v 1.1 2013/02/26 23:37:32 joerg Exp $
-
---- src/Plugins/TransformEdges/transformedgeswidget.h.orig	2011-09-26 09:45:24.000000000 +0000
-+++ src/Plugins/TransformEdges/transformedgeswidget.h
-@@ -22,8 +22,10 @@
- #include <QWidget>
- #include <KDialog>
- 
-+#ifndef Q_MOC_RUN
- #include <boost/graph/adjacency_list.hpp>
- #include <boost/graph/topology.hpp>
-+#endif
- 
- #include "Rocs_Typedefs.h"
-