OpenSDE Packages Database (without history before r20070)
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

76 lines
4.4 KiB

  1. # --- T2-COPYRIGHT-NOTE-BEGIN ---
  2. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
  3. #
  4. # T2 SDE: package/.../orsa/gcc41.patch
  5. # Copyright (C) 2006 The T2 SDE Project
  6. #
  7. # More information can be found in the files COPYING and README.
  8. #
  9. # This patch file is dual-licensed. It is available under the license the
  10. # patched project is licensed under, as long as it is an OpenSource license
  11. # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  12. # of the GNU General Public License as published by the Free Software
  13. # Foundation; either version 2 of the License, or (at your option) any later
  14. # version.
  15. # --- T2-COPYRIGHT-NOTE-END ---
  16. diff -Nur orsa-0.7.0-orig/src/liborsa/orsa_body.h orsa-0.7.0/src/liborsa/orsa_body.h
  17. --- orsa-0.7.0-orig/src/liborsa/orsa_body.h 2004-12-30 03:58:03.000000000 +0000
  18. +++ orsa-0.7.0/src/liborsa/orsa_body.h 2006-04-03 21:31:50.423120000 +0000
  19. @@ -183,7 +183,7 @@
  20. inline void SetVelocity(const double x, const double y, const double z) { Vector v(x,y,z); SetVelocity(v); }
  21. // b position - this position
  22. - inline Vector Body::distanceVector(const Body & b) const { return b.position()-position(); }
  23. + inline Vector distanceVector(const Body & b) const { return b.position()-position(); }
  24. inline double distance(const Body & b) const { return distanceVector(b).Length(); }
  25. // alias
  26. diff -Nur orsa-0.7.0-orig/src/libxorsa/xorsa_analysis.h orsa-0.7.0/src/libxorsa/xorsa_analysis.h
  27. --- orsa-0.7.0-orig/src/libxorsa/xorsa_analysis.h 2004-06-25 00:58:30.000000000 +0000
  28. +++ orsa-0.7.0/src/libxorsa/xorsa_analysis.h 2006-04-03 21:44:48.123723250 +0000
  29. @@ -129,7 +129,7 @@
  30. XOrsaPeaksListItem(QListView *parent, QString label1, QString label2 = QString::null, QString label3 = QString::null, QString label4 = QString::null, QString label5 = QString::null, QString label6 = QString::null, QString label7 = QString::null, QString label8 = QString::null);
  31. public:
  32. - int XOrsaPeaksListItem::compare(QListViewItem * i, int col, bool ascending) const;
  33. + int compare(QListViewItem * i, int col, bool ascending) const;
  34. };
  35. diff -Nur orsa-0.7.0-orig/src/libxorsa/xorsa_import_astorb_objects.h orsa-0.7.0/src/libxorsa/xorsa_import_astorb_objects.h
  36. --- orsa-0.7.0-orig/src/libxorsa/xorsa_import_astorb_objects.h 2005-01-05 03:04:17.000000000 +0000
  37. +++ orsa-0.7.0/src/libxorsa/xorsa_import_astorb_objects.h 2006-04-03 21:39:40.844519500 +0000
  38. @@ -600,7 +600,7 @@
  39. inline XOrsaAstorbObjectItem(QListView *parent, QString label1, QString label2 = QString::null, QString label3 = QString::null, QString label4 = QString::null, QString label5 = QString::null, QString label6 = QString::null, QString label7 = QString::null, QString label8 = QString::null) : QListViewItem(parent, label1, label2, label3, label4, label5, label6, label7, label8) { };
  40. public:
  41. - inline int XOrsaAstorbObjectItem::compare(QListViewItem *i, int col, bool ascending) const {
  42. + inline int compare(QListViewItem *i, int col, bool ascending) const {
  43. using std::atof;
  44. diff -Nur orsa-0.7.0-orig/src/libxorsa/xorsa_object_selector.cc orsa-0.7.0/src/libxorsa/xorsa_object_selector.cc
  45. --- orsa-0.7.0-orig/src/libxorsa/xorsa_object_selector.cc 2004-06-25 03:12:57.000000000 +0000
  46. +++ orsa-0.7.0/src/libxorsa/xorsa_object_selector.cc 2006-04-03 21:50:05.967587250 +0000
  47. @@ -40,7 +40,7 @@
  48. XOrsaObjectItem(QListView *parent, QString label1, QString label2 = QString::null, QString label3 = QString::null, QString label4 = QString::null, QString label5 = QString::null, QString label6 = QString::null, QString label7 = QString::null, QString label8 = QString::null);
  49. public:
  50. - int XOrsaObjectItem::compare(QListViewItem * i, int col, bool ascending) const;
  51. + int compare(QListViewItem * i, int col, bool ascending) const;
  52. };
  53. diff -Nur orsa-0.7.0-orig/src/orsa/xorsa.h orsa-0.7.0/src/orsa/xorsa.h
  54. --- orsa-0.7.0-orig/src/orsa/xorsa.h 2004-07-13 02:21:19.000000000 +0000
  55. +++ orsa-0.7.0/src/orsa/xorsa.h 2006-04-03 21:56:22.087093250 +0000
  56. @@ -62,7 +62,7 @@
  57. ObjectItem(QListView *parent, QString label1, QString label2 = QString::null, QString label3 = QString::null, QString label4 = QString::null, QString label5 = QString::null, QString label6 = QString::null, QString label7 = QString::null, QString label8 = QString::null);
  58. public:
  59. - int ObjectItem::compare(QListViewItem * i, int col, bool ascending) const;
  60. + int compare(QListViewItem * i, int col, bool ascending) const;
  61. };