[plplot] 67/68: Rediff patches for new version
Ole Streicher
olebole at moszumanska.debian.org
Mon Jul 10 07:38:44 UTC 2017
This is an automated email from the git hooks/post-receive script.
olebole pushed a commit to branch master
in repository plplot.
commit 1b3c43c3c1d7c086e3bf027630f328d256c38955
Author: Ole Streicher <olebole at debian.org>
Date: Wed Jul 5 22:28:04 2017 +0200
Rediff patches for new version
---
debian/patches/Add-Tcl-multiarch.patch | 48 +-
...-for-internal-CMake-3.1-pkg-config-change.patch | 62 --
.../Build-without-non-free-lena-images.patch | 101 ---
debian/patches/Dont-check-for-hdf5.h.patch | 22 +-
debian/patches/Fix-config.h-clash.patch | 100 ---
debian/patches/Fix-lua-includes.patch | 4 +-
debian/patches/Fix-octave-3.8-support.patch | 930 ---------------------
debian/patches/Fix-wxwidgets-linkage.patch | 21 -
debian/patches/Remove-nondfsg-dirs.patch | 6 +-
debian/patches/Set-cmake-policy.patch | 40 -
debian/patches/Unset-python-path.patch | 4 +-
debian/patches/series | 6 -
12 files changed, 29 insertions(+), 1315 deletions(-)
diff --git a/debian/patches/Add-Tcl-multiarch.patch b/debian/patches/Add-Tcl-multiarch.patch
index 7dd11b7..f34cbea 100644
--- a/debian/patches/Add-Tcl-multiarch.patch
+++ b/debian/patches/Add-Tcl-multiarch.patch
@@ -4,17 +4,16 @@ Subject: Add Tcl multiarch
Change the location of tcl binaries to make the packages multiarch compliant.
---
- bindings/tk/CMakeLists.txt | 2 +-
- cmake/modules/instdirs.cmake | 9 +++++++++
- plplot_config.h.in | 3 +++
- src/plctrl.c | 9 +++++++++
- 4 files changed, 22 insertions(+), 1 deletion(-)
+ bindings/tk/CMakeLists.txt | 2 +-
+ plplot_config.h.in | 3 +++
+ src/plctrl.c | 9 +++++++++
+ 3 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/bindings/tk/CMakeLists.txt b/bindings/tk/CMakeLists.txt
-index 8374bf8..c0c6355 100644
+index 8285aa2..399d8af 100644
--- a/bindings/tk/CMakeLists.txt
+++ b/bindings/tk/CMakeLists.txt
-@@ -50,7 +50,7 @@ if(ENABLE_tkX)
+@@ -55,7 +55,7 @@ if(ENABLE_tkX)
install(TARGETS plserver
EXPORT export_plplot
@@ -23,35 +22,8 @@ index 8374bf8..c0c6355 100644
)
endif(ENABLE_tkX)
-diff --git a/cmake/modules/instdirs.cmake b/cmake/modules/instdirs.cmake
-index c68ea54..9f669e2 100644
---- a/cmake/modules/instdirs.cmake
-+++ b/cmake/modules/instdirs.cmake
-@@ -71,6 +71,12 @@ ${CMAKE_INSTALL_DATADIR}/man
- CACHE PATH "install location for man documentation"
- )
-
-+set(
-+CMAKE_INSTALL_LIBEXECDIR
-+${CMAKE_INSTALL_LIBDIR}/${PACKAGE}${VERSION}/bin
-+CACHE PATH "install location for executables called by other executables or libraries"
-+)
-+
- # Configured PLplot install locations determined from user-updatable
- # cached values above.
-
-@@ -112,6 +118,9 @@ set(INFO_DIR ${CMAKE_INSTALL_INFODIR})
- # Man pages.
- set(MAN_DIR ${CMAKE_INSTALL_MANDIR})
-
-+# Libexec.
-+set(LIBEXEC_DIR ${CMAKE_INSTALL_LIBEXECDIR})
-+
- # Other path-related variables.
-
- # Absolute path of top-level build directory.
diff --git a/plplot_config.h.in b/plplot_config.h.in
-index 0274dc8..d63944d 100644
+index 78fafdd..90ec6b9 100644
--- a/plplot_config.h.in
+++ b/plplot_config.h.in
@@ -20,6 +20,9 @@
@@ -65,10 +37,10 @@ index 0274dc8..d63944d 100644
#define BUILD_DIR "@BUILD_DIR@"
diff --git a/src/plctrl.c b/src/plctrl.c
-index 7a241df..fc62557 100644
+index e2f8321..5f032f1 100644
--- a/src/plctrl.c
+++ b/src/plctrl.c
-@@ -2124,6 +2124,7 @@ pl_cmd( PLINT op, void *ptr )
+@@ -2123,6 +2123,7 @@ pl_cmd( PLINT op, void *ptr )
//! current directory
//! PLPLOT_HOME_ENV/bin = $(PLPLOT_HOME)/bin
//! BIN_DIR
@@ -76,7 +48,7 @@ index 7a241df..fc62557 100644
//!
//! The caller must free the returned pointer (points to malloc'ed memory)
//! when finished with it.
-@@ -2190,6 +2191,14 @@ plFindCommand( const char *fn )
+@@ -2189,6 +2190,14 @@ plFindCommand( PLCHAR_VECTOR fn )
return fs;
#endif
diff --git a/debian/patches/Adjust-for-internal-CMake-3.1-pkg-config-change.patch b/debian/patches/Adjust-for-internal-CMake-3.1-pkg-config-change.patch
deleted file mode 100644
index f940d51..0000000
--- a/debian/patches/Adjust-for-internal-CMake-3.1-pkg-config-change.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From: Andrew Ross <andrewross at users.sourceforge.net>
-Date: Mon, 3 Jul 2017 22:39:22 +0200
-Subject: Adjust for internal CMake-3.1 pkg-config change.
-
-commit 772223c638ecf5dc740c9f3dd7a6883c6d2c83d2
-From: Alan W. Irwin <airwin at users.sourceforge.net>
-Date: Sun Dec 7 09:06:08 2014 -0800
-
-There is a report from Greg Jung <gvjung at gmail.com> that the internal CMake
-command
-
-_pkg_check_modules_internal(0 0 ${_prefix} "${_package}")
-
-must be changed to
-
-_pkg_check_modules_internal(0 0 0 0 ${_prefix} "${_package}")
-
-for CMake-3.1 in order to build the cairo device properly. Accordingly, I
-have made that adjustment.
-
-Tested by Alan W. Irwin <airwin at users> on Linux using CMake-3.0.2 by building
-the cairo device.
-
-N.B. currently untested for CMake-3.1.
-
-ToDo:
-
-Extensive tests on CMake-3.1 (once that version is closer to release)
-still need to be done since the change in the pkg-config support by
-CMake may need other adjustments as well.
----
- cmake/modules/pkg-config.cmake | 11 +++++++++--
- 1 file changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/cmake/modules/pkg-config.cmake b/cmake/modules/pkg-config.cmake
-index a6cb929..bbdfea3 100644
---- a/cmake/modules/pkg-config.cmake
-+++ b/cmake/modules/pkg-config.cmake
-@@ -1,6 +1,6 @@
- # cmake/modules/pkg-config.cmake
- #
--# Copyright (C) 2006 Alan W. Irwin
-+# Copyright (C) 2006-2015 Alan W. Irwin
- #
- # This file is part of PLplot.
- #
-@@ -94,7 +94,14 @@ macro(pkg_check_pkgconfig _package _include_DIR _link_DIR _link_FLAGS _cflags _v
- set(_xprefix ${_prefix})
- endif(FORCE_EXTERNAL_STATIC)
-
-- _pkg_check_modules_internal(0 0 ${_prefix} "${_package}")
-+ if(CMAKE_VERSION VERSION_LESS "3.1")
-+ _pkg_check_modules_internal(0 0 ${_prefix} "${_package}")
-+ elseif(CMAKE_VERSION VERSION_LESS "3.6.2")
-+ _pkg_check_modules_internal(0 0 0 0 ${_prefix} "${_package}")
-+ else(CMAKE_VERSION VERSION_LESS "3.6.2")
-+ _pkg_check_modules_internal(0 0 0 0 0 ${_prefix} "${_package}")
-+ endif(CMAKE_VERSION VERSION_LESS "3.6.2")
-+
- if(${_prefix}_FOUND)
- cmake_link_flags(${_link_FLAGS} "${${_xprefix}_LDFLAGS}")
- # If libraries cannot be not found, then that is equivalent to whole
diff --git a/debian/patches/Build-without-non-free-lena-images.patch b/debian/patches/Build-without-non-free-lena-images.patch
deleted file mode 100644
index 4679fc4..0000000
--- a/debian/patches/Build-without-non-free-lena-images.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From: Axel Beckert <abe at debian.org>
-Date: Mon, 3 Jul 2017 22:39:22 +0200
-Subject: Build without non-free lena images
-
----
- examples/CMakeLists.txt | 16 ----------------
- plplot_test/CMakeLists.txt | 22 ----------------------
- scripts/htdocs-gen_plot-examples.sh | 6 ------
- 3 files changed, 44 deletions(-)
-
-diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
-index b8ff0a8..faba42b 100644
---- a/examples/CMakeLists.txt
-+++ b/examples/CMakeLists.txt
-@@ -244,13 +244,6 @@ if(CORE_BUILD)
-
- endif(USE_RPATH)
-
-- # Install lena.pgm in installed examples directory so that all implementations
-- # of example 20 in the various examples subdirectories can conveniently
-- # access this file.
-- install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/lena.pgm
-- DESTINATION ${DATA_DIR}/examples
-- )
--
- endif(CORE_BUILD)
-
- if(CORE_BUILD)
-@@ -453,15 +446,6 @@ foreach(language_info ${language_info_LIST} "tk:tk:nothing")
- endforeach(language_info ${language_info_LIST} "tk:tk:nothing")
-
- if(BUILD_TEST)
-- # lena.pgm needed in build tree for the examples that are run from there.
-- # Done at cmake time without dependencies because cannot see how this
-- # file will ever change on short time scales.
-- execute_process(
-- COMMAND ${CMAKE_COMMAND} -E copy_if_different
-- ${CMAKE_CURRENT_SOURCE_DIR}/lena.pgm
-- ${CMAKE_CURRENT_BINARY_DIR}/lena.pgm
-- )
--
- find_program(VALGRIND_EXECUTABLE valgrind)
- if(VALGRIND_EXECUTABLE)
- option(VALGRIND_ALL_TESTS "Apply valgrind to all runs of plplot_test/plplot-test.sh" OFF)
-diff --git a/plplot_test/CMakeLists.txt b/plplot_test/CMakeLists.txt
-index a54072a..940817d 100644
---- a/plplot_test/CMakeLists.txt
-+++ b/plplot_test/CMakeLists.txt
-@@ -517,28 +517,6 @@ if(SH_EXECUTABLE)
- endif(CMP_EXECUTABLE OR DIFF_EXECUTABLE AND TAIL_EXECUTABLE)
-
- if(BUILD_TEST)
-- # Make a copy of lena.pgm to the test subdirectory of the build
-- # tree so that example 20 will run from there.
-- add_custom_command(
-- OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lena.pgm
-- COMMAND ${CMAKE_COMMAND} -E copy_if_different
-- ${CMAKE_SOURCE_DIR}/examples/lena.pgm
-- ${CMAKE_CURRENT_BINARY_DIR}/lena.pgm
-- DEPENDS ${CMAKE_SOURCE_DIR}/examples/lena.pgm
-- )
-- add_custom_target(lena_file ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/lena.pgm)
-- if(ENABLE_octave)
-- # Also need a copy of lena.img for the octave bindings
-- add_custom_command(
-- OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lena.img
-- COMMAND ${CMAKE_COMMAND} -E copy_if_different
-- ${CMAKE_SOURCE_DIR}/examples/octave/lena.img
-- ${CMAKE_CURRENT_BINARY_DIR}/lena.img
-- DEPENDS ${CMAKE_SOURCE_DIR}/examples/octave/lena.img
-- )
-- add_custom_target(lena_octave_file ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/lena.img)
-- endif(ENABLE_octave)
--
- # Custom target to remove everything created by ctest
- # N.B. the test_output_files_LIST is extremely long and
- # overflows the maximum line length of the shell if you
-diff --git a/scripts/htdocs-gen_plot-examples.sh b/scripts/htdocs-gen_plot-examples.sh
-index bf95c51..c153b2c 100755
---- a/scripts/htdocs-gen_plot-examples.sh
-+++ b/scripts/htdocs-gen_plot-examples.sh
-@@ -77,9 +77,6 @@ export cexamples_dir=`pwd`
- make
- popd
-
--# hack, x20c needs lena in the current directory
--$CP examples/c/lena.pgm .
--
- for exe in 00 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 21 22 \
- 23 24 25 26 27 28 29 30 31 32 33; do
-
-@@ -170,9 +167,6 @@ for exe in 00 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 21 22
-
- done
-
--# remove hack
--rm -f lena.pgm
--
- # create the tarball
- TARBALL=htdocs-plot-demos.tgz
- find htdocs -size 0 -exec rm {} \;
diff --git a/debian/patches/Dont-check-for-hdf5.h.patch b/debian/patches/Dont-check-for-hdf5.h.patch
index c8a9c72..19caed2 100644
--- a/debian/patches/Dont-check-for-hdf5.h.patch
+++ b/debian/patches/Dont-check-for-hdf5.h.patch
@@ -3,14 +3,14 @@ Date: Mon, 3 Jul 2017 22:39:22 +0200
Subject: Dont check for hdf5.h
---
- cmake/modules/octave.cmake | 23 -----------------------
- 1 file changed, 23 deletions(-)
+ cmake/modules/octave.cmake | 25 -------------------------
+ 1 file changed, 25 deletions(-)
diff --git a/cmake/modules/octave.cmake b/cmake/modules/octave.cmake
-index 93ba9ad..7ebae09 100644
+index bf3beb2..0b5132f 100644
--- a/cmake/modules/octave.cmake
+++ b/cmake/modules/octave.cmake
-@@ -173,29 +173,6 @@ if(ENABLE_octave)
+@@ -180,31 +180,6 @@ if(ENABLE_octave)
CACHE INTERNAL ""
)
endif(NOT OCTAVE_INCLUDE_PATH_TRIMMED STREQUAL "${OCTAVE_INCLUDE_PATH}")
@@ -22,21 +22,23 @@ index 93ba9ad..7ebae09 100644
- # with both the Linux and Windows binary versions of octave, it
- # appears that hdf5.h is one external header that is necessary,
- # and it is never part of the octave-${OCTAVE_VERSION}/octave
-- # hierarchy so that PATH_SUFFIXES signature is dropped.
+- # hierarchy.
+- # N.B. Debian jessie octave-dev package depends on
+- # hdf5-dev which stores hdf5.h in /usr/include/hdf5/serial
- find_path(
- OCTAVE_INCLUDE_PATH_EXTERNAL
-- hdf5.h
+- hdf5.h PATH_SUFFIXES hdf5/serial
- )
- if(OCTAVE_INCLUDE_PATH_EXTERNAL)
-- set(OCTAVE_INCLUDE_PATH
+- set(OCTAVE_INCLUDE_PATH
- ${OCTAVE_INCLUDE_PATH_EXTERNAL} ${OCTAVE_INCLUDE_PATH}
- CACHE INTERNAL ""
- )
- else(OCTAVE_INCLUDE_PATH_EXTERNAL)
- message(STATUS "WARNING: "
-- "Required external octave header, hdf5.h, not found. Disabling octave bindings")
-- set(ENABLE_octave OFF CACHE BOOL "Enable Octave bindings" FORCE)
+- "Required external Octave header, hdf5.h, that is typically part of the libhdf5-dev package, has not found. Disabling Octave binding")
+- set(ENABLE_octave OFF CACHE BOOL "Enable Octave binding" FORCE)
- endif(OCTAVE_INCLUDE_PATH_EXTERNAL)
else(OCTAVE_INCLUDE_PATH AND OCTAVE_LIBRARIES AND OCTINTERP_LIBRARIES)
message(STATUS "WARNING: "
- "octave headers and/or library not found. Disabling octave bindings")
+ "The Octave headers and/or library not found. Disabling Octave binding")
diff --git a/debian/patches/Fix-config.h-clash.patch b/debian/patches/Fix-config.h-clash.patch
deleted file mode 100644
index c73f7db..0000000
--- a/debian/patches/Fix-config.h-clash.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From: Andrew Ross <andrewross at users.sourceforge.net>
-Date: Mon, 3 Jul 2017 22:39:22 +0200
-Subject: Fix config.h clash
-
----
- CMakeLists.txt | 2 +-
- bindings/ocaml/CMakeLists.txt | 2 +-
- bindings/ocaml/plcairo/CMakeLists.txt | 2 +-
- examples/CMakeLists.txt | 2 +-
- include/plConfig.h.in | 4 ++--
- plplot_config.h.in | 2 +-
- 6 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2491faa..f8ecd81 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -125,7 +125,7 @@ configure_file(
- ${CMAKE_CURRENT_BINARY_DIR}/plplot_config.h
- )
- # Allow access to the generated plplot_config.h for this build.
--add_definitions("-DHAVE_CONFIG_H")
-+add_definitions("-DPLPLOT_HAVE_CONFIG_H")
- # Install top-level files
-
- # Enable testing framework for examples
-diff --git a/bindings/ocaml/CMakeLists.txt b/bindings/ocaml/CMakeLists.txt
-index e45988e..9ee06b2 100644
---- a/bindings/ocaml/CMakeLists.txt
-+++ b/bindings/ocaml/CMakeLists.txt
-@@ -99,7 +99,7 @@ if(ENABLE_ocaml)
- ${CMAKE_CURRENT_BINARY_DIR}/dllplplot_stubs.so
- ${CMAKE_CURRENT_BINARY_DIR}/libplplot_stubs.a
- COMMAND ${OCAMLC} -ccopt -I${CAMLIDL_LIB_DIR} -c ${CMAKE_CURRENT_BINARY_DIR}/plplot_core_stubs.c
-- COMMAND ${OCAMLC} -ccopt -I${CMAKE_SOURCE_DIR}/include -ccopt -I${CMAKE_BINARY_DIR}/include -ccopt -I${CMAKE_SOURCE_DIR}/lib/qsastime -ccopt -I${CMAKE_BINARY_DIR} -ccopt -I${CAMLIDL_LIB_DIR} -ccopt -DHAVE_CONFIG_H -c ${CMAKE_CURRENT_SOURCE_DIR}/plplot_impl.c
-+ COMMAND ${OCAMLC} -ccopt -I${CMAKE_SOURCE_DIR}/include -ccopt -I${CMAKE_BINARY_DIR}/include -ccopt -I${CMAKE_SOURCE_DIR}/lib/qsastime -ccopt -I${CMAKE_BINARY_DIR} -ccopt -I${CAMLIDL_LIB_DIR} -ccopt -DPLPLOT_HAVE_CONFIG_H -c ${CMAKE_CURRENT_SOURCE_DIR}/plplot_impl.c
- COMMAND ${OCAMLMKLIB} -o plplot_stubs -L${CAMLIDL_LIB_DIR} -lcamlidl -L${CMAKE_BINARY_DIR}/src -lplplot${LIB_TAG} ${CMAKE_CURRENT_BINARY_DIR}/plplot_core_stubs.o ${CMAKE_CURRENT_BINARY_DIR}/plplot_impl.o ${ocaml_STATIC_FLAGS}
- DEPENDS
- ${CMAKE_CURRENT_BINARY_DIR}/plplot_core_stubs.c
-diff --git a/bindings/ocaml/plcairo/CMakeLists.txt b/bindings/ocaml/plcairo/CMakeLists.txt
-index 423ef80..d98acf5 100644
---- a/bindings/ocaml/plcairo/CMakeLists.txt
-+++ b/bindings/ocaml/plcairo/CMakeLists.txt
-@@ -36,7 +36,7 @@ if(ENABLE_ocaml AND OCAML_HAS_CAIRO)
- ${CMAKE_CURRENT_BINARY_DIR}/plcairo_impl.o
- ${CMAKE_CURRENT_BINARY_DIR}/dllplcairo_stubs.so
- ${CMAKE_CURRENT_BINARY_DIR}/libplcairo_stubs.a
-- COMMAND ${OCAMLC} -ccopt "${CAIRO_COMPILE_FLAGS}" -cclib "${CAIRO_LINK_FLAGS}" -ccopt -I${CMAKE_SOURCE_DIR}/include -ccopt -I${CMAKE_BINARY_DIR}/include -ccopt -I${CMAKE_SOURCE_DIR}/lib/qsastime -ccopt -I${CMAKE_BINARY_DIR} -ccopt -DHAVE_CONFIG_H -c ${CMAKE_CURRENT_SOURCE_DIR}/plcairo_impl.c
-+ COMMAND ${OCAMLC} -ccopt "${CAIRO_COMPILE_FLAGS}" -cclib "${CAIRO_LINK_FLAGS}" -ccopt -I${CMAKE_SOURCE_DIR}/include -ccopt -I${CMAKE_BINARY_DIR}/include -ccopt -I${CMAKE_SOURCE_DIR}/lib/qsastime -ccopt -I${CMAKE_BINARY_DIR} -ccopt -DPLPLOT_HAVE_CONFIG_H -c ${CMAKE_CURRENT_SOURCE_DIR}/plcairo_impl.c
- COMMAND ${OCAMLMKLIB} -o plcairo_stubs ${CAIRO_LINK_FLAGS_LIST} -L${CMAKE_BINARY_DIR}/src -lplplot${LIB_TAG} ${CMAKE_CURRENT_BINARY_DIR}/plcairo_impl.o
- DEPENDS
- ${CMAKE_CURRENT_SOURCE_DIR}/plcairo_impl.c
-diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
-index a89553f..51ec58b 100644
---- a/examples/CMakeLists.txt
-+++ b/examples/CMakeLists.txt
-@@ -414,7 +414,7 @@ else(CORE_BUILD)
- endif(CORE_BUILD)
-
- if(CORE_BUILD AND BUILD_TEST)
-- remove_definitions("-DHAVE_CONFIG_H")
-+ remove_definitions("-DPLPLOT_HAVE_CONFIG_H")
- endif(CORE_BUILD AND BUILD_TEST)
-
- # Decide on device to be used for generic interactive tests.
-diff --git a/include/plConfig.h.in b/include/plConfig.h.in
-index 9fbc309..3b99d66 100644
---- a/include/plConfig.h.in
-+++ b/include/plConfig.h.in
-@@ -30,7 +30,7 @@
- // any user applications). Therefore, the configured plConfig.h
- // should be installed. In contrast, plplot_config.h.in (note,
- // plConfig.h #includes plplot_config.h for the core build because
--// HAVE_CONFIG_H is #defined in that case) contains configured macros
-+// PLPLOT_HAVE_CONFIG_H is #defined in that case) contains configured macros
- // that are only required for the core build. Therefore, in contrast
- // to plConfig.h, plplot_config.h should not be installed.
- //
-@@ -44,7 +44,7 @@
- #ifndef __PLCONFIG_H__
- #define __PLCONFIG_H__
-
--#ifdef HAVE_CONFIG_H
-+#ifdef PLPLOT_HAVE_CONFIG_H
- # include <plplot_config.h>
- #endif
-
-diff --git a/plplot_config.h.in b/plplot_config.h.in
-index d63944d..4b889f1 100644
---- a/plplot_config.h.in
-+++ b/plplot_config.h.in
-@@ -3,7 +3,7 @@
- // examples (and presumably any user applications). Therefore, the
- // configured plplot_config.h should not be installed. In contrast,
- // include/plConfig.h.in (note, the configured plConfig.h result
--// #includes plplot_config.h for the core build because HAVE_CONFIG_H
-+// #includes plplot_config.h for the core build because PLPLOT_HAVE_CONFIG_H
- // is #defined in that case) contains configured macros that are
- // required for the core build, installed examples build, and build of
- // user applications. Therefore, in contrast to plplot_config.h,
diff --git a/debian/patches/Fix-lua-includes.patch b/debian/patches/Fix-lua-includes.patch
index 3f36165..b9b9d24 100644
--- a/debian/patches/Fix-lua-includes.patch
+++ b/debian/patches/Fix-lua-includes.patch
@@ -9,10 +9,10 @@ include directories on Debian
1 file changed, 8 insertions(+)
diff --git a/cmake/modules/lua.cmake b/cmake/modules/lua.cmake
-index 73e0a72..034927d 100644
+index 6a910a3..162d920 100644
--- a/cmake/modules/lua.cmake
+++ b/cmake/modules/lua.cmake
-@@ -86,3 +86,11 @@ if(ENABLE_lua)
+@@ -84,3 +84,11 @@ if(ENABLE_lua)
set(LUA_DIR ${LIB_DIR}/lua/${LUA_VERSION}/plplot)
endif(LUA_VERSION MATCHES "5\\.0")
endif(ENABLE_lua)
diff --git a/debian/patches/Fix-octave-3.8-support.patch b/debian/patches/Fix-octave-3.8-support.patch
deleted file mode 100644
index fc18b27..0000000
--- a/debian/patches/Fix-octave-3.8-support.patch
+++ /dev/null
@@ -1,930 +0,0 @@
-From: Andrew Ross <andrewross at users.sourceforge.net>
-Date: Mon, 3 Jul 2017 22:39:22 +0200
-Subject: Fix octave 3.8 support
-
-Upstream patch to fix octave support for octave 3.8.
----
- examples/octave/x01c.m | 2 +-
- examples/octave/x04c.m | 2 +-
- examples/octave/x07c.m | 2 +-
- examples/octave/x08c.m | 4 +-
- examples/octave/x23c.m | 314 +++++++++++++++++++++---------------------
- examples/octave/x26c.m | 2 +-
- examples/octave/x28c.m | 100 +++++++-------
- examples/octave/x29c.m | 4 +-
- examples/octave/x33c.m | 52 ++++---
- plplot_test/test_octave.sh.in | 39 ++++--
- 10 files changed, 262 insertions(+), 259 deletions(-)
-
-diff --git a/examples/octave/x01c.m b/examples/octave/x01c.m
-index 298ee21..5cd9c92 100644
---- a/examples/octave/x01c.m
-+++ b/examples/octave/x01c.m
-@@ -85,7 +85,7 @@ function ix01c(strm)
- printf("\n\nYou are in Locate mode. Click any mouse button or press any key\n\
- and the current cursor position will be printed.\n\
- Please keep <NumLock> and <CapsLock> off.\n\
--Terminate locate mode with the <Enter> key.\n\
-+Terminate locate mode with the <Enter> key.\n\
- Finish the plot with the <Enter> or <ESC> key or the 3d mouse button\n");
-
- fflush(stdout);
-diff --git a/examples/octave/x04c.m b/examples/octave/x04c.m
-index 42c05f7..3be2255 100644
---- a/examples/octave/x04c.m
-+++ b/examples/octave/x04c.m
-@@ -155,7 +155,7 @@ function plot1(type)
-
- plscol0a( 15, 32, 32, 32, 0.70 );
-
-- [legend_width, legend_height] = \
-+ [legend_width, legend_height] = ...
- pllegend( bitor(PL_LEGEND_BACKGROUND, PL_LEGEND_BOUNDING_BOX), 0, 0.0, 0.0,
- 0.1, 15, 1, 1, 0, 0, opt_array, 1.0, 1.0, 2.0,
- 1., text_colors, text,
-diff --git a/examples/octave/x07c.m b/examples/octave/x07c.m
-index 7c7e90f..697baed 100644
---- a/examples/octave/x07c.m
-+++ b/examples/octave/x07c.m
-@@ -24,7 +24,7 @@ function x07c
- ## Initialize plplot */
- plinit();
-
-- base=[0, 100, 0, 100, 200, 500, 600, 700, 800, 900, \
-+ base=[0, 100, 0, 100, 200, 500, 600, 700, 800, 900, ...
- 2000, 2100, 2200, 2300, 2400, 2500, 2600, 2700, 2800, 2900];
-
- plfontld(0);
-diff --git a/examples/octave/x08c.m b/examples/octave/x08c.m
-index e2a544b..e098bee 100644
---- a/examples/octave/x08c.m
-+++ b/examples/octave/x08c.m
-@@ -101,10 +101,10 @@ endfunction
- plmtex("t", 1.0, 0.5, 0.5, title(k,:));
- plcol0(1);
- if (rosen)
-- plw3d(1.0, 1.0, 1.0, -1.5, 1.5, -0.5, 1.5, zmin, zmax, \
-+ plw3d(1.0, 1.0, 1.0, -1.5, 1.5, -0.5, 1.5, zmin, zmax,
- alt(k), az(k));
- else
-- plw3d(1.0, 1.0, 1.0, -1.0, 1.0, -1.0, 1.0, zmin, zmax, \
-+ plw3d(1.0, 1.0, 1.0, -1.0, 1.0, -1.0, 1.0, zmin, zmax,
- alt(k), az(k));
- endif
-
-diff --git a/examples/octave/x23c.m b/examples/octave/x23c.m
-index aa911a2..a2a9871 100644
---- a/examples/octave/x23c.m
-+++ b/examples/octave/x23c.m
-@@ -1,5 +1,3 @@
--## $Id: x23c.m 11680 2011-03-27 17:57:51Z airwin $
--##
- ## Displays Greek letters and mathematically interesting Unicode ranges
- ## Copyright (C) 2005 Alan Irwin
- ## Copyright (C) 2005 Andrew Ross
-@@ -34,186 +32,186 @@ function ix23c(strm)
- endif
-
-
-- Greek = [\
--"#gA";"#gB";"#gG";"#gD";"#gE";"#gZ";"#gY";"#gH";"#gI";"#gK";"#gL";"#gM";\
--"#gN";"#gC";"#gO";"#gP";"#gR";"#gS";"#gT";"#gU";"#gF";"#gX";"#gQ";"#gW";\
--"#ga";"#gb";"#gg";"#gd";"#ge";"#gz";"#gy";"#gh";"#gi";"#gk";"#gl";"#gm";\
--"#gn";"#gc";"#go";"#gp";"#gr";"#gs";"#gt";"#gu";"#gf";"#gx";"#gq";"#gw";\
-+ Greek = [...
-+"#gA";"#gB";"#gG";"#gD";"#gE";"#gZ";"#gY";"#gH";"#gI";"#gK";"#gL";"#gM";
-+"#gN";"#gC";"#gO";"#gP";"#gR";"#gS";"#gT";"#gU";"#gF";"#gX";"#gQ";"#gW";
-+"#ga";"#gb";"#gg";"#gd";"#ge";"#gz";"#gy";"#gh";"#gi";"#gk";"#gl";"#gm";
-+"#gn";"#gc";"#go";"#gp";"#gr";"#gs";"#gt";"#gu";"#gf";"#gx";"#gq";"#gw";
- ];
-
-- Type1 = [\
--0x0020,0x0021,0x0023,0x0025,0x0026,\
--0x0028,0x0029,0x002b,0x002c,0x002e,\
--0x002f,0x0030,0x0031,0x0032,0x0033,\
--0x0034,0x0035,0x0036,0x0037,0x0038,\
--0x0039,0x003a,0x003b,0x003c,0x003d,\
--0x003e,0x003f,0x005b,0x005d,0x005f,\
--0x007b,0x007c,0x007d,0x00a9,0x00ac,\
--0x00ae,0x00b0,0x00b1,0x00d7,0x00f7,\
--0x0192,0x0391,0x0392,0x0393,0x0394,\
--0x0395,0x0396,0x0397,0x0398,0x0399,\
--0x039a,0x039b,0x039c,0x039d,0x039e,\
--0x039f,0x03a0,0x03a1,0x03a3,0x03a4,\
--0x03a5,0x03a6,0x03a7,0x03a8,0x03a9,\
--0x03b1,0x03b2,0x03b3,0x03b4,0x03b5,\
--0x03b6,0x03b7,0x03b8,0x03b9,0x03ba,\
--0x03bb,0x03bc,0x03bd,0x03be,0x03bf,\
--0x03c0,0x03c1,0x03c2,0x03c3,0x03c4,\
--0x03c5,0x03c6,0x03c7,0x03c8,0x03c9,\
--0x03d1,0x03d2,0x03d5,0x03d6,0x2022,\
--0x2026,0x2032,0x2033,0x203e,0x2044,\
--0x2111,0x2118,0x211c,0x2122,0x2126,\
--0x2135,0x2190,0x2191,0x2192,0x2193,\
--0x2194,0x21b5,0x21d0,0x21d1,0x21d2,\
--0x21d3,0x21d4,0x2200,0x2202,0x2203,\
--0x2205,0x2206,0x2207,0x2208,0x2209,\
--0x220b,0x220f,0x2211,0x2212,0x2215,\
--0x2217,0x221a,0x221d,0x221e,0x2220,\
--0x2227,0x2228,0x2229,0x222a,0x222b,\
--0x2234,0x223c,0x2245,0x2248,0x2260,\
--0x2261,0x2264,0x2265,0x2282,0x2283,\
--0x2284,0x2286,0x2287,0x2295,0x2297,\
--0x22a5,0x22c5,0x2320,0x2321,0x2329,\
--0x232a,0x25ca,0x2660,0x2663,0x2665,\
--0x2666,\
-+ Type1 = [...
-+0x0020,0x0021,0x0023,0x0025,0x0026,...
-+0x0028,0x0029,0x002b,0x002c,0x002e,...
-+0x002f,0x0030,0x0031,0x0032,0x0033,...
-+0x0034,0x0035,0x0036,0x0037,0x0038,...
-+0x0039,0x003a,0x003b,0x003c,0x003d,...
-+0x003e,0x003f,0x005b,0x005d,0x005f,...
-+0x007b,0x007c,0x007d,0x00a9,0x00ac,...
-+0x00ae,0x00b0,0x00b1,0x00d7,0x00f7,...
-+0x0192,0x0391,0x0392,0x0393,0x0394,...
-+0x0395,0x0396,0x0397,0x0398,0x0399,...
-+0x039a,0x039b,0x039c,0x039d,0x039e,...
-+0x039f,0x03a0,0x03a1,0x03a3,0x03a4,...
-+0x03a5,0x03a6,0x03a7,0x03a8,0x03a9,...
-+0x03b1,0x03b2,0x03b3,0x03b4,0x03b5,...
-+0x03b6,0x03b7,0x03b8,0x03b9,0x03ba,...
-+0x03bb,0x03bc,0x03bd,0x03be,0x03bf,...
-+0x03c0,0x03c1,0x03c2,0x03c3,0x03c4,...
-+0x03c5,0x03c6,0x03c7,0x03c8,0x03c9,...
-+0x03d1,0x03d2,0x03d5,0x03d6,0x2022,...
-+0x2026,0x2032,0x2033,0x203e,0x2044,...
-+0x2111,0x2118,0x211c,0x2122,0x2126,...
-+0x2135,0x2190,0x2191,0x2192,0x2193,...
-+0x2194,0x21b5,0x21d0,0x21d1,0x21d2,...
-+0x21d3,0x21d4,0x2200,0x2202,0x2203,...
-+0x2205,0x2206,0x2207,0x2208,0x2209,...
-+0x220b,0x220f,0x2211,0x2212,0x2215,...
-+0x2217,0x221a,0x221d,0x221e,0x2220,...
-+0x2227,0x2228,0x2229,0x222a,0x222b,...
-+0x2234,0x223c,0x2245,0x2248,0x2260,...
-+0x2261,0x2264,0x2265,0x2282,0x2283,...
-+0x2284,0x2286,0x2287,0x2295,0x2297,...
-+0x22a5,0x22c5,0x2320,0x2321,0x2329,...
-+0x232a,0x25ca,0x2660,0x2663,0x2665,...
-+0x2666,...
- ];
-
-- title = {\
--"#<0x10>PLplot Example 23 - Greek Letters";\
--"#<0x10>PLplot Example 23 - Type 1 Symbol Font Glyphs by Unicode (a)";\
--"#<0x10>PLplot Example 23 - Type 1 Symbol Font Glyphs by Unicode (b)";\
--"#<0x10>PLplot Example 23 - Type 1 Symbol Font Glyphs by Unicode (c)";\
--"#<0x10>PLplot Example 23 - Number Forms Unicode Block";\
--"#<0x10>PLplot Example 23 - Arrows Unicode Block (a)";\
--"#<0x10>PLplot Example 23 - Arrows Unicode Block (b)";\
--"#<0x10>PLplot Example 23 - Mathematical Operators Unicode Block (a)";\
--"#<0x10>PLplot Example 23 - Mathematical Operators Unicode Block (b)";\
--"#<0x10>PLplot Example 23 - Mathematical Operators Unicode Block (c)";\
--"#<0x10>PLplot Example 23 - Mathematical Operators Unicode Block (d)"\
-+ title = {
-+"#<0x10>PLplot Example 23 - Greek Letters";
-+"#<0x10>PLplot Example 23 - Type 1 Symbol Font Glyphs by Unicode (a)";
-+"#<0x10>PLplot Example 23 - Type 1 Symbol Font Glyphs by Unicode (b)";
-+"#<0x10>PLplot Example 23 - Type 1 Symbol Font Glyphs by Unicode (c)";
-+"#<0x10>PLplot Example 23 - Number Forms Unicode Block";
-+"#<0x10>PLplot Example 23 - Arrows Unicode Block (a)";
-+"#<0x10>PLplot Example 23 - Arrows Unicode Block (b)";
-+"#<0x10>PLplot Example 23 - Mathematical Operators Unicode Block (a)";
-+"#<0x10>PLplot Example 23 - Mathematical Operators Unicode Block (b)";
-+"#<0x10>PLplot Example 23 - Mathematical Operators Unicode Block (c)";
-+"#<0x10>PLplot Example 23 - Mathematical Operators Unicode Block (d)"
- };
-
-- lo = [\
--0x0,\
--0x0,\
--0x40,\
--0x80,\
--0x2153,\
--0x2190,\
--0x21d0,\
--0x2200,\
--0x2240,\
--0x2280,\
--0x22c0,\
-+ lo = [
-+0x0,
-+0x0,
-+0x40,
-+0x80,
-+0x2153,
-+0x2190,
-+0x21d0,
-+0x2200,
-+0x2240,
-+0x2280,
-+0x22c0,
- ];
-
-- hi = [\
--0x30,\
--0x40,\
--0x80,\
--0xA6,\
--0x2184,\
--0x21d0,\
--0x2200,\
--0x2240,\
--0x2280,\
--0x22c0,\
--0x2300,\
-+ hi = [
-+0x30,
-+0x40,
-+0x80,
-+0xA6,
-+0x2184,
-+0x21d0,
-+0x2200,
-+0x2240,
-+0x2280,
-+0x22c0,
-+0x2300,
- ];
-
-- nxcells = [\
--12,\
--8,\
--8,\
--8,\
--8,\
--8,\
--8,\
--8,\
--8,\
--8,\
--8,\
-+ nxcells = [
-+12,
-+8,
-+8,
-+8,
-+8,
-+8,
-+8,
-+8,
-+8,
-+8,
-+8,
- ];
-
--nycells = [\
--8,\
--8,\
--8,\
--8,\
--8,\
--8,\
--8,\
--8,\
--8,\
--8,\
--8,\
-+nycells = [
-+8,
-+8,
-+8,
-+8,
-+8,
-+8,
-+8,
-+8,
-+8,
-+8,
-+8,
- ];
-
- ## non-zero values Must be consistent with nxcells and nycells.
--offset = [\
--0,\
--0,\
--64,\
--128,\
--0,\
--0,\
--0,\
--0,\
--0,\
--0,\
--0,\
-+offset = [
-+0,
-+0,
-+64,
-+128,
-+0,
-+0,
-+0,
-+0,
-+0,
-+0,
-+0,
- ];
-
- ## 30 possible FCI values.
- FCI_COMBINATIONS = 30;
-
--fci = [\
--0x80000000,\
--0x80000001,\
--0x80000002,\
--0x80000003,\
--0x80000004,\
--0x80000010,\
--0x80000011,\
--0x80000012,\
--0x80000013,\
--0x80000014,\
--0x80000020,\
--0x80000021,\
--0x80000022,\
--0x80000023,\
--0x80000024,\
--0x80000100,\
--0x80000101,\
--0x80000102,\
--0x80000103,\
--0x80000104,\
--0x80000110,\
--0x80000111,\
--0x80000112,\
--0x80000113,\
--0x80000114,\
--0x80000120,\
--0x80000121,\
--0x80000122,\
--0x80000123,\
--0x80000124,\
-+fci = [
-+0x80000000,
-+0x80000001,
-+0x80000002,
-+0x80000003,
-+0x80000004,
-+0x80000010,
-+0x80000011,
-+0x80000012,
-+0x80000013,
-+0x80000014,
-+0x80000020,
-+0x80000021,
-+0x80000022,
-+0x80000023,
-+0x80000024,
-+0x80000100,
-+0x80000101,
-+0x80000102,
-+0x80000103,
-+0x80000104,
-+0x80000110,
-+0x80000111,
-+0x80000112,
-+0x80000113,
-+0x80000114,
-+0x80000120,
-+0x80000121,
-+0x80000122,
-+0x80000123,
-+0x80000124,
- ];
-
--family = [\
-- "sans-serif";\
-- "serif";\
-- "monospace";\
-- "script";\
-- "symbol"\
-+family = [
-+ "sans-serif";
-+ "serif";
-+ "monospace";
-+ "script";
-+ "symbol"
- ];
--style = [\
-- "upright";\
-- "italic";\
-- "oblique"\
-+style = [
-+ "upright";
-+ "italic";
-+ "oblique"
- ];
--weight = [\
-- "medium";\
-- "bold"\
-+weight = [
-+ "medium";
-+ "bold"
- ];
-
-
-diff --git a/examples/octave/x26c.m b/examples/octave/x26c.m
-index 8e94f48..49252a7 100644
---- a/examples/octave/x26c.m
-+++ b/examples/octave/x26c.m
-@@ -244,7 +244,7 @@ function plot1(plottype, x_label, y_label, alty_label, title_label, line_label,
-
- plscol0a( 15, 32, 32, 32, 0.70 );
-
-- [legend_width, legend_height] = \
-+ [legend_width, legend_height] = ...
- pllegend( bitor(PL_LEGEND_BACKGROUND, PL_LEGEND_BOUNDING_BOX), 0, 0.0, 0.0,
- 0.1, 15, 1, 1, 0, 0, opt_array, 1.0, 1.0, 2.0,
- 1., text_colors, text,
-diff --git a/examples/octave/x28c.m b/examples/octave/x28c.m
-index b801496..39c46a1 100644
---- a/examples/octave/x28c.m
-+++ b/examples/octave/x28c.m
-@@ -1,5 +1,3 @@
--## $Id: x28c.m 11680 2011-03-27 17:57:51Z airwin $
--##
- ## plmtex3, plptex3 demo
- ##
- ## Copyright (C) 2007 Alan Irwin
-@@ -86,8 +84,8 @@ function ix28c
- plw3d(1.0, 1.0, 1.0, xmin, xmax, ymin, ymax, zmin, zmax, 20., 45.);
-
- plcol0(2);
-- plbox3("b", "", xrange, 0, \
-- "b", "", yrange, 0, \
-+ plbox3("b", "", xrange, 0,
-+ "b", "", yrange, 0,
- "bcd", "", zrange, 0);
-
- ## z = zmin.
-@@ -102,9 +100,9 @@ function ix28c
- x_shear = -0.5*xrange*sin_omega;
- y_shear = 0.5*yrange*cos_omega;
- z_shear = 0.;
-- plptex3(xmid, ymid, zmin, \
-- x_inclination, y_inclination, z_inclination, \
-- x_shear, y_shear, z_shear, \
-+ plptex3(xmid, ymid, zmin,
-+ x_inclination, y_inclination, z_inclination,
-+ x_shear, y_shear, z_shear,
- 0.0, " revolution");
- endfor
- ## x = xmax.
-@@ -119,9 +117,9 @@ function ix28c
- x_shear = 0.;
- y_shear = 0.5*yrange*sin_omega;
- z_shear = 0.5*zrange*cos_omega;
-- plptex3(xmax, ymid, zmid, \
-- x_inclination, y_inclination, z_inclination, \
-- x_shear, y_shear, z_shear, \
-+ plptex3(xmax, ymid, zmid,
-+ x_inclination, y_inclination, z_inclination,
-+ x_shear, y_shear, z_shear,
- 0.0, " revolution");
- endfor
-
-@@ -137,10 +135,10 @@ function ix28c
- x_shear = -0.5*xrange*sin_omega;
- y_shear = 0.;
- z_shear = 0.5*zrange*cos_omega;
-- plptex3( \
-- xmid, ymax, zmid, \
-- x_inclination, y_inclination, z_inclination, \
-- x_shear, y_shear, z_shear, \
-+ plptex3(
-+ xmid, ymax, zmid,
-+ x_inclination, y_inclination, z_inclination,
-+ x_shear, y_shear, z_shear,
- 0.0, " revolution");
- endfor
- ## Draw minimal 3D grid to finish defining the 3D box.
-@@ -153,8 +151,8 @@ function ix28c
- plw3d(1.0, 1.0, 1.0, xmin, xmax, ymin, ymax, zmin, zmax, 20., 45.);
-
- plcol0(2);
-- plbox3("b", "", xrange, 0, \
-- "b", "", yrange, 0, \
-+ plbox3("b", "", xrange, 0,
-+ "b", "", yrange, 0,
- "bcd", "", zrange, 0);
-
- ## y = ymax.
-@@ -170,10 +168,10 @@ function ix28c
- y_shear = 0.5*yrange*sin_omega;
- z_shear = 0.5*zrange*cos_omega;
- zs = zsmax - dzsrot*i;
-- plptex3( \
-- xmid, ymax, zs, \
-- x_inclination, y_inclination, z_inclination, \
-- x_shear, y_shear, z_shear, \
-+ plptex3(
-+ xmid, ymax, zs,
-+ x_inclination, y_inclination, z_inclination,
-+ x_shear, y_shear, z_shear,
- 0.5, "rotation for y = y#dmax#u");
- endfor
-
-@@ -190,10 +188,10 @@ function ix28c
- x_shear = 0.5*xrange*sin_omega;
- z_shear = 0.5*zrange*cos_omega;
- zs = zsmax - dzsrot*i;
-- plptex3( \
-- xmax, ymid, zs, \
-- x_inclination, y_inclination, z_inclination, \
-- x_shear, y_shear, z_shear, \
-+ plptex3(
-+ xmax, ymid, zs,
-+ x_inclination, y_inclination, z_inclination,
-+ x_shear, y_shear, z_shear,
- 0.5, "rotation for x = x#dmax#u");
- endfor
-
-@@ -210,10 +208,10 @@ function ix28c
- y_shear = 0.5*yrange*cos_omega;
- z_shear = 0.5*zrange*sin_omega;
- ys = ysmax - dysrot*i;
-- plptex3( \
-- xmid, ys, zmin, \
-- x_inclination, y_inclination, z_inclination, \
-- x_shear, y_shear, z_shear, \
-+ plptex3(
-+ xmid, ys, zmin,
-+ x_inclination, y_inclination, z_inclination,
-+ x_shear, y_shear, z_shear,
- 0.5, "rotation for z = z#dmin#u");
- endfor
- ## Draw minimal 3D grid to finish defining the 3D box.
-@@ -230,8 +228,8 @@ function ix28c
- plw3d(1.0, 1.0, 1.0, xmin, xmax, ymin, ymax, zmin, zmax, 20., 45.);
-
- plcol0(2);
-- plbox3("b", "", xrange, 0, \
-- "b", "", yrange, 0, \
-+ plbox3("b", "", xrange, 0,
-+ "b", "", yrange, 0,
- "bcd", "", zrange, 0);
-
- ## y = ymax.
-@@ -247,10 +245,10 @@ function ix28c
- x_shear = 0.5*xrange*sin_omega;
- z_shear = 0.5*zrange*cos_omega;
- zs = zsmax-dzsshear*i;
-- plptex3( \
-- xmid, ymax, zs, \
-- x_inclination, y_inclination, z_inclination, \
-- x_shear, y_shear, z_shear, \
-+ plptex3(
-+ xmid, ymax, zs,
-+ x_inclination, y_inclination, z_inclination,
-+ x_shear, y_shear, z_shear,
- 0.5, "shear for y = y#dmax#u");
- endfor
-
-@@ -267,10 +265,10 @@ function ix28c
- y_shear = -0.5*yrange*sin_omega;
- z_shear = 0.5*zrange*cos_omega;
- zs = zsmax-dzsshear*i;
-- plptex3( \
-- xmax, ymid, zs, \
-- x_inclination, y_inclination, z_inclination, \
-- x_shear, y_shear, z_shear, \
-+ plptex3(
-+ xmax, ymid, zs,
-+ x_inclination, y_inclination, z_inclination,
-+ x_shear, y_shear, z_shear,
- 0.5, "shear for x = x#dmax#u");
- endfor
-
-@@ -287,10 +285,10 @@ function ix28c
- y_shear = 0.5*yrange*cos_omega;
- x_shear = 0.5*xrange*sin_omega;
- ys = ysmax-dysshear*i;
-- plptex3( \
-- xmid, ys, zmin, \
-- x_inclination, y_inclination, z_inclination, \
-- x_shear, y_shear, z_shear, \
-+ plptex3(
-+ xmid, ys, zmin,
-+ x_inclination, y_inclination, z_inclination,
-+ x_shear, y_shear, z_shear,
- 0.5, "shear for z = z#dmin#u");
- endfor
- ## Draw minimal 3D grid to finish defining the 3D box.
-@@ -303,8 +301,8 @@ function ix28c
- plw3d(1.0, 1.0, 1.0, xmin, xmax, ymin, ymax, zmin, zmax, 40., -30.);
-
- plcol0(2);
-- plbox3("b", "", xrange, 0, \
-- "b", "", yrange, 0, \
-+ plbox3("b", "", xrange, 0,
-+ "b", "", yrange, 0,
- "bcd", "", zrange, 0);
-
- plschr(0., 1.2);
-@@ -334,10 +332,10 @@ function ix28c
- y_shear = 0.;
- z_shear = 1.;
- p1string = pstring(i:i);
-- plptex3( \
-- xpos, ypos, zpos, \
-- x_inclination, y_inclination, z_inclination, \
-- x_shear, y_shear, z_shear, \
-+ plptex3(
-+ xpos, ypos, zpos,
-+ x_inclination, y_inclination, z_inclination,
-+ x_shear, y_shear, z_shear,
- 0.5, p1string);
- omega += domega;
- endfor
-@@ -351,8 +349,8 @@ function ix28c
- plw3d(1.0, 1.0, 1.0, xmin, xmax, ymin, ymax, zmin, zmax, 20., 45.);
-
- plcol0(2);
-- plbox3("b", "", xrange, 0, \
-- "b", "", yrange, 0, \
-+ plbox3("b", "", xrange, 0,
-+ "b", "", yrange, 0,
- "bcd", "", zrange, 0);
-
- plschr(0., 1.0);
-@@ -377,4 +375,4 @@ function ix28c
-
- endfunction
-
--ix28c
-\ No newline at end of file
-+ix28c
-diff --git a/examples/octave/x29c.m b/examples/octave/x29c.m
-index 8f4f857..7924e39 100644
---- a/examples/octave/x29c.m
-+++ b/examples/octave/x29c.m
-@@ -122,8 +122,8 @@ function plot2
- i = 0:npts-1;
- x = i*60.0*60.0*24.0;
- p = asin(0.39795*cos(0.2163108 + 2*atan(0.9671396*tan(0.00860*(i-186)))));
-- d = 24.0 - (24.0/pi)*acos( (sin(0.8333*pi/180.0) + \
-- sin(lat*pi/180.0)*sin(p)) \
-+ d = 24.0 - (24.0/pi)*acos( (sin(0.8333*pi/180.0) +
-+ sin(lat*pi/180.0)*sin(p))
- ./(cos(lat*pi/180.0)*cos(p)) );
- y = d;
-
-diff --git a/examples/octave/x33c.m b/examples/octave/x33c.m
-index 0684f19..ca5a497 100644
---- a/examples/octave/x33c.m
-+++ b/examples/octave/x33c.m
-@@ -1,6 +1,4 @@
--## -*- coding: utf-8; -*-
--## $Id: x33c.m 12353 2013-06-02 20:07:07Z andrewross $
--## Copyright (C) 2010 Alan W. Irwin
-+## Copyright (C) 2010-2014 Alan W. Irwin
- ##
- ## Demonstrate most pllegend capability including unicode symbols.
- ##
-@@ -195,12 +193,12 @@ function plcolorbar_example_page( kind_i, label_i, cap_i, cont_color, cont_width
- plwind( 0.0, 1.0, 0.0, 1.0 );
- # Set interesting background colour.
- plscol0a( 15, 0, 0, 0, 0.20 );
-- [colorbar_width, colorbar_height] = plcolorbar( \
-- bitor(opt, bitor(PL_COLORBAR_BOUNDING_BOX, PL_COLORBAR_BACKGROUND)), \
-- position, x, y, x_length, y_length, \
-- 15, 1, 1, low_cap_color, high_cap_color, \
-- cont_color, cont_width, label_opts, label, \
-- axis_opts, ticks, sub_ticks, \
-+ [colorbar_width, colorbar_height] = plcolorbar(
-+ bitor(opt, bitor(PL_COLORBAR_BOUNDING_BOX, PL_COLORBAR_BACKGROUND)),
-+ position, x, y, x_length, y_length,
-+ 15, 1, 1, low_cap_color, high_cap_color,
-+ cont_color, cont_width, label_opts, label,
-+ axis_opts, ticks, sub_ticks,
- n_values_array, values_array );
-
- # Reset text and tick sizes
-@@ -313,7 +311,7 @@ function ix33c()
- line_colors(1) = 1 + mod(k, 8);
- symbol_colors(1) = 1 + mod(k, 8);
-
-- [legend_width, legend_height] = \
-+ [legend_width, legend_height] = ...
- pllegend( opt, position, 0.05, 0.05,
- 0.1, 15, 1, 1, 0, 0, opt_array, 1.0, 1.0, 2.0,
- 1., text_colors, text,
-@@ -393,7 +391,7 @@ function ix33c()
- y = 0.1;
- nrow = 1;
- ncolumn = nlegend;
-- [legend_width, legend_height] = \
-+ [legend_width, legend_height] = ...
- pllegend( opt, position, x, y,
- 0.05, 15, 1, 1, nrow, ncolumn, opt_array, 1.0, 1.0, 2.0,
- 1., text_colors, text,
-@@ -407,7 +405,7 @@ function ix33c()
- y = 0.1;
- nrow = 1;
- ncolumn = nlegend;
-- [legend_width, legend_height] = \
-+ [legend_width, legend_height] = ...
- pllegend( opt, position, x, y,
- 0.05, 15, 1, 1, nrow, ncolumn, opt_array, 1.0, 1.0, 2.0,
- 1., text_colors, text,
-@@ -422,7 +420,7 @@ function ix33c()
- y = 0.;
- nrow = nlegend;
- ncolumn = 1;
-- [legend_width, legend_height] = \
-+ [legend_width, legend_height] = ...
- pllegend( opt, position, x, y,
- 0.05, 15, 1, 1, nrow, ncolumn, opt_array, 1.0, 1.0, 2.0,
- 1., text_colors, text,
-@@ -436,7 +434,7 @@ function ix33c()
- y = 0.;
- nrow = nlegend;
- ncolumn = 1;
-- [legend_width, legend_height] = \
-+ [legend_width, legend_height] = ...
- pllegend( opt, position, x, y,
- 0.05, 15, 1, 1, nrow, ncolumn, opt_array, 1.0, 1.0, 2.0,
- 1., text_colors, text,
-@@ -450,7 +448,7 @@ function ix33c()
- y = 0.;
- nrow = 6;
- ncolumn = 2;
-- [legend_width, legend_height] = \
-+ [legend_width, legend_height] = ...
- pllegend( opt, position, x, y,
- 0.05, 15, 1, 1, nrow, ncolumn, opt_array, 1.0, 1.0, 2.0,
- 1., text_colors, text,
-@@ -464,7 +462,7 @@ function ix33c()
- y = 0.;
- nrow = 6;
- ncolumn = 2;
-- [legend_width, legend_height] = \
-+ [legend_width, legend_height] = ...
- pllegend( opt, position, x, y,
- 0.05, 15, 1, 1, nrow, ncolumn, opt_array, 1.0, 1.0, 2.0,
- 1., text_colors, text,
-@@ -478,7 +476,7 @@ function ix33c()
- y = 0.;
- nrow = 3;
- ncolumn = 3;
-- [legend_width, legend_height] = \
-+ [legend_width, legend_height] = ...
- pllegend( opt, position, x, y,
- 0.05, 15, 1, 1, nrow, ncolumn, opt_array, 1.0, 1.0, 2.0,
- 1., text_colors, text,
-@@ -568,7 +566,7 @@ function ix33c()
- nrow = min(3, nlegend);
- ncolumn = 0;
-
-- [legend_width, legend_height] = \
-+ [legend_width, legend_height] = ...
- pllegend( opt, position, x, y,
- 0.025, 15, 1, 1, nrow, ncolumn, opt_array, 1.0, 1.0, 1.5,
- 1., text_colors, text,
-@@ -685,7 +683,7 @@ function ix33c()
-
- opt = opt_base;
- plscol0a( 15, 32, 32, 32, 0.70 );
-- [legend_width, legend_height] = \
-+ [legend_width, legend_height] = ...
- pllegend( opt, position, x, y,
- 0.1, 15, 1, 1, 0, 0, opt_array, 1.0, text_scale, 2.0,
- 0., text_colors, text,
-@@ -716,7 +714,7 @@ function ix33c()
- opt = opt_base;
- x += legend_width;
- plscol0a( 15, 32, 32, 32, 0.70 );
-- [legend_width, legend_height] = \
-+ [legend_width, legend_height] = ...
- pllegend( opt, position, x, y,
- 0.1, 15, 1, 1, 0, 0, opt_array, 1.0, text_scale, 2.0,
- 0., text_colors, text,
-@@ -747,7 +745,7 @@ function ix33c()
- opt = opt_base;
- x += legend_width;
- plscol0a( 15, 32, 32, 32, 0.70 );
-- [legend_width, legend_height] = \
-+ [legend_width, legend_height] = ...
- pllegend( opt, position, x, y,
- 0.1, 15, 1, 1, 0, 0, opt_array, 1.0, text_scale, 2.0,
- 0., text_colors, text,
-@@ -781,7 +779,7 @@ function ix33c()
- y += max_height;
- max_height = 0.;
- plscol0a( 15, 32, 32, 32, 0.70 );
-- [legend_width, legend_height] = \
-+ [legend_width, legend_height] = ...
- pllegend( opt, position, x, y,
- 0.1, 15, 1, 1, 0, 0, opt_array, 1.0, text_scale, 2.0,
- 0., text_colors, text,
-@@ -812,7 +810,7 @@ function ix33c()
- opt = opt_base;
- x += legend_width;
- plscol0a( 15, 32, 32, 32, 0.70 );
-- [legend_width, legend_height] = \
-+ [legend_width, legend_height] = ...
- pllegend( opt, position, x, y,
- 0.1, 15, 1, 1, 0, 0, opt_array, 1.0, text_scale, 2.0,
- 0., text_colors, text,
-@@ -843,7 +841,7 @@ function ix33c()
- opt = opt_base;
- x += legend_width;
- plscol0a( 15, 32, 32, 32, 0.70 );
-- [legend_width, legend_height] = \
-+ [legend_width, legend_height] = ...
- pllegend( opt, position, x, y,
- 0.1, 15, 1, 1, 0, 0, opt_array, 1.0, text_scale, 2.0,
- 0., text_colors, text,
-@@ -878,7 +876,7 @@ function ix33c()
- y += max_height;
- max_height = 0.;
- plscol0a( 15, 32, 32, 32, 0.70 );
-- [legend_width, legend_height] = \
-+ [legend_width, legend_height] = ...
- pllegend( opt, position, x, y,
- 0.1, 15, 1, 1, 0, 0, opt_array, 1.0, text_scale, 2.0,
- 0., text_colors, text',
-@@ -905,7 +903,7 @@ function ix33c()
- opt = opt_base;
- x += legend_width;
- plscol0a( 15, 32, 32, 32, 0.70 );
-- [legend_width, legend_height] = \
-+ [legend_width, legend_height] = ...
- pllegend( opt, position, x, y,
- 0.1, 15, 1, 1, 0, 0, opt_array, 1.0, text_scale, 2.0,
- 0., text_colors, text',
-@@ -933,7 +931,7 @@ function ix33c()
- opt = opt_base;
- x += legend_width;
- plscol0a( 15, 32, 32, 32, 0.70 );
-- [legend_width, legend_height] = \
-+ [legend_width, legend_height] = ...
- pllegend( opt, position, x, y,
- 0.1, 15, 1, 1, 0, 0, opt_array, 1.0, text_scale, 2.0,
- 0., text_colors, text',
-diff --git a/plplot_test/test_octave.sh.in b/plplot_test/test_octave.sh.in
-index 11392c1..14ff8cb 100755
---- a/plplot_test/test_octave.sh.in
-+++ b/plplot_test/test_octave.sh.in
-@@ -35,7 +35,12 @@ echo "$TOPDIR"
- export LD_LIBRARY_PATH="$TOPDIR"/src:"$TOPDIR"/lib/csa:"$TOPDIR"/lib/nn
-
- # Launch an Octave script that exercises all the demos
--$octave -f -q -p "$octavedir" <<EOF 2> test.error
-+$octave -f -q <<EOF 2> test.error
-+
-+# Disable warnings about shadowed functions - PLplot is _supposed_ to shadow the core functions
-+warning("off","Octave:shadowed-function");
-+
-+addpath(getenv("octavedir"));
-
- # Check verbose_test variable
- if (strcmp(getenv("verbose_test"),"on") == 1)
-@@ -46,13 +51,15 @@ endif
-
- plplot_stub;
- t = char(strsplit("$options", "-"));
--if (t); t(1,:)=""; endif;
--for i=1:rows(t)
-- tt = deblank (t(i,:)); len = length(tt);
-- ix = index(tt," ");
-- if (ix == 0); ix = len; len = 0; endif
-- plsetopt(tt(1:ix), tt(ix+1:len));
--endfor
-+if (t)
-+ t(1,:)="";
-+ for i=1:rows(t)
-+ tt = deblank (t(i,:)); len = length(tt);
-+ ix = index(tt," ");
-+ if (ix == 0); ix = len; len = 0; endif
-+ plsetopt(tt(1:ix), tt(ix+1:len));
-+ endfor
-+endif
-
- # Subset of p examples selected that seem to work ok with noninteractive
- # devices.
-@@ -80,13 +87,15 @@ for i=[0:18 19 20:31 33] ;
- printf("%s\n",cmd);
- endif
- t = char(strsplit("$options", "-"));
-- if (t) ; t(1,:)=""; endif
-- for j=1:rows(t)
-- tt = deblank (t(j,:)); len = length(tt);
-- ix = index(tt," ");
-- if (ix == 0); ix = len; len = 0; endif
-- plSetOpt(deblank(tt(1:ix)), tt(ix:len));
-- endfor
-+ if (t)
-+ t(1,:)="";
-+ for j=1:rows(t)
-+ tt = deblank (t(j,:)); len = length(tt);
-+ ix = index(tt," ");
-+ if (ix == 0); ix = len; len = 0; endif
-+ plSetOpt(deblank(tt(1:ix)), tt(ix:len));
-+ endfor
-+ endif
- device="$device";
- plSetOpt("dev", device);
- #o trailer on filename e.g., x01o.ps) to distinguish from other
diff --git a/debian/patches/Fix-wxwidgets-linkage.patch b/debian/patches/Fix-wxwidgets-linkage.patch
deleted file mode 100644
index cb11703..0000000
--- a/debian/patches/Fix-wxwidgets-linkage.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Andrew Ross <andrewross at users.sourceforge.net>
-Date: Mon, 3 Jul 2017 22:39:22 +0200
-Subject: Fix wxwidgets linkage
-
-Upstream patch to fix wxwidgets linkage.
----
- bindings/wxwidgets/CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/bindings/wxwidgets/CMakeLists.txt b/bindings/wxwidgets/CMakeLists.txt
-index 601814d..86a5f05 100644
---- a/bindings/wxwidgets/CMakeLists.txt
-+++ b/bindings/wxwidgets/CMakeLists.txt
-@@ -84,6 +84,7 @@ if(ENABLE_wxwidgets AND ENABLE_cxx)
- target_link_libraries(
- plplotwxwidgets${LIB_TAG}
- plplotcxx${LIB_TAG}
-+ plplot${LIB_TAG}
- ${wxwidgets_LINK_FLAGS}
- )
-
diff --git a/debian/patches/Remove-nondfsg-dirs.patch b/debian/patches/Remove-nondfsg-dirs.patch
index 3bae045..579f8de 100644
--- a/debian/patches/Remove-nondfsg-dirs.patch
+++ b/debian/patches/Remove-nondfsg-dirs.patch
@@ -7,11 +7,11 @@ Subject: Remove nondfsg dirs
1 file changed, 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d1e2478..769dd80 100644
+index 56560bb..56ac225 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -199,7 +199,6 @@ add_subdirectory(examples)
- add_subdirectory(plplot_test)
+@@ -282,7 +282,6 @@ add_subdirectory(plplot_test)
+ add_subdirectory(examples)
add_subdirectory(scripts)
add_subdirectory(doc)
-add_subdirectory(www)
diff --git a/debian/patches/Set-cmake-policy.patch b/debian/patches/Set-cmake-policy.patch
deleted file mode 100644
index 23d2ca8..0000000
--- a/debian/patches/Set-cmake-policy.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From: Andrew Ross <andrewross at users.sourceforge.net>
-Date: Mon, 3 Jul 2017 22:39:22 +0200
-Subject: Set cmake policy
-
----
- CMakeLists.txt | 4 ++++
- examples/CMakeLists.txt | 5 +++++
- 2 files changed, 9 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f8ecd81..d1e2478 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -54,6 +54,10 @@ if(POLICY CMP0023)
- message(STATUS "Explicitly setting policy CMP0023 to OLD")
- cmake_policy(SET CMP0023 OLD)
- endif(POLICY CMP0023)
-+if(POLICY CMP0026)
-+ message(STATUS "Explicitly setting policy CMP0026 to OLD")
-+ cmake_policy(SET CMP0026 OLD)
-+endif(POLICY CMP0026)
-
- # It is a fatal error if no working C compiler is available to build
- # the PLplot core C library and core C examples. All other compilers
-diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
-index 51ec58b..b8ff0a8 100644
---- a/examples/CMakeLists.txt
-+++ b/examples/CMakeLists.txt
-@@ -397,6 +397,11 @@ else(CORE_BUILD)
- message(STATUS "Explicitly setting policy CMP0023 to OLD")
- cmake_policy(SET CMP0023 OLD)
- endif(POLICY CMP0023)
-+ # This should be fixed, but silences warnings for now
-+ if(POLICY CMP0046)
-+ message(STATUS "Explicitly setting policy CMP0046 to OLD")
-+ cmake_policy(SET CMP0046 OLD)
-+ endif(POLICY CMP0046)
-
- message(STATUS "CMAKE_PLATFORM_INFO_DIR = ${CMAKE_PLATFORM_INFO_DIR}")
- # Locations where PLplot cmake build system first looks for cmake modules.
diff --git a/debian/patches/Unset-python-path.patch b/debian/patches/Unset-python-path.patch
index 7800548..5fffbcd 100644
--- a/debian/patches/Unset-python-path.patch
+++ b/debian/patches/Unset-python-path.patch
@@ -9,10 +9,10 @@ correct. This ensure the examples work with multiple version of python.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/examples/python/CMakeLists.txt b/examples/python/CMakeLists.txt
-index 5865247..e3e96ab 100644
+index bddc499..ea09b61 100644
--- a/examples/python/CMakeLists.txt
+++ b/examples/python/CMakeLists.txt
-@@ -245,7 +245,7 @@ if(CORE_BUILD)
+@@ -222,7 +222,7 @@ if(CORE_BUILD)
@ONLY
)
diff --git a/debian/patches/series b/debian/patches/series
index 3576e74..c136ec4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,11 +2,5 @@ Unset-python-path.patch
Proper-use-of-the-rmpath-function.patch
Fix-lua-includes.patch
Add-Tcl-multiarch.patch
-Fix-octave-3.8-support.patch
-Fix-wxwidgets-linkage.patch
Dont-check-for-hdf5.h.patch
-Fix-config.h-clash.patch
-Set-cmake-policy.patch
Remove-nondfsg-dirs.patch
-Adjust-for-internal-CMake-3.1-pkg-config-change.patch
-Build-without-non-free-lena-images.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/plplot.git
More information about the debian-science-commits
mailing list