diff options
Diffstat (limited to 'math/plplot/files')
-rw-r--r-- | math/plplot/files/patch-bindings__tk__tkMain.c | 13 | ||||
-rw-r--r-- | math/plplot/files/patch-cmake_modules_FindVGA.cmake | 15 | ||||
-rw-r--r-- | math/plplot/files/patch-cmake_modules_csiro.cmake | 13 | ||||
-rw-r--r-- | math/plplot/files/patch-cmake_modules_instdirs.cmake | 45 | ||||
-rw-r--r-- | math/plplot/files/patch-cmake_modules_pkg-config.cmake | 19 |
5 files changed, 0 insertions, 105 deletions
diff --git a/math/plplot/files/patch-bindings__tk__tkMain.c b/math/plplot/files/patch-bindings__tk__tkMain.c deleted file mode 100644 index fdcbc798ec23..000000000000 --- a/math/plplot/files/patch-bindings__tk__tkMain.c +++ /dev/null @@ -1,13 +0,0 @@ ---- bindings/tk/tkMain.c.orig 2015-04-12 10:08:04 UTC -+++ bindings/tk/tkMain.c -@@ -90,10 +90,6 @@ EXTERN int Tcl_Import _ANSI_ARGS_( ( Tcl - int allowOverwrite ) ); - #endif - --#ifndef Tcl_GetGlobalNamespace_TCL_DECLARE --EXTERN Tcl_Namespace * Tcl_GetGlobalNamespace _ANSI_ARGS_( ( -- Tcl_Interp * interp ) ); --#endif - - // - // Declarations for various library procedures and variables (don't want diff --git a/math/plplot/files/patch-cmake_modules_FindVGA.cmake b/math/plplot/files/patch-cmake_modules_FindVGA.cmake deleted file mode 100644 index b2f3e84b8694..000000000000 --- a/math/plplot/files/patch-cmake_modules_FindVGA.cmake +++ /dev/null @@ -1,15 +0,0 @@ ---- cmake/modules/FindVGA.cmake.orig 2015-04-12 10:08:04 UTC -+++ cmake/modules/FindVGA.cmake -@@ -6,7 +6,6 @@ - # VGA_LIBRARIES, the libraries to link against to use the vga library - # VGA_LIBRARY_DIRS, the directory where the vga library is found. - --if(CMAKE_SYSTEM_NAME STREQUAL "Linux") - find_path(VGA_INCLUDE_DIR vga.h /usr/local/include /usr/include) - - if(VGA_INCLUDE_DIR) -@@ -33,4 +32,3 @@ else(VGA_FOUND) - message(FATAL_ERROR "FindVGA: Could not find vga.h and/or the vga library") - endif(VGA_FIND_REQUIRED) - endif(VGA_FOUND) --endif(CMAKE_SYSTEM_NAME STREQUAL "Linux") diff --git a/math/plplot/files/patch-cmake_modules_csiro.cmake b/math/plplot/files/patch-cmake_modules_csiro.cmake deleted file mode 100644 index c9ca2793f084..000000000000 --- a/math/plplot/files/patch-cmake_modules_csiro.cmake +++ /dev/null @@ -1,13 +0,0 @@ ---- cmake/modules/csiro.cmake.orig 2015-04-12 10:08:04 UTC -+++ cmake/modules/csiro.cmake -@@ -36,6 +36,10 @@ if(PL_HAVE_QHULL OR WITH_CSA) - else(CMAKE_C_COMPILER MATCHES "gcc") - set(NAN_CFLAGS "${NAN_CFLAGS} -ieee") - endif(CMAKE_C_COMPILER MATCHES "gcc") -+ else(CMAKE_SYSTEM_PROCESSOR MATCHES "alpha.*") -+ if(CMAKE_SYSTEM_PROCESSOR MATCHES "amd64") -+ set(NAN_CFLAGS "${NAN_CFLAGS} -mieee-fp") -+ endif(CMAKE_SYSTEM_PROCESSOR MATCHES "amd64") - endif(CMAKE_SYSTEM_PROCESSOR MATCHES "alpha.*") - endif(CMAKE_SYSTEM_PROCESSOR MATCHES "i[0-9]86") - if(NOT DEFINED NaNAwareCCompiler) diff --git a/math/plplot/files/patch-cmake_modules_instdirs.cmake b/math/plplot/files/patch-cmake_modules_instdirs.cmake deleted file mode 100644 index 9887aebee869..000000000000 --- a/math/plplot/files/patch-cmake_modules_instdirs.cmake +++ /dev/null @@ -1,45 +0,0 @@ ---- cmake/modules/instdirs.cmake.orig 2015-04-12 10:08:04 UTC -+++ cmake/modules/instdirs.cmake -@@ -61,13 +61,13 @@ CACHE PATH "install location for C heade - - set( - CMAKE_INSTALL_INFODIR --${CMAKE_INSTALL_DATADIR}/info -+${CMAKE_INSTALL_PREFIX}/info - CACHE PATH "install location for info documentation" - ) - - set( - CMAKE_INSTALL_MANDIR --${CMAKE_INSTALL_DATADIR}/man -+${CMAKE_INSTALL_PREFIX}/man - CACHE PATH "install location for man documentation" - ) - -@@ -75,7 +75,7 @@ CACHE PATH "install location for man doc - # cached values above. - - # Data. --set(DATA_DIR ${CMAKE_INSTALL_DATADIR}/${PACKAGE}${PLPLOT_VERSION}) -+set(DATA_DIR ${CMAKE_INSTALL_DATADIR}/${PACKAGE}) - - # Libraries. - set(LIB_DIR ${CMAKE_INSTALL_LIBDIR}) -@@ -90,7 +90,7 @@ set(BIN_DIR ${CMAKE_INSTALL_BINDIR}) - set(SHLIB_DIR ${CMAKE_INSTALL_LIBDIR}) - - # Tcl files. --set(TCL_DIR ${CMAKE_INSTALL_DATADIR}/${PACKAGE}${PLPLOT_VERSION}/tcl) -+set(TCL_DIR ${CMAKE_INSTALL_DATADIR}/${PACKAGE}/tcl) - - # Ada source files (*.adb, *.ads) (following recommendations in - # http://www.ada-france.org/debian/debian-ada-policy.html -@@ -101,7 +101,7 @@ set(ADA_INCLUDE_DIR ${CMAKE_INSTALL_DATA - set(ADA_LIB_DIR ${CMAKE_INSTALL_LIBDIR}/ada/adalib/plplotada) - - # Drivers. --set(DRV_DIR ${CMAKE_INSTALL_LIBDIR}/${PACKAGE}${PLPLOT_VERSION}/drivers) -+set(DRV_DIR ${CMAKE_INSTALL_LIBDIR}/${PACKAGE}/drivers) - - # Documentation. - set(DOC_DIR ${CMAKE_INSTALL_DATADIR}/doc/${PACKAGE}) diff --git a/math/plplot/files/patch-cmake_modules_pkg-config.cmake b/math/plplot/files/patch-cmake_modules_pkg-config.cmake deleted file mode 100644 index f8c26a8037db..000000000000 --- a/math/plplot/files/patch-cmake_modules_pkg-config.cmake +++ /dev/null @@ -1,19 +0,0 @@ -The *internal* _pkg_check_modules_internal macro of cmake gained another -parameter in cmake-3.13. - -https://gitlab.kitware.com/cmake/cmake/commit/7aa26cf0e9319be3f7785763eb3699823453eb60 - ---- cmake/modules/pkg-config.cmake.orig 2018-11-25 12:01:15 UTC -+++ cmake/modules/pkg-config.cmake -@@ -122,8 +122,10 @@ macro(pkg_check_pkgconfig _package _include_DIR _link_ - _pkg_check_modules_internal(0 0 ${_prefix} "${_package}") - elseif(CMAKE_VERSION VERSION_LESS "3.6") - _pkg_check_modules_internal(0 0 0 0 ${_prefix} "${_package}") -- else(CMAKE_VERSION VERSION_LESS "3.1") -+ elseif(CMAKE_VERSION VERSION_LESS "3.13") - _pkg_check_modules_internal(0 0 0 0 0 ${_prefix} "${_package}") -+ else(CMAKE_VERSION VERSION_LESS "3.1") -+ _pkg_check_modules_internal(0 0 0 0 0 0 ${_prefix} "${_package}") - endif(CMAKE_VERSION VERSION_LESS "3.1") - - if(${_prefix}_FOUND) |