diff options
| -rw-r--r-- | science/gnudatalanguage/Makefile | 4 | ||||
| -rw-r--r-- | science/gnudatalanguage/files/patch-src_gdlgstream.hpp | 11 | ||||
| -rw-r--r-- | science/gnudatalanguage/files/patch-src_gdlwidget.cpp | 11 | ||||
| -rw-r--r-- | science/gnudatalanguage/files/patch-src_gdlwidget.hpp | 22 |
4 files changed, 46 insertions, 2 deletions
diff --git a/science/gnudatalanguage/Makefile b/science/gnudatalanguage/Makefile index 9d14cd33f953..24c041c47eab 100644 --- a/science/gnudatalanguage/Makefile +++ b/science/gnudatalanguage/Makefile @@ -3,7 +3,7 @@ PORTNAME= gnudatalanguage DISTVERSION= 0.9.7 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= science lang MASTER_SITES= SF/${PORTNAME}/gdl/${PORTVERSION} .if defined(BUILD_PYTHON_MODULE) @@ -22,7 +22,7 @@ LIB_DEPENDS+= libplplot.so:math/plplot \ libps.so:print/pslib \ libgsl.so:math/gsl -USE_WX= 2.8 +USE_WX= 3.0+ USE_XORG= x11 sm ice xext USES= cmake:outsource compiler:gcc-c++11-lib dos2unix ncurses pkgconfig readline tar:tgz diff --git a/science/gnudatalanguage/files/patch-src_gdlgstream.hpp b/science/gnudatalanguage/files/patch-src_gdlgstream.hpp new file mode 100644 index 000000000000..e6ed9cde41e0 --- /dev/null +++ b/science/gnudatalanguage/files/patch-src_gdlgstream.hpp @@ -0,0 +1,11 @@ +--- src/gdlgstream.hpp.orig 2017-05-19 17:32:58 UTC ++++ src/gdlgstream.hpp +@@ -199,7 +199,7 @@ public: + const char **devnames = NULL; + #endif + +- static vector<std::string> devNames; ++ static std::vector<std::string> devNames; + + // do only once + if( devNames.empty()) diff --git a/science/gnudatalanguage/files/patch-src_gdlwidget.cpp b/science/gnudatalanguage/files/patch-src_gdlwidget.cpp new file mode 100644 index 000000000000..9a20419fb795 --- /dev/null +++ b/science/gnudatalanguage/files/patch-src_gdlwidget.cpp @@ -0,0 +1,11 @@ +--- src/gdlwidget.cpp.orig 2017-05-19 17:32:58 UTC ++++ src/gdlwidget.cpp +@@ -2455,7 +2455,7 @@ BaseGDL* GDLWidgetTable::GetTableValuesA + } + else { //use the wxWidget selection or the passed selection, mode-dependent: + if (disjointSelection) { //pairs lists +- vector<wxPoint> list; ++ std::vector<wxPoint> list; + if (selection->Rank()==0) { //use current wxWidgets selection. Result is a STRUCT + list=grid->GetSelectedDisjointCellsList(); + } else { //make equivalent vector. diff --git a/science/gnudatalanguage/files/patch-src_gdlwidget.hpp b/science/gnudatalanguage/files/patch-src_gdlwidget.hpp new file mode 100644 index 000000000000..375edfb702ca --- /dev/null +++ b/science/gnudatalanguage/files/patch-src_gdlwidget.hpp @@ -0,0 +1,22 @@ +--- src/gdlwidget.hpp.orig 2017-05-19 17:32:58 UTC ++++ src/gdlwidget.hpp +@@ -275,7 +275,7 @@ protected: + long alignment; //alignment of the widget + long widgetStyle; //style (alignment code + other specific codes used as option to widgetsizer) + int dynamicResize; //for some widgets, will enable resizing: -1: not resizable, 0/1 resizable +- vector<WidgetIDT> followers; //all the widgets that use me as group_leader ++ std::vector<WidgetIDT> followers; //all the widgets that use me as group_leader + + + private: +@@ -1256,8 +1256,8 @@ public: + if ( selectionCol.GetCount() > 0 ) return TRUE; + return FALSE; + } +- vector<wxPoint> GetSelectedDisjointCellsList(){ +- vector<wxPoint> list; ++ std::vector<wxPoint> GetSelectedDisjointCellsList(){ ++ std::vector<wxPoint> list; + wxGridCellCoordsArray cellSelection=this->GetSelectedCells(); + for( int i=0; i<cellSelection.Count(); i++ ) { + int row = cellSelection[i].GetRow(); |