[kde-base/rocs] No more patches are needed

Fix is included in upstream KDE

6 files changed, 1 insertions, 330 deletions

diff --git a/kde-base/rocs/Manifest b/kde-base/rocs/Manifest
index 9a260176ef0..646d270cada 100644
--- a/kde-base/rocs/Manifest
+++ b/kde-base/rocs/Manifest
@@ -1,8 +1,4 @@
-AUX rocs-4.5.80-double-handbook.patch 672 RMD160 b0d59cfd1f08bf39d51a103bb46a5262c66fb1df SHA1 5dbb1730aeb25a965ecad4494d68b8134dd1d66e SHA256 3d882c302c1f84c46c175d118aa747a9dda3b79da02fe306c88bf79222912076
-AUX rocs-4.5.80-double.patch 8245 RMD160 b7481155554f0d6bce8448d3fd74af53df411822 SHA1 14f1ddc11a1d09e1f14b8eb98fb8611882de56e5 SHA256 9411c4cbcb87592731df5a0285d74b0ad4866344ffc57e566720ad2a56308146
-AUX rocs-double-handbook.patch 667 RMD160 1ae333cb7862f5327b7a7ddbc9ac1fbdd9f3767d SHA1 8c1cfe82667d790e0bf23ecb594725d1c9de5ac5 SHA256 3c37dd53e2e92e57c783fe222cf4cb1b07e5d43165d97537d247d2e07ddecdd2
-AUX rocs-double.patch 4851 RMD160 9197d9b07bcc3bad9ece9967e3de8d5481a5fece SHA1 170e1e7937564a591b794afb6d85d19cf586c0ff SHA256 4e96c399551964d72c24f41955afff3d3015d262807e8481e24218ebea6e97cb
-EBUILD rocs-4.5.9999.ebuild 475 RMD160 7b8a401bfc0ab16e4eaf9b045543d1cfb9c56518 SHA1 448db9a222bcdd1544e28b97d1ddb6f0607d3f23 SHA256 e78ae180fad3da61459895e1d6c74b41be0f4ea88bf22cb0d3257d05bed7913f
+EBUILD rocs-4.5.9999.ebuild 316 RMD160 3ca976d93616cd5d0f766a70179739fd557b75cd SHA1 83bef70c2299a4a182eedb0ce03759e3042234f3 SHA256 b6d57ff14ea3cec8bb1c13ca09074dc0437261a357347611f4bc5e1c9c5d4deb
 EBUILD rocs-4.6.9999.ebuild 316 RMD160 3ca976d93616cd5d0f766a70179739fd557b75cd SHA1 83bef70c2299a4a182eedb0ce03759e3042234f3 SHA256 b6d57ff14ea3cec8bb1c13ca09074dc0437261a357347611f4bc5e1c9c5d4deb
 EBUILD rocs-9999.ebuild 316 RMD160 3ca976d93616cd5d0f766a70179739fd557b75cd SHA1 83bef70c2299a4a182eedb0ce03759e3042234f3 SHA256 b6d57ff14ea3cec8bb1c13ca09074dc0437261a357347611f4bc5e1c9c5d4deb
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/rocs/files/rocs-4.5.80-double-handbook.patch b/kde-base/rocs/files/rocs-4.5.80-double-handbook.patch
deleted file mode 100644
index 0f389684654..00000000000
--- a/kde-base/rocs/files/rocs-4.5.80-double-handbook.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -ruN rocs-4.5.80.orig/doc/rocs/index.docbook rocs-4.5.80/doc/rocs/index.docbook
---- rocs-4.5.80.orig/doc/rocs/index.docbook	2010-10-27 21:55:08.000000000 +0200
-+++ rocs-4.5.80/doc/rocs/index.docbook	2010-11-28 22:35:11.590646446 +0100
-@@ -177,9 +177,9 @@
- </programlisting> 
- <para>Node Variables:</para>
- <programlisting>
--    double x
--    double y
--    double width
-+    qreal x
-+    qreal y
-+    qreal width
-     string value
-     string name
-     string color  // in HEXA
-@@ -194,7 +194,7 @@
-     string color ( em hexa )
-     string value
-     string name
--    double width
-+    qreal width
-     string style ( dot, dash, dash dot, solid )
- 
-     node start();
diff --git a/kde-base/rocs/files/rocs-4.5.80-double.patch b/kde-base/rocs/files/rocs-4.5.80-double.patch
deleted file mode 100644
index 8ad3d2ade9c..00000000000
--- a/kde-base/rocs/files/rocs-4.5.80-double.patch
+++ /dev/null
@@ -1,168 +0,0 @@
-diff -ruN rocs-4.5.80.orig/rocs/src/Core/Data.h rocs-4.5.80/rocs/src/Core/Data.h
---- rocs-4.5.80.orig/rocs/src/Core/Data.h	2010-09-20 10:50:19.000000000 +0200
-+++ rocs-4.5.80/rocs/src/Core/Data.h	2010-11-28 22:34:45.602646490 +0100
-@@ -85,7 +85,7 @@
- 
-     void setX(int x);
-     void setY(int y);
--    void setWidth(double w);
-+    void setWidth(qreal w);
-     void setPos(qreal x, qreal y);
-     qreal x() const;
-     qreal y() const;
-diff -ruN rocs-4.5.80.orig/rocs/src/Core/Pointer.cpp rocs-4.5.80/rocs/src/Core/Pointer.cpp
---- rocs-4.5.80.orig/rocs/src/Core/Pointer.cpp	2010-09-20 10:50:19.000000000 +0200
-+++ rocs-4.5.80/rocs/src/Core/Pointer.cpp	2010-11-28 22:34:32.959646460 +0100
-@@ -39,7 +39,7 @@
-     bool showValue;
- 
-     QString style;
--    double width;
-+    qreal width;
- 
-      DataType *dataType;
- 
-@@ -177,7 +177,7 @@
- qreal Pointer::width () const {
-     return d->width;
- }
--void Pointer::setWidth(double w) {
-+void Pointer::setWidth(qreal w) {
-     d->width = w;
-     emit changed();
- }
-diff -ruN rocs-4.5.80.orig/rocs/src/Core/Pointer.h rocs-4.5.80/rocs/src/Core/Pointer.h
---- rocs-4.5.80.orig/rocs/src/Core/Pointer.h	2010-09-20 10:50:19.000000000 +0200
-+++ rocs-4.5.80/rocs/src/Core/Pointer.h	2010-11-28 22:34:19.803646370 +0100
-@@ -56,7 +56,7 @@
-     Q_PROPERTY(QString color READ color WRITE setColor)
-     Q_PROPERTY(QString value READ value WRITE setValue)
-     Q_PROPERTY(QString name READ name WRITE setName)
--    Q_PROPERTY(double width READ width WRITE setWidth)
-+    Q_PROPERTY(qreal width READ width WRITE setWidth)
-     Q_PROPERTY(QString style READ style WRITE setStyle)
- 
- public:
-@@ -140,7 +140,7 @@
-     void setColor(const QString& s);
- 
-     qreal width () const;
--    void setWidth(double w);
-+    void setWidth(qreal w);
- 
-     const QString& style() const;
-     void setStyle(const QString& s);
-diff -ruN rocs-4.5.80.orig/rocs/src/GraphicsItem/math_constants.h rocs-4.5.80/rocs/src/GraphicsItem/math_constants.h
---- rocs-4.5.80.orig/rocs/src/GraphicsItem/math_constants.h	2010-06-08 12:10:59.000000000 +0200
-+++ rocs-4.5.80/rocs/src/GraphicsItem/math_constants.h	2010-11-28 22:34:01.287646435 +0100
-@@ -23,10 +23,10 @@
- #define MATH_CONSTANTS_H
- 
- 
--static const double Pi = 3.14159265358979323846264338327950288419717;
-+static const qreal Pi = 3.14159265358979323846264338327950288419717;
- 
- /// The value of Pi * 2
--static const double TwoPi = 2.0 * Pi;
-+static const qreal TwoPi = 2.0 * Pi;
- 
- /// The Value of PI / 3
- static const qreal PI_3 = Pi / 3.0;
-diff -ruN rocs-4.5.80.orig/rocs/src/Interface/NodePropertiesWidget.cpp rocs-4.5.80/rocs/src/Interface/NodePropertiesWidget.cpp
---- rocs-4.5.80.orig/rocs/src/Interface/NodePropertiesWidget.cpp	2010-09-27 21:51:04.000000000 +0200
-+++ rocs-4.5.80/rocs/src/Interface/NodePropertiesWidget.cpp	2010-11-28 22:30:58.375646448 +0100
-@@ -45,7 +45,7 @@
-     connect( _value,        SIGNAL(textChanged(QString)),   _datum, SLOT(setValue(QString)));
- //     connect( _x,            SIGNAL(valueChanged(int)),      _datum, SLOT(setX(int)));
- //     connect( _y,            SIGNAL(valueChanged(int)),      _datum, SLOT(setY(int)));
--//     connect( _width,        SIGNAL(valueChanged(double)),   _datum, SLOT(setWidth(double)));
-+//     connect( _width,        SIGNAL(valueChanged(qreal)),   _datum, SLOT(setWidth(qreal)));
- 
-     GraphPropertiesModel *model = new GraphPropertiesModel();
-     model->setDataSource(_datum);
-@@ -144,6 +144,6 @@
-     disconnect( _value,        SIGNAL(textChanged(QString)),   n, SLOT(setValue(QString)));
- //     disconnect( _x,            SIGNAL(valueChanged(int)),      n, SLOT(setX(int)));
- //     disconnect( _y,            SIGNAL(valueChanged(int)),      n, SLOT(setY(int)));
--//     disconnect( _width,        SIGNAL(valueChanged(double)),   n, SLOT(setWidth(double)));
-+//     disconnect( _width,        SIGNAL(valueChanged(qreal)),   n, SLOT(setWidth(qreal)));
- 
- }
-diff -ruN rocs-4.5.80.orig/rocs/src/Interface/edgepropertieswidget.cpp rocs-4.5.80/rocs/src/Interface/edgepropertieswidget.cpp
---- rocs-4.5.80.orig/rocs/src/Interface/edgepropertieswidget.cpp	2010-08-19 10:51:56.000000000 +0200
-+++ rocs-4.5.80/rocs/src/Interface/edgepropertieswidget.cpp	2010-11-28 22:31:30.290646224 +0100
-@@ -53,7 +53,7 @@
- 
-     connect(_value,     SIGNAL(textChanged(QString)),   _pointer, SLOT(setValue(QString)));
-     connect(_name,      SIGNAL(textChanged(QString)),   _pointer, SLOT(setName(QString)));
--    connect(_width,     SIGNAL(valueChanged(double)),    _pointer, SLOT(setWidth(double)));
-+    connect(_width,     SIGNAL(valueChanged(qreal)),    _pointer, SLOT(setWidth(qreal)));
-     connect(_showName,  SIGNAL(toggled(bool)),          _pointer, SLOT(hideName(bool)));
-     connect(_showValue, SIGNAL(toggled(bool)),          _pointer, SLOT(hideValue(bool)));
- 
-@@ -101,7 +101,7 @@
- 
-     disconnect(_value,     SIGNAL(textChanged(QString)),   _pointer, SLOT(setValue(QString)));
-     disconnect(_name,      SIGNAL(textChanged(QString)),   _pointer, SLOT(setName(QString)));
--    disconnect(_width,     SIGNAL(valueChanged(double)),    _pointer, SLOT(setWidth(double)));
-+    disconnect(_width,     SIGNAL(valueChanged(qreal)),    _pointer, SLOT(setWidth(qreal)));
-     disconnect(_showName,  SIGNAL(toggled(bool)),          _pointer, SLOT(hideName(bool)));
-     disconnect(_showValue, SIGNAL(toggled(bool)),          _pointer, SLOT(hideValue(bool)));
- }
-diff -ruN rocs-4.5.80.orig/rocs/src/Plugins/DSPlugins/Graph/GraphPlugin.cpp rocs-4.5.80/rocs/src/Plugins/DSPlugins/Graph/GraphPlugin.cpp
---- rocs-4.5.80.orig/rocs/src/Plugins/DSPlugins/Graph/GraphPlugin.cpp	2010-11-05 11:48:01.000000000 +0100
-+++ rocs-4.5.80/rocs/src/Plugins/DSPlugins/Graph/GraphPlugin.cpp	2010-11-28 22:32:45.944646450 +0100
-@@ -85,7 +85,7 @@
- 
-   connect( x,            SIGNAL(valueChanged(int)),      node, SLOT(setX(int)));
-   connect( y,            SIGNAL(valueChanged(int)),      node, SLOT(setY(int)));
--  connect( size,        SIGNAL(valueChanged(double)),   node, SLOT(setWidth(double)));
-+  connect( size,        SIGNAL(valueChanged(qreal)),   node, SLOT(setWidth(qreal)));
-   QFrame * line = new QFrame(parentWidget);
-   line->setFrameShape(QFrame::VLine);
- 
-diff -ruN rocs-4.5.80.orig/rocs/src/Plugins/GMLParser/GMLGrammar.h rocs-4.5.80/rocs/src/Plugins/GMLParser/GMLGrammar.h
---- rocs-4.5.80.orig/rocs/src/Plugins/GMLParser/GMLGrammar.h	2010-11-05 11:48:00.000000000 +0100
-+++ rocs-4.5.80/rocs/src/Plugins/GMLParser/GMLGrammar.h	2010-11-28 22:32:21.925646415 +0100
-@@ -134,7 +134,7 @@
- void finalactions(char const* first, char const* last);
- 
- bool parse_point(char const* str, QPoint& p);
--bool parse_real(char const* str, double& d);
-+bool parse_real(char const* str, qreal& d);
- bool parse_integers(char const* str, std::vector<int>& v);
- bool parse_spline(char const* str, QVector< QPair< float, float > >& points);
- void init_op();
-diff -ruN rocs-4.5.80.orig/rocs/src/Plugins/dotParser/dotgrammar.cpp rocs-4.5.80/rocs/src/Plugins/dotParser/dotgrammar.cpp
---- rocs-4.5.80.orig/rocs/src/Plugins/dotParser/dotgrammar.cpp	2010-11-05 11:48:01.000000000 +0100
-+++ rocs-4.5.80/rocs/src/Plugins/dotParser/dotgrammar.cpp	2010-11-28 22:33:04.498646532 +0100
-@@ -389,7 +389,7 @@
-     return true;
-   }
- 
--  double h,s,v;
-+  qreal h,s,v;
-   res = parse(str,
-               (
-                 real_p[assign_a(h)] >> !ch_p(',') >> real_p[assign_a(s)] >> !ch_p(',') >> real_p[assign_a(v)]
-@@ -404,7 +404,7 @@
-   return false;
- }
- 
--bool parse_real(char const* str, double& d)
-+bool parse_real(char const* str, qreal& d)
- {
-   return parse(str,
-                (
-diff -ruN rocs-4.5.80.orig/rocs/src/Plugins/dotParser/dotgrammar.h rocs-4.5.80/rocs/src/Plugins/dotParser/dotgrammar.h
---- rocs-4.5.80.orig/rocs/src/Plugins/dotParser/dotgrammar.h	2010-11-05 11:48:01.000000000 +0100
-+++ rocs-4.5.80/rocs/src/Plugins/dotParser/dotgrammar.h	2010-11-28 22:33:23.710646519 +0100
-@@ -72,7 +72,7 @@
- void finalactions(char const* first, char const* last);
- 
- bool parse_point(char const* str, QPoint& p);
--bool parse_real(char const* str, double& d);
-+bool parse_real(char const* str, qreal& d);
- bool parse_integers(char const* str, std::vector<int>& v);
- bool parse_spline(char const* str, QVector< QPair< float, float > >& points);
- void init_op();
diff --git a/kde-base/rocs/files/rocs-double-handbook.patch b/kde-base/rocs/files/rocs-double-handbook.patch
deleted file mode 100644
index 8a73450272a..00000000000
--- a/kde-base/rocs/files/rocs-double-handbook.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -ru rocs-4.5.3.orig/doc/rocs/index.docbook rocs-4.5.3/doc/rocs/index.docbook
---- rocs-4.5.3.orig/doc/rocs/index.docbook	2010-06-08 12:10:55.000000000 +0200
-+++ rocs-4.5.3/doc/rocs/index.docbook	2010-11-10 01:21:53.467410347 +0100
-@@ -180,9 +180,9 @@
- </programlisting> 
- <para>Node Variables:</para>
- <programlisting>
--    double x
--    double y
--    double width
-+    qreal x
-+    qreal y
-+    qreal width
-     string value
-     string name
-     string color  // in HEXA
-@@ -197,7 +197,7 @@
-     string color ( em hexa )
-     string value
-     string name
--    double width
-+    qreal width
-     string style ( dot, dash, dash dot, solid )
- 
-     node start();
diff --git a/kde-base/rocs/files/rocs-double.patch b/kde-base/rocs/files/rocs-double.patch
deleted file mode 100644
index 2a654df9932..00000000000
--- a/kde-base/rocs/files/rocs-double.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-diff -ru rocs-4.5.3.orig/rocs/src/Core/edge.h rocs-4.5.3/rocs/src/Core/edge.h
---- rocs-4.5.3.orig/rocs/src/Core/edge.h	2010-06-08 12:10:59.000000000 +0200
-+++ rocs-4.5.3/rocs/src/Core/edge.h	2010-11-10 01:23:28.283410355 +0100
-@@ -62,7 +62,7 @@
-     Q_PROPERTY(QString name READ name WRITE setName)
- 
-     /*! this property holds the width of the edge */
--    Q_PROPERTY(double width READ width WRITE setWidth)
-+    Q_PROPERTY(qreal width READ width WRITE setWidth)
- 
-     /*! this property holds the style of the edge */
-     Q_PROPERTY(QString style READ style WRITE setStyle)
-@@ -169,7 +169,7 @@
-     qreal width () const {
-         return _width;
-     }
--    void setWidth(double w) {
-+    void setWidth(qreal w) {
-         _width = w;
-         emit changed();
-     }
-@@ -239,7 +239,7 @@
-     bool _showValue;
- 
-     QString _style;
--    double _width;
-+    qreal _width;
- 
-      Graph *_graph;
- #ifdef USING_QTSCRIPT
-diff -ru rocs-4.5.3.orig/rocs/src/Core/node.h rocs-4.5.3/rocs/src/Core/node.h
---- rocs-4.5.3.orig/rocs/src/Core/node.h	2010-06-08 12:10:59.000000000 +0200
-+++ rocs-4.5.3/rocs/src/Core/node.h	2010-11-10 01:23:32.241410345 +0100
-@@ -85,7 +85,7 @@
- 
-     void setX(int x);
-     void setY(int y);
--    void setWidth(double w);
-+    void setWidth(qreal w);
-     void setPos(qreal x, qreal y);
-     qreal x() const;
-     qreal y() const;
-diff -ru rocs-4.5.3.orig/rocs/src/GraphicsItem/math_constants.h rocs-4.5.3/rocs/src/GraphicsItem/math_constants.h
---- rocs-4.5.3.orig/rocs/src/GraphicsItem/math_constants.h	2010-06-08 12:10:59.000000000 +0200
-+++ rocs-4.5.3/rocs/src/GraphicsItem/math_constants.h	2010-11-10 01:23:04.291410343 +0100
-@@ -23,10 +23,10 @@
- #define MATH_CONSTANTS_H
- 
- 
--static const double Pi = 3.14159265358979323846264338327950288419717;
-+static const qreal Pi = 3.14159265358979323846264338327950288419717;
- 
- /// The value of Pi * 2
--static const double TwoPi = 2.0 * Pi;
-+static const qreal TwoPi = 2.0 * Pi;
- 
- /// The Value of PI / 3
- static const qreal PI_3 = Pi / 3.0;
-diff -ru rocs-4.5.3.orig/rocs/src/Interface/NodePropertiesWidget.cpp rocs-4.5.3/rocs/src/Interface/NodePropertiesWidget.cpp
---- rocs-4.5.3.orig/rocs/src/Interface/NodePropertiesWidget.cpp	2010-06-16 14:03:03.000000000 +0200
-+++ rocs-4.5.3/rocs/src/Interface/NodePropertiesWidget.cpp	2010-11-10 01:22:25.998410281 +0100
-@@ -43,7 +43,7 @@
-     connect( _value,        SIGNAL(textChanged(QString)),   _node, SLOT(setValue(QString)));
-     connect( _x,            SIGNAL(valueChanged(int)),      _node, SLOT(setX(int)));
-     connect( _y,            SIGNAL(valueChanged(int)),      _node, SLOT(setY(int)));
--    connect( _width,        SIGNAL(valueChanged(double)),   _node, SLOT(setWidth(double)));
-+    connect( _width,        SIGNAL(valueChanged(qreal)),   _node, SLOT(setWidth(qreal)));
- 
-     GraphPropertiesModel *model = new GraphPropertiesModel();
-     model->setDataSource(_node);
-@@ -136,6 +136,6 @@
-     disconnect( _value,        SIGNAL(textChanged(QString)),   n, SLOT(setValue(QString)));
-     disconnect( _x,            SIGNAL(valueChanged(int)),      n, SLOT(setX(int)));
-     disconnect( _y,            SIGNAL(valueChanged(int)),      n, SLOT(setY(int)));
--    disconnect( _width,        SIGNAL(valueChanged(double)),   n, SLOT(setWidth(double)));
-+    disconnect( _width,        SIGNAL(valueChanged(qreal)),   n, SLOT(setWidth(qreal)));
- 
- }
-\ Kein Zeilenumbruch am Dateiende.
-diff -ru rocs-4.5.3.orig/rocs/src/Interface/edgepropertieswidget.cpp rocs-4.5.3/rocs/src/Interface/edgepropertieswidget.cpp
---- rocs-4.5.3.orig/rocs/src/Interface/edgepropertieswidget.cpp	2010-06-08 12:10:59.000000000 +0200
-+++ rocs-4.5.3/rocs/src/Interface/edgepropertieswidget.cpp	2010-11-10 01:22:33.872410348 +0100
-@@ -52,7 +52,7 @@
- 
-     connect(_value,     SIGNAL(textChanged(QString)),   _edge, SLOT(setValue(QString)));
-     connect(_name,      SIGNAL(textChanged(QString)),   _edge, SLOT(setName(QString)));
--    connect(_width,     SIGNAL(valueChanged(double)),    _edge, SLOT(setWidth(double)));
-+    connect(_width,     SIGNAL(valueChanged(qreal)),    _edge, SLOT(setWidth(qreal)));
-     connect(_showName,  SIGNAL(toggled(bool)),          _edge, SLOT(hideName(bool)));
-     connect(_showValue, SIGNAL(toggled(bool)),          _edge, SLOT(hideValue(bool)));
- 
-@@ -101,7 +101,7 @@
- 
-     disconnect(_value,     SIGNAL(textChanged(QString)),   _edge, SLOT(setValue(QString)));
-     disconnect(_name,      SIGNAL(textChanged(QString)),   _edge, SLOT(setName(QString)));
--    disconnect(_width,     SIGNAL(valueChanged(double)),    _edge, SLOT(setWidth(double)));
-+    disconnect(_width,     SIGNAL(valueChanged(qreal)),    _edge, SLOT(setWidth(qreal)));
-     disconnect(_showName,  SIGNAL(toggled(bool)),          _edge, SLOT(hideName(bool)));
-     disconnect(_showValue, SIGNAL(toggled(bool)),          _edge, SLOT(hideValue(bool)));
- }
diff --git a/kde-base/rocs/rocs-4.5.9999.ebuild b/kde-base/rocs/rocs-4.5.9999.ebuild
index 5573e526648..304c41a2c0d 100644
--- a/kde-base/rocs/rocs-4.5.9999.ebuild
+++ b/kde-base/rocs/rocs-4.5.9999.ebuild
@@ -16,10 +16,3 @@ DEPEND="
 	>=dev-cpp/eigen-2.0.3:2
 "
 RDEPEND=""
-
-PATCHES=( "${FILESDIR}/${PN}-4.5.3-double.patch" )
-
-src_prepare() {
-	kde4-meta_src_prepare
-	use handbook && epatch "${FILESDIR}/${P}-double-handbook.patch"
-}