packages: lignumCAD/lignumCAD-gcc3.patch, lignumCAD/lignumCAD-gcc34.patch (...
gotar
gotar at pld-linux.org
Wed Sep 15 20:37:01 CEST 2010
Author: gotar Date: Wed Sep 15 18:37:01 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- more GCC fixes
---- Files affected:
packages/lignumCAD:
lignumCAD-gcc3.patch (1.2 -> 1.3) , lignumCAD-gcc34.patch (NONE -> 1.1) (NEW), lignumCAD-gcc41.patch (NONE -> 1.1) (NEW), lignumCAD-gcc42.patch (NONE -> 1.1) (NEW), lignumCAD-gcc44.patch (NONE -> 1.1) (NEW), lignumCAD-gcc4.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/lignumCAD/lignumCAD-gcc3.patch
diff -u packages/lignumCAD/lignumCAD-gcc3.patch:1.2 packages/lignumCAD/lignumCAD-gcc3.patch:1.3
--- packages/lignumCAD/lignumCAD-gcc3.patch:1.2 Sun Jul 11 16:19:06 2010
+++ packages/lignumCAD/lignumCAD-gcc3.patch Wed Sep 15 20:36:55 2010
@@ -954,3 +954,120 @@
InputObject* createInput ( void ) { return 0; }
InputObject* modifyInput ( void );
+diff -urp lignumCAD.pld/centerlineview.cpp lignumCAD.pld2/centerlineview.cpp
+--- lignumCAD.pld/centerlineview.cpp 2002-12-04 14:47:01.000000000 +0100
++++ lignumCAD.pld2/centerlineview.cpp 2010-09-15 20:11:07.000000000 +0200
+@@ -330,7 +330,7 @@ namespace Space2D {
+ dynamic_cast< FigureView* >( centerline_view_->parent()->
+ figureSelectionNames()[ (*f).second[0] ] );
+
+- vector<GLuint>::const_iterator g;
++ std::vector<GLuint>::const_iterator g;
+
+ for ( g = (*f).second.begin(); g != (*f).second.end(); ++g ) {
+
+@@ -566,7 +566,7 @@ namespace Space2D {
+
+ if ( fv == centerline_view_ ) continue;
+
+- vector<GLuint>::const_iterator g;
++ std::vector<GLuint>::const_iterator g;
+
+ for ( g = (*f).second.begin(); g != (*f).second.end(); ++g ) {
+
+@@ -1095,7 +1095,7 @@ namespace Space2D {
+ return centerline_->dbURL();
+ }
+
+- QString CenterlineView::selectionText ( const vector<GLuint>& /*selection_name*/,
++ QString CenterlineView::selectionText ( const std::vector<GLuint>& /*selection_name*/,
+ SelectionEntity /*entity*/ ) const
+ {
+ return centerline_->name();
+@@ -1124,7 +1124,7 @@ namespace Space2D {
+ }
+
+ void CenterlineView::setHighlighted( bool highlight, SelectionEntity entity,
+- const vector<GLuint>& items )
++ const std::vector<GLuint>& items )
+ {
+ if (entity == FIGURE ) {
+ DimensionView* dmv = 0;
+@@ -1144,7 +1144,7 @@ namespace Space2D {
+ }
+
+ void CenterlineView::setActivated( bool activate, SelectionEntity entity,
+- const vector<GLuint>& items )
++ const std::vector<GLuint>& items )
+ {
+ if ( entity == FIGURE ) {
+ DimensionView* dmv = 0;
+diff -urp lignumCAD.pld/line.h lignumCAD.pld2/line.h
+--- lignumCAD.pld/line.h 2010-09-15 19:08:46.000000000 +0200
++++ lignumCAD.pld2/line.h 2010-09-15 20:09:32.000000000 +0200
+@@ -66,7 +66,7 @@ namespace Space2D {
+ // void modifiedPosition ();
+ };
+
+- ostream& operator<< ( ostream& o, Line* line );
++ std::ostream& operator<< ( std::ostream& o, Line* line );
+
+ class Axis : public Line {
+ Q_OBJECT
+diff -urp lignumCAD.pld/rectangleview.cpp lignumCAD.pld2/rectangleview.cpp
+--- lignumCAD.pld/rectangleview.cpp 2002-12-04 14:48:10.000000000 +0100
++++ lignumCAD.pld2/rectangleview.cpp 2010-09-15 20:12:55.000000000 +0200
+@@ -581,7 +581,7 @@ namespace Space2D {
+ dynamic_cast< FigureView* >( rectangle_view_->parent()->
+ figureSelectionNames()[ (*f).second[0] ] );
+
+- vector<GLuint>::const_iterator g;
++ std::vector<GLuint>::const_iterator g;
+
+ for ( g = (*f).second.begin(); g != (*f).second.end(); ++g ) {
+
+@@ -627,7 +627,7 @@ namespace Space2D {
+ dynamic_cast< FigureView* >( rectangle_view_->parent()->
+ figureSelectionNames()[ (*f).second[0] ] );
+
+- vector<GLuint>::const_iterator g;
++ std::vector<GLuint>::const_iterator g;
+
+ for ( g = (*f).second.begin(); g != (*f).second.end(); ++g ) {
+
+@@ -854,7 +854,7 @@ namespace Space2D {
+
+ if ( fv == rectangle_view_ ) continue;
+
+- vector<GLuint>::const_iterator g;
++ std::vector<GLuint>::const_iterator g;
+
+ for ( g = (*f).second.begin(); g != (*f).second.end(); ++g ) {
+
+@@ -1744,7 +1744,7 @@ namespace Space2D {
+ return rectangle_->dbURL();
+ }
+
+- QString RectangleView::selectionText ( const vector<GLuint>& selection_name,
++ QString RectangleView::selectionText ( const std::vector<GLuint>& selection_name,
+ SelectionEntity entity ) const
+ {
+ QString text;
+@@ -1794,7 +1794,7 @@ namespace Space2D {
+
+
+ void RectangleView::setHighlighted ( bool highlight, SelectionEntity entity,
+- const vector<GLuint>& items )
++ const std::vector<GLuint>& items )
+ {
+ if ( entity == FIGURE ) {
+ DimensionView* dmv = 0;
+@@ -1814,7 +1814,7 @@ namespace Space2D {
+ }
+
+ void RectangleView::setActivated ( bool activate, SelectionEntity entity,
+- const vector<GLuint>& items )
++ const std::vector<GLuint>& items )
+ {
+ if ( entity == FIGURE ) {
+ DimensionView* dmv = 0;
================================================================
Index: packages/lignumCAD/lignumCAD-gcc34.patch
diff -u /dev/null packages/lignumCAD/lignumCAD-gcc34.patch:1.1
--- /dev/null Wed Sep 15 20:37:01 2010
+++ packages/lignumCAD/lignumCAD-gcc34.patch Wed Sep 15 20:36:55 2010
@@ -0,0 +1,39 @@
+diff -urp lignumCAD.pld/openglbase.h lignumCAD.pld2/openglbase.h
+--- lignumCAD.pld/openglbase.h 2002-09-11 22:53:07.000000000 +0200
++++ lignumCAD.pld2/openglbase.h 2010-09-15 19:36:16.000000000 +0200
+@@ -60,10 +60,10 @@ struct FaceData {
+ QRgb color_;
+
+ //! Horizontal justification of rendered text. Default is ORIGIN.
+- enum lC::HorizontalJustification horizontal_justification_;
++ lC::HorizontalJustification horizontal_justification_;
+
+ //! Vertical justification of rendered text. Default is BASELINE.
+- enum lC::VerticalJustification vertical_justification_;
++ lC::VerticalJustification vertical_justification_;
+
+ //! Scale of the view (matters to outline faces).
+ Ratio scale_;
+diff -urp lignumCAD.pld/style.h lignumCAD.pld2/style.h
+--- lignumCAD.pld/style.h 2002-09-25 15:36:30.000000000 +0200
++++ lignumCAD.pld2/style.h 2010-09-15 20:11:42.000000000 +0200
+@@ -107,7 +107,7 @@ public:
+
+ private:
+ //! The general style.
+- enum lC::Render::Style style_;
++ lC::Render::Style style_;
+ //! A custom edge stipple style.
+ enum lC::Edge::Style edge_;
+ //! Custom outline color.
+diff -urp lignumCAD.pld/viewdata.h lignumCAD.pld2/viewdata.h
+--- lignumCAD.pld/viewdata.h 2002-09-13 15:29:34.000000000 +0200
++++ lignumCAD.pld2/viewdata.h 2010-09-15 19:35:49.000000000 +0200
+@@ -27,7 +27,6 @@
+ #include "vectoralgebra.h"
+
+ class QDomElement;
+-enum Space;
+
+ /*!
+ * Save the information which (minimally) describes the current
================================================================
Index: packages/lignumCAD/lignumCAD-gcc41.patch
diff -u /dev/null packages/lignumCAD/lignumCAD-gcc41.patch:1.1
--- /dev/null Wed Sep 15 20:37:01 2010
+++ packages/lignumCAD/lignumCAD-gcc41.patch Wed Sep 15 20:36:55 2010
@@ -0,0 +1,24 @@
+diff -urp lignumCAD.pld/openglbase.h lignumCAD.pld2/openglbase.h
+--- lignumCAD.pld/openglbase.h 2002-09-11 22:53:07.000000000 +0200
++++ lignumCAD.pld2/openglbase.h 2010-09-15 19:36:16.000000000 +0200
+@@ -383,7 +383,7 @@ private:
+ * \param a value to convert.
+ * \return smallest power of two which is greater than or equal to a.
+ */
+- uint OpenGLBase::nearestPowerCeil ( unsigned int a );
++ uint nearestPowerCeil ( unsigned int a );
+ };
+
+ /*!
+diff -urp lignumCAD.pld/openglview.cpp lignumCAD.pld2/openglview.cpp
+--- lignumCAD.pld/openglview.cpp 2002-12-04 15:20:48.000000000 +0100
++++ lignumCAD.pld2/openglview.cpp 2010-09-15 19:58:14.000000000 +0200
+@@ -53,7 +53,7 @@ public:
+ /*!
+ * Constructor takes the usual arguments defining the old and new state.
+ */
+- ChangeViewCommand::ChangeViewCommand ( const QString& name,
++ ChangeViewCommand ( const QString& name,
+ const PageView* page_view,
+ const ViewData& old_view,
+ const ViewData& new_view )
================================================================
Index: packages/lignumCAD/lignumCAD-gcc42.patch
diff -u /dev/null packages/lignumCAD/lignumCAD-gcc42.patch:1.1
--- /dev/null Wed Sep 15 20:37:01 2010
+++ packages/lignumCAD/lignumCAD-gcc42.patch Wed Sep 15 20:36:55 2010
@@ -0,0 +1,45 @@
+diff -urp lignumCAD.pld/gl2ps.h lignumCAD.pld2/gl2ps.h
+--- lignumCAD.pld/gl2ps.h 2002-06-14 19:52:59.000000000 +0200
++++ lignumCAD.pld2/gl2ps.h 2010-09-15 20:03:48.000000000 +0200
+@@ -213,7 +213,7 @@ GLvoid gl2psBeginPage(GLint format,
+ GLint colormode, GLint colorsize, GL2PSrgba *colormap,
+ GLint buffersize, void * stream);
+ #endif
+-GLint gl2psEndPage(GLvoid);
++GLint gl2psEndPage(void);
+ GLvoid gl2psText(char *str, char *fontname, GLint size);
+ GLvoid gl2psEnable(GLint mode);
+ GLvoid gl2psDisable(GLint mode);
+@@ -222,9 +222,9 @@ GLvoid gl2psLineWidth(GLfloat value);
+ GLvoid gl2psLineStipple(GLuint mode);
+
+ #ifdef GL2PS_USE_QT
+-GLvoid gl2psPrintQtHeader ( GLvoid );
++GLvoid gl2psPrintQtHeader ( void );
+ GLvoid gl2psPrintQtPrimitive ( GLvoid* a, GLvoid* b );
+-GLvoid gl2psPrintQtFooter ( GLvoid );
++GLvoid gl2psPrintQtFooter ( void );
+ #endif
+
+ #ifdef __cplusplus
+diff -urp lignumCAD.pld/gl2ps_qt.cpp lignumCAD.pld2/gl2ps_qt.cpp
+--- lignumCAD.pld/gl2ps_qt.cpp 2010-09-15 19:08:46.000000000 +0200
++++ lignumCAD.pld2/gl2ps_qt.cpp 2010-09-15 20:13:39.000000000 +0200
+@@ -98,7 +98,7 @@ extern "C" {
+ * Screen Coord[DOTS] * Printer window[DOTS] = Printer Coord[DOTS]
+ * This also takes care of the aspect ratio of the printer window.
+ */
+- GLvoid gl2psPrintQtHeader ( GLvoid )
++ GLvoid gl2psPrintQtHeader ( void )
+ {
+ painter = reinterpret_cast<QPainter*>( gl2ps.stream );
+
+@@ -206,7 +206,7 @@ extern "C" {
+ }
+ }
+
+- GLvoid gl2psPrintQtFooter ( GLvoid )
++ GLvoid gl2psPrintQtFooter ( void )
+ {
+ painter->restore();
+ }
================================================================
Index: packages/lignumCAD/lignumCAD-gcc44.patch
diff -u /dev/null packages/lignumCAD/lignumCAD-gcc44.patch:1.1
--- /dev/null Wed Sep 15 20:37:01 2010
+++ packages/lignumCAD/lignumCAD-gcc44.patch Wed Sep 15 20:36:55 2010
@@ -0,0 +1,12 @@
+diff -urp lignumCAD.pld/openglview.cpp lignumCAD.pld2/openglview.cpp
+--- lignumCAD.pld/openglview.cpp 2002-12-04 15:20:48.000000000 +0100
++++ lignumCAD.pld2/openglview.cpp 2010-09-15 19:58:14.000000000 +0200
+@@ -81,7 +81,7 @@ public:
+ ChangeViewCommand* change_view = dynamic_cast< ChangeViewCommand* >( command);
+
+ if ( db_url_ == change_view->db_url_ &&
+- old_view_ != change_view->new_view_ ) {
++ !( old_view_ == change_view->new_view_ )) {
+ new_view_ = change_view->new_view_;
+ return true;
+ }
================================================================
Index: packages/lignumCAD/lignumCAD-gcc4.patch
diff -u /dev/null packages/lignumCAD/lignumCAD-gcc4.patch:1.1
--- /dev/null Wed Sep 15 20:37:01 2010
+++ packages/lignumCAD/lignumCAD-gcc4.patch Wed Sep 15 20:36:55 2010
@@ -0,0 +1,54 @@
+diff -urp lignumCAD.pld/constants.h lignumCAD.pld2/constants.h
+--- lignumCAD.pld/constants.h 2002-12-13 13:37:41.000000000 +0100
++++ lignumCAD.pld2/constants.h 2010-09-15 20:07:16.000000000 +0200
+@@ -720,7 +720,7 @@ namespace lC {
+ const QString URL = "url";
+ const QString VALUE = "value";
+ const QString VALUE_UNIT = "%1%2";
+- const QString VERSION = "version";
++ const QString LVERSION = "version";
+ const QString VIEW_DATA = "view-data";
+ const QString VIEW_POINT = "view-point";
+ const QString VIEW = "view";
+diff -urp lignumCAD.pld/designbookview.cpp lignumCAD.pld2/designbookview.cpp
+--- lignumCAD.pld/designbookview.cpp 2010-09-15 19:08:46.000000000 +0200
++++ lignumCAD.pld2/designbookview.cpp 2010-09-15 19:55:08.000000000 +0200
+@@ -1666,7 +1666,7 @@ bool DesignBookView::read ( const QStrin
+ return false;
+ }
+ else {
+- uint file_version = docElement.attribute( lC::STR::VERSION ).toUInt();
++ uint file_version = docElement.attribute( lC::STR::LVERSION ).toUInt();
+ if ( file_version < lC::FILE_VERSION ) {
+ qApp->restoreOverrideCursor();
+
+@@ -1811,7 +1811,7 @@ bool DesignBookView::write ( void )
+
+ QDomDocument document( lC::STR::LIGNUMCAD );
+ QDomElement root = document.createElement( lC::STR::LIGNUMCAD );
+- root.setAttribute( lC::STR::VERSION, lC::FILE_VERSION );
++ root.setAttribute( lC::STR::LVERSION, lC::FILE_VERSION );
+ document.appendChild( root );
+
+ // First, the model geometric data...
+diff -urp lignumCAD.pld/model.cpp lignumCAD.pld2/model.cpp
+--- lignumCAD.pld/model.cpp 2002-12-13 13:34:22.000000000 +0100
++++ lignumCAD.pld2/model.cpp 2010-09-15 20:08:12.000000000 +0200
+@@ -98,7 +98,7 @@ void Model::restoreMetadata ( const QDom
+ else if ( e.tagName() == lC::STR::MODIFIED ) {
+ modified_ = QDateTime::fromString( e.attribute( lC::STR::VALUE ), Qt::ISODate );
+ }
+- else if ( e.tagName() == lC::STR::VERSION ) {
++ else if ( e.tagName() == lC::STR::LVERSION ) {
+ version_ = e.attribute( lC::STR::VALUE ).toUInt();
+ }
+ else if ( e.tagName() == lC::STR::REVISION ) {
+@@ -546,7 +546,7 @@ void Model::write ( QDomElement& xml_rep
+ modified_element.setAttribute( lC::STR::VALUE, modified_.toString( Qt::ISODate ) );
+ metadata_element.appendChild( modified_element );
+
+- QDomElement version_element = document.createElement( lC::STR::VERSION );
++ QDomElement version_element = document.createElement( lC::STR::LVERSION );
+ version_element.setAttribute( lC::STR::VALUE, version_ );
+ metadata_element.appendChild( version_element );
+
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lignumCAD/lignumCAD-gcc3.patch?r1=1.2&r2=1.3&f=u
More information about the pld-cvs-commit
mailing list