| 1 |
markusle 08/04/19 13:58:32 |
| 2 |
|
| 3 |
Added: qmatplot-0.4.2-gcc-4.patch |
| 4 |
Log: |
| 5 |
Added patch to make package compile again including gcc-4.3 (fixes bug #205223). |
| 6 |
(Portage version: 2.1.5_rc3) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 sci-visualization/qmatplot/files/qmatplot-0.4.2-gcc-4.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/qmatplot/files/qmatplot-0.4.2-gcc-4.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/qmatplot/files/qmatplot-0.4.2-gcc-4.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: qmatplot-0.4.2-gcc-4.patch |
| 15 |
=================================================================== |
| 16 |
diff -Naur qmatplot-0.4.2/src/dialogs/ksexportpicturedlg.cpp qmatplot-0.4.2.new/src/dialogs/ksexportpicturedlg.cpp |
| 17 |
--- qmatplot-0.4.2/src/dialogs/ksexportpicturedlg.cpp 2003-03-19 14:07:44.000000000 -0500 |
| 18 |
+++ qmatplot-0.4.2.new/src/dialogs/ksexportpicturedlg.cpp 2008-04-19 09:35:36.000000000 -0400 |
| 19 |
@@ -36,6 +36,7 @@ |
| 20 |
#include <qfile.h> |
| 21 |
#include <qpainter.h> |
| 22 |
#include <cstdio> // tmpfile |
| 23 |
+#include <cstdlib> |
| 24 |
|
| 25 |
QString KSExportPictureDlg::m_file_name; |
| 26 |
int KSExportPictureDlg::m_file_format = 0; |
| 27 |
diff -Naur qmatplot-0.4.2/src/dialogs/kswizarddlgs.h qmatplot-0.4.2.new/src/dialogs/kswizarddlgs.h |
| 28 |
--- qmatplot-0.4.2/src/dialogs/kswizarddlgs.h 2003-03-11 07:07:47.000000000 -0500 |
| 29 |
+++ qmatplot-0.4.2.new/src/dialogs/kswizarddlgs.h 2008-04-19 09:35:36.000000000 -0400 |
| 30 |
@@ -31,7 +31,7 @@ |
| 31 |
{ |
| 32 |
Q_OBJECT |
| 33 |
public: |
| 34 |
- KSWizardDlgSurface( QWidget *parent, KSWorkbook *workbook, KSSheet *sheet, QSAxes *parent, bool surface = true ); |
| 35 |
+ KSWizardDlgSurface( QWidget *parent, KSWorkbook *workbook, KSSheet *sheet, QSAxes *parentx, bool surface = true ); |
| 36 |
~KSWizardDlgSurface(); |
| 37 |
|
| 38 |
public slots: |
| 39 |
diff -Naur qmatplot-0.4.2/src/formula/mpformula.h qmatplot-0.4.2.new/src/formula/mpformula.h |
| 40 |
--- qmatplot-0.4.2/src/formula/mpformula.h 2003-03-11 07:07:48.000000000 -0500 |
| 41 |
+++ qmatplot-0.4.2.new/src/formula/mpformula.h 2008-04-19 09:35:36.000000000 -0400 |
| 42 |
@@ -42,6 +42,7 @@ |
| 43 |
* MPSymbol *QSFormula::parse( const QString& formula, MPError& error, FactoryList *locals ) |
| 44 |
* @author Kamil |
| 45 |
*/ |
| 46 |
+int yyparse( void *formula_ptr ); |
| 47 |
class MPFormula { |
| 48 |
friend int yylex( MPParserSymbol *symbol_value, void *location_info_ptr, void *formula_ptr ); |
| 49 |
friend void yyerr( const char *message, void *location_info_ptr, void *formula_ptr ); |
| 50 |
diff -Naur qmatplot-0.4.2/src/formula/mpparser.cpp qmatplot-0.4.2.new/src/formula/mpparser.cpp |
| 51 |
--- qmatplot-0.4.2/src/formula/mpparser.cpp 2003-03-11 07:07:48.000000000 -0500 |
| 52 |
+++ qmatplot-0.4.2.new/src/formula/mpparser.cpp 2008-04-19 09:35:36.000000000 -0400 |
| 53 |
@@ -26,6 +26,7 @@ |
| 54 |
#include"mpsymbols.h" |
| 55 |
#include <cmath> |
| 56 |
#include <cstdio> |
| 57 |
+#include <cstdlib> |
| 58 |
|
| 59 |
void yyerr( const char *message, void *location_info_ptr, void *formula_ptr ); |
| 60 |
int yylex( YYSTYPE *symbol_value, void *location_info_ptr, void *formula_ptr ); |
| 61 |
diff -Naur qmatplot-0.4.2/src/formula/mpsymbol.cpp qmatplot-0.4.2.new/src/formula/mpsymbol.cpp |
| 62 |
--- qmatplot-0.4.2/src/formula/mpsymbol.cpp 2003-03-11 07:07:48.000000000 -0500 |
| 63 |
+++ qmatplot-0.4.2.new/src/formula/mpsymbol.cpp 2008-04-19 09:35:36.000000000 -0400 |
| 64 |
@@ -17,6 +17,8 @@ |
| 65 |
|
| 66 |
#include"mpsymbol.h" |
| 67 |
#include <string> |
| 68 |
+#include <cstring> |
| 69 |
+#include <cstdlib> |
| 70 |
|
| 71 |
//--------------------------------------------------------------------------// |
| 72 |
|
| 73 |
diff -Naur qmatplot-0.4.2/src/ksmatrixeditor.cpp qmatplot-0.4.2.new/src/ksmatrixeditor.cpp |
| 74 |
--- qmatplot-0.4.2/src/ksmatrixeditor.cpp 2003-03-11 07:07:48.000000000 -0500 |
| 75 |
+++ qmatplot-0.4.2.new/src/ksmatrixeditor.cpp 2008-04-19 09:35:36.000000000 -0400 |
| 76 |
@@ -35,7 +35,8 @@ |
| 77 |
#include <qmessagebox.h> |
| 78 |
#include <qpainter.h> |
| 79 |
#include <qcursor.h> |
| 80 |
- |
| 81 |
+#include <cstdlib> |
| 82 |
+#include <climits> |
| 83 |
|
| 84 |
//--------------------------------------------------------------------// |
| 85 |
//--------------------------------------------------------------------// |
| 86 |
diff -Naur qmatplot-0.4.2/src/kssocketio.cpp qmatplot-0.4.2.new/src/kssocketio.cpp |
| 87 |
--- qmatplot-0.4.2/src/kssocketio.cpp 2003-03-11 07:07:45.000000000 -0500 |
| 88 |
+++ qmatplot-0.4.2.new/src/kssocketio.cpp 2008-04-19 09:35:36.000000000 -0400 |
| 89 |
@@ -16,6 +16,7 @@ |
| 90 |
***************************************************************************/ |
| 91 |
|
| 92 |
#include <cassert> |
| 93 |
+#include <cstdlib> |
| 94 |
#include <cstdio> // P_tmpdir |
| 95 |
#include <unistd.h> // unlink |
| 96 |
#include <fcntl.h> |
| 97 |
diff -Naur qmatplot-0.4.2/src/kssocketio.h qmatplot-0.4.2.new/src/kssocketio.h |
| 98 |
--- qmatplot-0.4.2/src/kssocketio.h 2003-03-11 07:07:47.000000000 -0500 |
| 99 |
+++ qmatplot-0.4.2.new/src/kssocketio.h 2008-04-19 09:39:07.000000000 -0400 |
| 100 |
@@ -115,6 +115,7 @@ |
| 101 |
void new_message(); |
| 102 |
void reply( int code ); |
| 103 |
int _write_data( int fd, const char *data, int len ); |
| 104 |
+ int _read_data( int fd, char* data, int len ); |
| 105 |
QCString name_prefix(); |
| 106 |
|
| 107 |
int available_axes_id; |
| 108 |
diff -Naur qmatplot-0.4.2/src/widgets/qsaxis.cpp qmatplot-0.4.2.new/src/widgets/qsaxis.cpp |
| 109 |
--- qmatplot-0.4.2/src/widgets/qsaxis.cpp 2003-03-11 07:07:49.000000000 -0500 |
| 110 |
+++ qmatplot-0.4.2.new/src/widgets/qsaxis.cpp 2008-04-19 09:35:36.000000000 -0400 |
| 111 |
@@ -19,7 +19,9 @@ |
| 112 |
#include"qsaxis.h" |
| 113 |
#include <qregexp.h> |
| 114 |
#include <cassert> |
| 115 |
-#include <algo.h> // this is needed for is_sorted |
| 116 |
+#include <ext/algorithm> // this is needed for __gnu_cxx::is_sorted |
| 117 |
+using namespace __gnu_cxx; |
| 118 |
+ |
| 119 |
|
| 120 |
//-------------------------------------------------------------// |
| 121 |
//-------------------------------------------------------------// |
| 122 |
diff -Naur qmatplot-0.4.2/src/widgets/qsctool.cpp qmatplot-0.4.2.new/src/widgets/qsctool.cpp |
| 123 |
--- qmatplot-0.4.2/src/widgets/qsctool.cpp 2003-03-11 07:07:49.000000000 -0500 |
| 124 |
+++ qmatplot-0.4.2.new/src/widgets/qsctool.cpp 2008-04-19 09:35:36.000000000 -0400 |
| 125 |
@@ -19,6 +19,7 @@ |
| 126 |
#include"qsdrvqt.h" |
| 127 |
#include"qsplotview.h" |
| 128 |
#include <qpainter.h> |
| 129 |
+#include <cstdlib> |
| 130 |
|
| 131 |
QSTool::QSTool( QObject *parent ) |
| 132 |
: QObject( parent ) |
| 133 |
diff -Naur qmatplot-0.4.2/src/widgets/qsgattr.h qmatplot-0.4.2.new/src/widgets/qsgattr.h |
| 134 |
--- qmatplot-0.4.2/src/widgets/qsgattr.h 2003-03-11 07:07:50.000000000 -0500 |
| 135 |
+++ qmatplot-0.4.2.new/src/widgets/qsgattr.h 2008-04-19 09:35:36.000000000 -0400 |
| 136 |
@@ -62,6 +62,10 @@ |
| 137 |
friend QString toQString( const QSGColor& a ); |
| 138 |
friend QSGColor toQSGColor( const QString& s ); |
| 139 |
}; |
| 140 |
+bool operator==( const QSGColor&, const QSGColor& ); |
| 141 |
+bool operator!=( const QSGColor&, const QSGColor& ); |
| 142 |
+QString toQString( const QSGColor& a ); |
| 143 |
+QSGColor toQSGColor( const QString& s ); |
| 144 |
|
| 145 |
//-------------------------------------------------------------// |
| 146 |
|
| 147 |
@@ -87,6 +91,10 @@ |
| 148 |
friend QString toQString( const QSGFont& font ); |
| 149 |
friend QSGFont toQSGFont( const QString& string ); |
| 150 |
}; |
| 151 |
+bool operator==( const QSGFont&, const QSGFont& ); |
| 152 |
+bool operator!=( const QSGFont&, const QSGFont& ); |
| 153 |
+QString toQString( const QSGFont& font ); |
| 154 |
+QSGFont toQSGFont( const QString& string ); |
| 155 |
|
| 156 |
//-------------------------------------------------------------// |
| 157 |
|
| 158 |
@@ -120,7 +128,10 @@ |
| 159 |
friend QString toQString( const QSGLine& line ); |
| 160 |
friend QSGLine toQSGLine( const QString& string ); |
| 161 |
}; |
| 162 |
- |
| 163 |
+bool operator==( const QSGLine&, const QSGLine& ); |
| 164 |
+bool operator!=( const QSGLine&, const QSGLine& ); |
| 165 |
+QString toQString( const QSGLine& line ); |
| 166 |
+QSGLine toQSGLine( const QString& string ); |
| 167 |
|
| 168 |
|
| 169 |
//-------------------------------------------------------------// |
| 170 |
@@ -159,6 +170,10 @@ |
| 171 |
friend QString toQString( const QSGFill& fill ); |
| 172 |
friend QSGFill toQSGFill( const QString& string ); |
| 173 |
}; |
| 174 |
+bool operator==( const QSGFill&, const QSGFill& ); |
| 175 |
+bool operator!=( const QSGFill&, const QSGFill& ); |
| 176 |
+QString toQString( const QSGFill& fill ); |
| 177 |
+QSGFill toQSGFill( const QString& string ); |
| 178 |
|
| 179 |
|
| 180 |
|
| 181 |
@@ -202,6 +217,10 @@ |
| 182 |
friend QString toQString( const QSGPoint& point ); |
| 183 |
friend QSGPoint toQSGPoint( const QString& string ); |
| 184 |
}; |
| 185 |
+bool operator==( const QSGPoint&, const QSGPoint& ); |
| 186 |
+bool operator!=( const QSGPoint&, const QSGPoint& ); |
| 187 |
+QString toQString( const QSGPoint& point ); |
| 188 |
+QSGPoint toQSGPoint( const QString& string ); |
| 189 |
|
| 190 |
//-------------------------------------------------------------// |
| 191 |
|
| 192 |
@@ -243,6 +262,10 @@ |
| 193 |
friend QString toQString( const QSGArrow& arrow ); |
| 194 |
friend QSGArrow toQSGArrow( const QString& string ); |
| 195 |
}; |
| 196 |
+bool operator==( const QSGArrow&, const QSGArrow& ); |
| 197 |
+bool operator!=( const QSGArrow&, const QSGArrow& ); |
| 198 |
+QString toQString( const QSGArrow& arrow ); |
| 199 |
+QSGArrow toQSGArrow( const QString& string ); |
| 200 |
|
| 201 |
//-------------------------------------------------------------// |
| 202 |
|
| 203 |
@@ -287,6 +310,10 @@ |
| 204 |
bool m_all_colors; |
| 205 |
void set_default_colors(); |
| 206 |
}; |
| 207 |
+bool operator==( const QSGGradient&, const QSGGradient& ); |
| 208 |
+bool operator!=( const QSGGradient&, const QSGGradient& ); |
| 209 |
+QString toQString( const QSGGradient& arrow ); |
| 210 |
+QSGGradient toQSGGradient( const QString& string ); |
| 211 |
|
| 212 |
|
| 213 |
//-------------------------------------------------------------// |
| 214 |
diff -Naur qmatplot-0.4.2/src/widgets/qssegment.h qmatplot-0.4.2.new/src/widgets/qssegment.h |
| 215 |
--- qmatplot-0.4.2/src/widgets/qssegment.h 2003-03-11 07:07:49.000000000 -0500 |
| 216 |
+++ qmatplot-0.4.2.new/src/widgets/qssegment.h 2008-04-19 09:35:36.000000000 -0400 |
| 217 |
@@ -205,7 +205,7 @@ |
| 218 |
QSPt2f m_prev; |
| 219 |
QSPt2f m_prev_prev; |
| 220 |
QSGLine curr_line; |
| 221 |
- void get_stair( const QSPt2f& pos, QSPt2f pos[3] ); |
| 222 |
+ void get_stair( const QSPt2f& pos, QSPt2f pts[3] ); |
| 223 |
}; |
| 224 |
|
| 225 |
#endif |
| 226 |
|
| 227 |
|
| 228 |
|
| 229 |
-- |
| 230 |
gentoo-commits@l.g.o mailing list |
Archives