diff options
| author | Tobias C. Berner <tcberner@FreeBSD.org> | 2017-04-04 19:26:57 +0000 |
|---|---|---|
| committer | Tobias C. Berner <tcberner@FreeBSD.org> | 2017-04-04 19:26:57 +0000 |
| commit | ac186a582378d935e80b42cd1dd4773d4fa70adb (patch) | |
| tree | 8a8d3dbe5555d8e76a89382b16672b1e869bf9ab /math/labplot/files | |
| parent | e87d9ba048fbc160ce68fef22c7085da1dadac93 (diff) | |
Notes
Diffstat (limited to 'math/labplot/files')
| -rw-r--r-- | math/labplot/files/patch-CMakeLists.txt | 56 | ||||
| -rw-r--r-- | math/labplot/files/patch-src_backend_gsl_parser.tab.c | 13 | ||||
| -rw-r--r-- | math/labplot/files/patch-src_backend_gsl_parser.y | 13 |
3 files changed, 82 insertions, 0 deletions
diff --git a/math/labplot/files/patch-CMakeLists.txt b/math/labplot/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..0670e0beae62 --- /dev/null +++ b/math/labplot/files/patch-CMakeLists.txt @@ -0,0 +1,56 @@ +Make the dependencies on FFTW3, HDF5 and NETCDF toggelable. + +This is a simlified backport of + https://github.com/KDE/labplot/commit/3a3594f077fcc53d725878d3d2c5ef0b263463e4 + +--- CMakeLists.txt.orig 2017-04-04 13:07:03 UTC ++++ CMakeLists.txt +@@ -26,7 +26,13 @@ add_definitions(-fvisibility=default) + cmake_policy(SET CMP0002 OLD) + #cmake_policy(SET CMP0063 NEW) + ++### Options ###################################### ++option(ENABLE_FFTW "Build with FFTW support" "ON") ++option(ENABLE_HDF5 "Build with HDF5 support" "ON") ++option(ENABLE_NETCDF "Build with NetCDF support" "ON") ++ + ### FFTW ###################################### ++IF (ENABLE_FFTW) + FIND_LIBRARY(FFTW_LIBRARIES fftw3 + PATHS + /usr/lib +@@ -49,6 +55,7 @@ IF (FFTW_FOUND) + ELSE (FFTW_FOUND) + MESSAGE (STATUS "FFTW 3 Library not found.") + ENDIF (FFTW_FOUND) ++ENDIF (ENABLE_FFTW) + + ### GSL ###################################### + FIND_LIBRARY(GSL_LIBRARIES gsl +@@ -112,6 +119,7 @@ ELSE (CANTOR_LIBS_FOUND) + ENDIF (CANTOR_LIBS_FOUND) + + ### HDF5 ##################################### ++IF (ENABLE_HDF5) + FIND_LIBRARY(HDF5_LIBRARY hdf5 + PATHS + /usr/lib +@@ -136,8 +144,10 @@ IF (HDF5_FOUND) + ELSE (HDF5_FOUND) + MESSAGE (STATUS "Hierarchical Data Format (HDF) 5 Library not found.") + ENDIF (HDF5_FOUND) ++ENDIF (ENABLE_HDF5) + + ### NETCDF ##################################### ++IF (ENABLE_NETCDF) + FIND_LIBRARY(NETCDF_LIBRARY netcdf + PATHS + /usr/lib +@@ -159,6 +169,7 @@ IF (NETCDF_FOUND) + ELSE (NETCDF_FOUND) + MESSAGE (STATUS "Network Common Data Format (NetCDF) Library not found.") + ENDIF (NETCDF_FOUND) ++ENDIF (ENABLE_NETCDF) + + add_subdirectory(icons) + add_subdirectory(src) diff --git a/math/labplot/files/patch-src_backend_gsl_parser.tab.c b/math/labplot/files/patch-src_backend_gsl_parser.tab.c new file mode 100644 index 000000000000..7ebbb31feb20 --- /dev/null +++ b/math/labplot/files/patch-src_backend_gsl_parser.tab.c @@ -0,0 +1,13 @@ +The function strtod_l is defined in xlocale.h . + +--- src/backend/gsl/parser.tab.c.orig 2017-04-04 13:04:15 UTC ++++ src/backend/gsl/parser.tab.c +@@ -65,7 +65,7 @@ + /* Line 371 of yacc.c */ + #line 3 "parser.y" + +-#include <locale.h> ++#include <xlocale.h> + #include "parser.h" + + /* Line 371 of yacc.c */ diff --git a/math/labplot/files/patch-src_backend_gsl_parser.y b/math/labplot/files/patch-src_backend_gsl_parser.y new file mode 100644 index 000000000000..9a36ec829b21 --- /dev/null +++ b/math/labplot/files/patch-src_backend_gsl_parser.y @@ -0,0 +1,13 @@ +The function strtod_l is defined in xlocale.h . + +--- src/backend/gsl/parser.y.orig 2017-03-29 08:51:19 UTC ++++ src/backend/gsl/parser.y +@@ -1,7 +1,7 @@ + /* LabPlot : parser.y */ + + %{ +-#include <locale.h> ++#include <xlocale.h> + #include "parser.h" + %} + |
