Skip site navigation (1)Skip section navigation (2) 
Date:      Fri, 19 May 2017 18:06:48 +0000 (UTC)
From:      Thierry Thomas <thierry@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r441256 - in head/science/gnudatalanguage: . files
Message-ID:  <201705191806.v4JI6mLs047254@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: thierry
Date: Fri May 19 18:06:48 2017
New Revision: 441256
URL: https://svnweb.freebsd.org/changeset/ports/441256

Log:
  Switch to wxgtk30.
  
  PR:		219300

Added:
  head/science/gnudatalanguage/files/patch-src_gdlgstream.hpp   (contents, props changed)
  head/science/gnudatalanguage/files/patch-src_gdlwidget.cpp   (contents, props changed)
  head/science/gnudatalanguage/files/patch-src_gdlwidget.hpp   (contents, props changed)
Modified:
  head/science/gnudatalanguage/Makefile

Modified: head/science/gnudatalanguage/Makefile
==============================================================================
--- head/science/gnudatalanguage/Makefile	Fri May 19 17:40:15 2017	(r441255)
+++ head/science/gnudatalanguage/Makefile	Fri May 19 18:06:48 2017	(r441256)
@@ -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
 

Added: head/science/gnudatalanguage/files/patch-src_gdlgstream.hpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/science/gnudatalanguage/files/patch-src_gdlgstream.hpp	Fri May 19 18:06:48 2017	(r441256)
@@ -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())

Added: head/science/gnudatalanguage/files/patch-src_gdlwidget.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/science/gnudatalanguage/files/patch-src_gdlwidget.cpp	Fri May 19 18:06:48 2017	(r441256)
@@ -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.

Added: head/science/gnudatalanguage/files/patch-src_gdlwidget.hpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/science/gnudatalanguage/files/patch-src_gdlwidget.hpp	Fri May 19 18:06:48 2017	(r441256)
@@ -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();

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201705191806.v4JI6mLs047254>