Added and renamed patches from the tree to replace double with qreal.

4 files changed, 130 insertions, 3 deletions

diff --git a/kde-base/rocs/Manifest b/kde-base/rocs/Manifest
index b00ad76e9fe..a985ae8dc5b 100644
--- a/kde-base/rocs/Manifest
+++ b/kde-base/rocs/Manifest
@@ -1,8 +1,10 @@
 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
 DIST kdeedu-4.5.4.tar.bz2 65713039 RMD160 31ce749e31a765557d5b0febc0525df7b3b2ab01 SHA1 d670d62af51fba356f3058c54c90a709721774bf SHA256 ddd018db98a37bedaa47ef8cc50637f3dc0009c428a8517b834e96420de21720
 DIST kdeedu-4.5.80.tar.bz2 67466064 RMD160 a27ec24a393998bef5cbb55b55ec3da6c6ff0b38 SHA1 d049793682370307ed3a172ff368c831efacfcf0 SHA256 e3a7e8088989134c74429bf4e82e46602b4ea76cce7d41e90bf7d0e2b6b6f6c2
-EBUILD rocs-4.5.4.ebuild 524 RMD160 c7888879c9e540c2415ecbe49721e3a7fac1f355 SHA1 b62c64ad7825ec41df1e703331e08c8d25575114 SHA256 f3691aa0e792b04131f140d368a2b73ae1c01287a6f9122a2ed8fd1db803999a
+EBUILD rocs-4.5.4.ebuild 519 RMD160 73fc4d6c87043f86385d878eba4d29a708d7d274 SHA1 57e570f7eb344e1a2e1704c11295a5e27683b063 SHA256 2ed94fd193b0178fa21b1f44f580fbcd0d41312c656c048a5ba0f4e804632ba1
 EBUILD rocs-4.5.80.ebuild 481 RMD160 e98383e731e8156f4af88d7a29985c3547b538b6 SHA1 17dcabefaeb94fe5f22648840490968b7465724b SHA256 0cdbcb764de3762867ca96a0658c2c74dbcd969c2eb06e5ba18cf22b336cd74e
 EBUILD rocs-4.5.9999.ebuild 477 RMD160 1c9c0687e8344e0de714672ea5355eff5c097cc0 SHA1 015fa1943eb3beef1bb95c103e67b638c859b471 SHA256 c377da023e8b37958c8ef87d42771f4ad68dca23b3276f2bc75ea8ca68b8a479
 EBUILD rocs-9999.ebuild 318 RMD160 31ed711d81542d3291b569ceaa846e236b95f4f0 SHA1 6e8785cddc393bcb2cd938b5ad2790fe5e12f1fa SHA256 d1a2aa2522a6e71eb750e307d11d3cd415ba77fda7452c7760d85befdffaac32
diff --git a/kde-base/rocs/files/rocs-double-handbook.patch b/kde-base/rocs/files/rocs-double-handbook.patch
new file mode 100644
index 00000000000..8a73450272a
--- /dev/null
+++ b/kde-base/rocs/files/rocs-double-handbook.patch
@@ -0,0 +1,25 @@
+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
new file mode 100644
index 00000000000..2a654df9932
--- /dev/null
+++ b/kde-base/rocs/files/rocs-double.patch
@@ -0,0 +1,100 @@
+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.4.ebuild b/kde-base/rocs/rocs-4.5.4.ebuild
index 3cff968c5d9..ff4fd94a86b 100644
--- a/kde-base/rocs/rocs-4.5.4.ebuild
+++ b/kde-base/rocs/rocs-4.5.4.ebuild
@@ -17,9 +17,9 @@ DEPEND="
 "
 RDEPEND=""
 
-PATCHES=( "${FILESDIR}/${PN}-4.5.3-double.patch" )
+PATCHES=( "${FILESDIR}/${PN}-double.patch" )
 
 src_prepare() {
 	kde4-meta_src_prepare
-	use handbook && epatch "${FILESDIR}/${P}-double-handbook.patch"
+	use handbook && epatch "${FILESDIR}/${PN}-double-handbook.patch"
 }