diff options
author | Andreas Hüttel <dilfridge@gentoo.org> | 2010-11-11 22:45:55 +0000 |
---|---|---|
committer | Andreas Hüttel <dilfridge@gentoo.org> | 2010-11-11 22:45:55 +0000 |
commit | a545d1c10e84ff34dcdbe5a15be9b3625dc605f8 (patch) | |
tree | c64e12657d2eba319acba4dce7d266313a3f3ea4 /kde-base/rocs | |
parent | Version bump. (diff) | |
download | historical-a545d1c10e84ff34dcdbe5a15be9b3625dc605f8.tar.gz historical-a545d1c10e84ff34dcdbe5a15be9b3625dc605f8.tar.bz2 historical-a545d1c10e84ff34dcdbe5a15be9b3625dc605f8.zip |
Added patch for building correctly on arm, fixes bug 341069
Package-Manager: portage-2.1.9.24/cvs/Linux x86_64
Diffstat (limited to 'kde-base/rocs')
-rw-r--r-- | kde-base/rocs/ChangeLog | 6 | ||||
-rw-r--r-- | kde-base/rocs/Manifest | 25 | ||||
-rw-r--r-- | kde-base/rocs/files/rocs-4.5.3-double.patch | 125 | ||||
-rw-r--r-- | kde-base/rocs/rocs-4.5.3.ebuild | 4 |
4 files changed, 156 insertions, 4 deletions
diff --git a/kde-base/rocs/ChangeLog b/kde-base/rocs/ChangeLog index d3264dc797f0..1f762b5a0ea5 100644 --- a/kde-base/rocs/ChangeLog +++ b/kde-base/rocs/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/rocs # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/rocs/ChangeLog,v 1.20 2010/11/03 16:31:01 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/rocs/ChangeLog,v 1.21 2010/11/11 22:45:55 dilfridge Exp $ + + 11 Nov 2010; Andreas K. Huettel <dilfridge@gentoo.org> rocs-4.5.3.ebuild, + +files/rocs-4.5.3-double.patch: + Added patch for building correctly on arm, fixes bug 341069 *rocs-4.5.3 (03 Nov 2010) diff --git a/kde-base/rocs/Manifest b/kde-base/rocs/Manifest index 3759eab797b9..5c6f75bcb7b5 100644 --- a/kde-base/rocs/Manifest +++ b/kde-base/rocs/Manifest @@ -1,8 +1,29 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX rocs-4.5.3-double.patch 5518 RMD160 25617d25c1b603c60128a6cc59018ecd648822b9 SHA1 94e379d0bfe71116870a06a20080e5c59430e59a SHA256 7fbbc21ac35f5d91c4605a6caadb27cfcb820978425c5601c9c239d0cbd15b1b DIST kdeedu-4.4.5.tar.bz2 59799070 RMD160 13c2ad8d67a961ab062bba989f7c86fa5e1cabc5 SHA1 7b84fa9dd9e91e117df5dc1af19bcd212cac707a SHA256 13272a8585a168a7d5c63d2ba10f57412e82cc5fb32b77a8c81284623828b9d8 DIST kdeedu-4.5.2.tar.bz2 65714910 RMD160 25de7ca7b712f29f4c2466a224642c099ebb9fd3 SHA1 44f6cbb0029ae23b0aa6e16e0e6125ad07771be4 SHA256 2512f80ea203cb1be24ab2b18d12be876afc2182c586d864d082d658aa2c57d2 DIST kdeedu-4.5.3.tar.bz2 65711657 RMD160 5d952896ecb18246694947ae8595c2ecb2656d91 SHA1 3bb03536603aafbe317fa9ed5f02579f76ba5157 SHA256 29c02c490e6b9a36d3d515ea729d08383322852bc642f6ac0834c2f4c0bc14a0 EBUILD rocs-4.4.5.ebuild 440 RMD160 476e704ab6b6c4338267a94d29f12c7a01017230 SHA1 25f2e941db98acf1143ad9852ba56b6d3d60de3c SHA256 71b609b6a8a1c23688f95e332b428f1dcc5bc9d76882b1b9487011476080f385 EBUILD rocs-4.5.2.ebuild 458 RMD160 0a5ac60c832d5020a4f731564e82c271ffab4393 SHA1 61d43b6ee292f2316858325ab61fdb4b4b8e81a6 SHA256 bd43c8f4b864ded67d54913305021af94cfb01fe122b00fd7c6381362dd53282 -EBUILD rocs-4.5.3.ebuild 461 RMD160 d660a1a308b558980e2fa59e8652017394e0e400 SHA1 ceeeef024bdfb7c8bd4ccf0759e3a24a12560e34 SHA256 baa056bdfce941368620f005687f289c53dbb271a5dd0fd9dafc634a2177227f -MISC ChangeLog 2414 RMD160 e21c2158d0b1a7baaf2dadbc9ae337faf4a0753d SHA1 3c22f7df68b008d823c78aefb5b75b6bcb7da0b8 SHA256 9cf386184d24713795260112ff206af6d6b5bed21bd12254c3b6c4b3f3501449 +EBUILD rocs-4.5.3.ebuild 506 RMD160 7f866d2a39d96c6544463c482255ca65afa5b94c SHA1 bc708d12da87eaf2ac79b00c65350ba9cd5fa712 SHA256 af23f47ccca158b640e8d18aa42175d9bb872de6c46c8bda4af4eadb42f82b15 +MISC ChangeLog 2587 RMD160 08e9dd053c33b7b8622d2bc2db18aa6f01a3e0be SHA1 18b0ecd70164579f6244cc7253584b108505f0c7 SHA256 52d247a25bb2a82afeb9ea3bd9772399c2140b6bad1963b011e1741c3a193d1b MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.16 (GNU/Linux) + +iQIcBAEBAgAGBQJM3HG6AAoJENwGBM22xffep10P/RiTGlbONqBV2Wmz1uXqWM3v +6Y+4ltpGJpJ7LvlXVZ8mmSIcAKypH9zQrS3JrRUvg6eSdgi4LeuVw1DzsbhCJQ0N +y/o7MeM9Nw/zQEgP8ULiCX3mEE8D7NlyG45BG3JXefyk3bHeiL1b2XtGsaN4lqLJ +mX9rK397RpiPc2kCpksEAn41Xk4JAAy0MhYNgSu2KvjmX5RQ+x8YIWM4qNNcMDZJ +qjNU85ayDiQ+D7+53XRHUdY+47G7S1GhmbqAnS8Jz4TAbHkGumfNstPMlJawVgM3 +gEr9mMDq0jnYLgCyON9OWTRuxp512qFtRCA/CizBLh+nKFYAMAN9ezz/FUa74ov2 +mjRSPc7vf6CFEgvlM0SdBJkQuUBqfxV1x7W/M8qVhkNawN7bd1S4eP5gnEsvkxfh +A9Sq7fgiEUuMu04SpMKfzN92nQ6Q8o2zdQWUpOC5a96wwszGtD9JfwpO4Az54S8U +KYsT3Mwy8DHfaYIW+eMC4U/ZKOQv0tHdvH42WFrRG5ejwEoWKjEECSQBLvn1RrSd +O6hf+MxdaF9DMyD+RgmHqT/2HbpwF1D5rtnHTxgxsissFuB1LOfzk/v6VyOeWu6t +v4awB3bx2rKnh781yox6I46bSBgcfI5hjSQjJEiVACypUecmRTTB1r67Nxoq3MWk +OaAHdT7pClDAmoi0VOhb +=xsOm +-----END PGP SIGNATURE----- diff --git a/kde-base/rocs/files/rocs-4.5.3-double.patch b/kde-base/rocs/files/rocs-4.5.3-double.patch new file mode 100644 index 000000000000..2e4152776d00 --- /dev/null +++ b/kde-base/rocs/files/rocs-4.5.3-double.patch @@ -0,0 +1,125 @@ +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 -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.3.ebuild b/kde-base/rocs/rocs-4.5.3.ebuild index 77af73a8441a..2126f56293e5 100644 --- a/kde-base/rocs/rocs-4.5.3.ebuild +++ b/kde-base/rocs/rocs-4.5.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/rocs/rocs-4.5.3.ebuild,v 1.1 2010/11/03 16:31:01 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/rocs/rocs-4.5.3.ebuild,v 1.2 2010/11/11 22:45:55 dilfridge Exp $ EAPI="3" @@ -16,3 +16,5 @@ DEPEND=" >=dev-cpp/eigen-2.0.3:2 " RDEPEND="" + +PATCHES=( "${FILESDIR}/${P}-double.patch" ) |