diff options
| author | Thierry Thomas <thierry@FreeBSD.org> | 2017-05-31 20:48:06 +0000 |
|---|---|---|
| committer | Thierry Thomas <thierry@FreeBSD.org> | 2017-05-31 20:48:06 +0000 |
| commit | e284042434359a4f69f3e332ed1fb11e1f719a70 (patch) | |
| tree | e21aceb1601df4bc276793c12810e44f391f3e19 /science | |
| parent | dc1f14e36ec507ed4a4e19d0b6846685fa4718ef (diff) | |
| download | ports-e284042434359a4f69f3e332ed1fb11e1f719a70.tar.gz ports-e284042434359a4f69f3e332ed1fb11e1f719a70.zip | |
Remove a clash due to #include filedlg.h to fix the build with Gcc 6.
PR: 219300
Obtained from: Gilles Duvert (upstream)
Notes
Notes:
svn path=/head/; revision=442265
Diffstat (limited to 'science')
| -rw-r--r-- | science/gnudatalanguage/Makefile | 2 | ||||
| -rw-r--r-- | science/gnudatalanguage/files/patch-src_dialog.cpp | 14 |
2 files changed, 15 insertions, 1 deletions
diff --git a/science/gnudatalanguage/Makefile b/science/gnudatalanguage/Makefile index 461851fc6802..854f77613bb4 100644 --- a/science/gnudatalanguage/Makefile +++ b/science/gnudatalanguage/Makefile @@ -3,7 +3,7 @@ PORTNAME= gnudatalanguage DISTVERSION= 0.9.7 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= science lang MASTER_SITES= SF/${PORTNAME}/gdl/${PORTVERSION} .if defined(BUILD_PYTHON_MODULE) diff --git a/science/gnudatalanguage/files/patch-src_dialog.cpp b/science/gnudatalanguage/files/patch-src_dialog.cpp new file mode 100644 index 000000000000..be706b95232e --- /dev/null +++ b/science/gnudatalanguage/files/patch-src_dialog.cpp @@ -0,0 +1,14 @@ +--- src/dialog.cpp.orig 2017-05-31 19:49:13 UTC ++++ src/dialog.cpp +@@ -18,8 +18,9 @@ + #include "includefirst.hpp" + + #ifdef HAVE_LIBWXWIDGETS +-#include <wx/filedlg.h> +-#include <wx/msgdlg.h> ++//following includes are 1) not necessary and 2) create a problem with gcc6 ++//#include <wx/filedlg.h> ++//#include <wx/msgdlg.h> + #endif + + #include "envt.hpp" |