From: Anton Gladky Date: Tue, 23 Nov 2021 21:14:16 +0000 (+0100) Subject: Fix compilation X-Git-Tag: archive/raspbian/9.5.2+dfsg4-3+rpi1^2~143 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c127d524bfce9393e42875bf31e7e20959ae4294;p=vtk9.git Fix compilation --- diff --git a/debian/control b/debian/control index 904a08448..e055683e3 100644 --- a/debian/control +++ b/debian/control @@ -65,6 +65,7 @@ Build-Depends: chrpath, python3-matplotlib, python3-mpi4py, qtbase5-dev, + qtdeclarative5-dev, r-base-core, r-base-dev, r-base, diff --git a/debian/libvtk9-dev.install b/debian/libvtk9-dev.install index 733942fa5..0efd0a5d7 100644 --- a/debian/libvtk9-dev.install +++ b/debian/libvtk9-dev.install @@ -1,3 +1,3 @@ -usr/include/vtk-9.0 usr/include +usr/include/vtk-9.1 usr/include usr/lib/*/*.so -usr/lib/*/cmake/vtk-9.0 +usr/lib/*/cmake/vtk-9.1 diff --git a/debian/libvtk9-doc.docs b/debian/libvtk9-doc.docs index d384909a4..8d0303d0b 100644 --- a/debian/libvtk9-doc.docs +++ b/debian/libvtk9-doc.docs @@ -1,2 +1 @@ - -usr/share/doc/vtk-9.0/doxygen/* /usr/share/vtk-9.0/doxygen/ +usr/share/doc/vtk-9.1/doxygen/* /usr/share/vtk-9.1/doxygen/ diff --git a/debian/libvtk9-java.install b/debian/libvtk9-java.install index 015479eab..a0e7f6091 100644 --- a/debian/libvtk9-java.install +++ b/debian/libvtk9-java.install @@ -1,4 +1,4 @@ -usr/bin/vtkParseJava-9.0 usr/bin -usr/bin/vtkWrapJava-9.0 usr/bin +usr/bin/vtkParseJava-9.1 usr/bin +usr/bin/vtkWrapJava-9.1 usr/bin usr/lib/*/java/vtk9.jar usr/share/java usr/lib/*/java/vtk-L* diff --git a/debian/libvtk9-java.manpages b/debian/libvtk9-java.manpages index f2b1d00e6..2a3e048b8 100644 --- a/debian/libvtk9-java.manpages +++ b/debian/libvtk9-java.manpages @@ -1,2 +1,2 @@ -debian/manpages/vtkParseJava-9.0.1 -debian/manpages/vtkWrapJava-9.0.1 +debian/manpages/vtkParseJava-9.1 +debian/manpages/vtkWrapJava-9.1 diff --git a/debian/libvtk9-qt-dev.install b/debian/libvtk9-qt-dev.install index b68a64947..0654fa61d 100644 --- a/debian/libvtk9-qt-dev.install +++ b/debian/libvtk9-qt-dev.install @@ -1,3 +1,3 @@ usr/lib/*/*Qt*.so -usr/include/vtk-9.0/*Qt* -usr/include/vtk-9.0/Q* +usr/include/vtk-9.1/*Qt* +usr/include/vtk-9.1/Q* diff --git a/debian/manpages/vtkParseJava-9.0.1 b/debian/manpages/vtkParseJava-9.0.1 deleted file mode 100644 index deedc0927..000000000 --- a/debian/manpages/vtkParseJava-9.0.1 +++ /dev/null @@ -1,56 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.16. -.TH VTKPARSEJAVA-9.0 "1" "November 2020" "vtkParseJava-9.0 9.0" "User Commands" -.SH NAME -vtkParseJava-9.0 \- please refer to VTK documentation -.SH SYNOPSIS -.B vtkParseJava-9.0 -[\fI\,options\/\fR] \fI\,infile\/\fR... -.SH DESCRIPTION -.TP -\fB\-\-help\fR -print this help message -.TP -\fB\-\-version\fR -print the VTK version -.TP -\fB\-o\fR -the output file -.TP -\fB\-I\fR -add an include directory -.TP -\fB\-D\fR -define a preprocessor macro -.TP -\fB\-U\fR -undefine a preprocessor macro -.TP -\fB\-imacros\fR -read macros from a header file -.TP -\fB\-undef\fR -do not predefine platform macros -.TP -@ -read arguments from a file -.TP -\fB\-dM\fR -dump all macro definitions to output -.TP -\fB\-\-hints\fR -the hints file to use -.TP -\fB\-\-types\fR -the type hierarchy file to use -.SH "SEE ALSO" -The full documentation for -.B vtkParseJava-9.0 -is maintained as a Texinfo manual. If the -.B info -and -.B vtkParseJava-9.0 -programs are properly installed at your site, the command -.IP -.B info vtkParseJava-9.0 -.PP -should give you access to the complete manual. diff --git a/debian/manpages/vtkParseJava-9.1 b/debian/manpages/vtkParseJava-9.1 new file mode 100644 index 000000000..deedc0927 --- /dev/null +++ b/debian/manpages/vtkParseJava-9.1 @@ -0,0 +1,56 @@ +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.16. +.TH VTKPARSEJAVA-9.0 "1" "November 2020" "vtkParseJava-9.0 9.0" "User Commands" +.SH NAME +vtkParseJava-9.0 \- please refer to VTK documentation +.SH SYNOPSIS +.B vtkParseJava-9.0 +[\fI\,options\/\fR] \fI\,infile\/\fR... +.SH DESCRIPTION +.TP +\fB\-\-help\fR +print this help message +.TP +\fB\-\-version\fR +print the VTK version +.TP +\fB\-o\fR +the output file +.TP +\fB\-I\fR +add an include directory +.TP +\fB\-D\fR +define a preprocessor macro +.TP +\fB\-U\fR +undefine a preprocessor macro +.TP +\fB\-imacros\fR +read macros from a header file +.TP +\fB\-undef\fR +do not predefine platform macros +.TP +@ +read arguments from a file +.TP +\fB\-dM\fR +dump all macro definitions to output +.TP +\fB\-\-hints\fR +the hints file to use +.TP +\fB\-\-types\fR +the type hierarchy file to use +.SH "SEE ALSO" +The full documentation for +.B vtkParseJava-9.0 +is maintained as a Texinfo manual. If the +.B info +and +.B vtkParseJava-9.0 +programs are properly installed at your site, the command +.IP +.B info vtkParseJava-9.0 +.PP +should give you access to the complete manual. diff --git a/debian/manpages/vtkProbeOpenGLVersion-9.0.1 b/debian/manpages/vtkProbeOpenGLVersion-9.0.1 deleted file mode 100644 index 1f021f6a9..000000000 --- a/debian/manpages/vtkProbeOpenGLVersion-9.0.1 +++ /dev/null @@ -1,56 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.16. -.TH VTKPROBEOPENGLVERSION-9.0 "1" "November 2020" "vtkProbeOpenGLVersion-9.0 9.0" "User Commands" -.SH NAME -vtkProbeOpenGLVersion-9.0 \- please refer to VTK documentation -.SH SYNOPSIS -.B vtkProbeOpenGLVersion-9.0 -[\fI\,options\/\fR] \fI\,infile\/\fR... -.SH DESCRIPTION -.TP -\fB\-\-help\fR -print this help message -.TP -\fB\-\-version\fR -print the VTK version -.TP -\fB\-o\fR -the output file -.TP -\fB\-I\fR -add an include directory -.TP -\fB\-D\fR -define a preprocessor macro -.TP -\fB\-U\fR -undefine a preprocessor macro -.TP -\fB\-imacros\fR -read macros from a header file -.TP -\fB\-undef\fR -do not predefine platform macros -.TP -@ -read arguments from a file -.TP -\fB\-dM\fR -dump all macro definitions to output -.TP -\fB\-\-hints\fR -the hints file to use -.TP -\fB\-\-types\fR -the type hierarchy file to use -.SH "SEE ALSO" -The full documentation for -.B vtkProbeOpenGLVersion-9.0 -is maintained as a Texinfo manual. If the -.B info -and -.B vtkProbeOpenGLVersion-9.0 -programs are properly installed at your site, the command -.IP -.B info vtkProbeOpenGLVersion-9.0 -.PP -should give you access to the complete manual. diff --git a/debian/manpages/vtkProbeOpenGLVersion-9.1 b/debian/manpages/vtkProbeOpenGLVersion-9.1 new file mode 100644 index 000000000..1f021f6a9 --- /dev/null +++ b/debian/manpages/vtkProbeOpenGLVersion-9.1 @@ -0,0 +1,56 @@ +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.16. +.TH VTKPROBEOPENGLVERSION-9.0 "1" "November 2020" "vtkProbeOpenGLVersion-9.0 9.0" "User Commands" +.SH NAME +vtkProbeOpenGLVersion-9.0 \- please refer to VTK documentation +.SH SYNOPSIS +.B vtkProbeOpenGLVersion-9.0 +[\fI\,options\/\fR] \fI\,infile\/\fR... +.SH DESCRIPTION +.TP +\fB\-\-help\fR +print this help message +.TP +\fB\-\-version\fR +print the VTK version +.TP +\fB\-o\fR +the output file +.TP +\fB\-I\fR +add an include directory +.TP +\fB\-D\fR +define a preprocessor macro +.TP +\fB\-U\fR +undefine a preprocessor macro +.TP +\fB\-imacros\fR +read macros from a header file +.TP +\fB\-undef\fR +do not predefine platform macros +.TP +@ +read arguments from a file +.TP +\fB\-dM\fR +dump all macro definitions to output +.TP +\fB\-\-hints\fR +the hints file to use +.TP +\fB\-\-types\fR +the type hierarchy file to use +.SH "SEE ALSO" +The full documentation for +.B vtkProbeOpenGLVersion-9.0 +is maintained as a Texinfo manual. If the +.B info +and +.B vtkProbeOpenGLVersion-9.0 +programs are properly installed at your site, the command +.IP +.B info vtkProbeOpenGLVersion-9.0 +.PP +should give you access to the complete manual. diff --git a/debian/manpages/vtkWrapHierarchy-9.0.1 b/debian/manpages/vtkWrapHierarchy-9.0.1 deleted file mode 100644 index 7776efa3f..000000000 --- a/debian/manpages/vtkWrapHierarchy-9.0.1 +++ /dev/null @@ -1,47 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.16. -.TH VTKWRAPHIERARCHY-9.0 "1" "November 2020" "vtkWrapHierarchy-9.0 9.0" "User Commands" -.SH NAME -vtkWrapHierarchy-9.0 \- please refer to VTK documentation -.SH SYNOPSIS -.B vtkWrapHierarchy-9.0 -[\fI\,options\/\fR] \fI\,infile\/\fR... -.SH DESCRIPTION -.TP -\fB\-\-help\fR -print this help message -.TP -\fB\-\-version\fR -print the VTK version -.TP -\fB\-o\fR -the output file -.TP -\fB\-I\fR -add an include directory -.TP -\fB\-D\fR -define a preprocessor macro -.TP -\fB\-U\fR -undefine a preprocessor macro -.TP -\fB\-imacros\fR -read macros from a header file -.TP -\fB\-undef\fR -do not predefine platform macros -.TP -@ -read arguments from a file -.SH "SEE ALSO" -The full documentation for -.B vtkWrapHierarchy-9.0 -is maintained as a Texinfo manual. If the -.B info -and -.B vtkWrapHierarchy-9.0 -programs are properly installed at your site, the command -.IP -.B info vtkWrapHierarchy-9.0 -.PP -should give you access to the complete manual. diff --git a/debian/manpages/vtkWrapHierarchy-9.1 b/debian/manpages/vtkWrapHierarchy-9.1 new file mode 100644 index 000000000..7776efa3f --- /dev/null +++ b/debian/manpages/vtkWrapHierarchy-9.1 @@ -0,0 +1,47 @@ +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.16. +.TH VTKWRAPHIERARCHY-9.0 "1" "November 2020" "vtkWrapHierarchy-9.0 9.0" "User Commands" +.SH NAME +vtkWrapHierarchy-9.0 \- please refer to VTK documentation +.SH SYNOPSIS +.B vtkWrapHierarchy-9.0 +[\fI\,options\/\fR] \fI\,infile\/\fR... +.SH DESCRIPTION +.TP +\fB\-\-help\fR +print this help message +.TP +\fB\-\-version\fR +print the VTK version +.TP +\fB\-o\fR +the output file +.TP +\fB\-I\fR +add an include directory +.TP +\fB\-D\fR +define a preprocessor macro +.TP +\fB\-U\fR +undefine a preprocessor macro +.TP +\fB\-imacros\fR +read macros from a header file +.TP +\fB\-undef\fR +do not predefine platform macros +.TP +@ +read arguments from a file +.SH "SEE ALSO" +The full documentation for +.B vtkWrapHierarchy-9.0 +is maintained as a Texinfo manual. If the +.B info +and +.B vtkWrapHierarchy-9.0 +programs are properly installed at your site, the command +.IP +.B info vtkWrapHierarchy-9.0 +.PP +should give you access to the complete manual. diff --git a/debian/manpages/vtkWrapJava-9.0.1 b/debian/manpages/vtkWrapJava-9.0.1 deleted file mode 100644 index 1b53e34ea..000000000 --- a/debian/manpages/vtkWrapJava-9.0.1 +++ /dev/null @@ -1,56 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.16. -.TH VTKWRAPJAVA-9.0 "1" "November 2020" "vtkWrapJava-9.0 9.0" "User Commands" -.SH NAME -vtkWrapJava-9.0 \- please refer to VTK documentation -.SH SYNOPSIS -.B vtkWrapJava-9.0 -[\fI\,options\/\fR] \fI\,infile\/\fR... -.SH DESCRIPTION -.TP -\fB\-\-help\fR -print this help message -.TP -\fB\-\-version\fR -print the VTK version -.TP -\fB\-o\fR -the output file -.TP -\fB\-I\fR -add an include directory -.TP -\fB\-D\fR -define a preprocessor macro -.TP -\fB\-U\fR -undefine a preprocessor macro -.TP -\fB\-imacros\fR -read macros from a header file -.TP -\fB\-undef\fR -do not predefine platform macros -.TP -@ -read arguments from a file -.TP -\fB\-dM\fR -dump all macro definitions to output -.TP -\fB\-\-hints\fR -the hints file to use -.TP -\fB\-\-types\fR -the type hierarchy file to use -.SH "SEE ALSO" -The full documentation for -.B vtkWrapJava-9.0 -is maintained as a Texinfo manual. If the -.B info -and -.B vtkWrapJava-9.0 -programs are properly installed at your site, the command -.IP -.B info vtkWrapJava-9.0 -.PP -should give you access to the complete manual. diff --git a/debian/manpages/vtkWrapJava-9.1 b/debian/manpages/vtkWrapJava-9.1 new file mode 100644 index 000000000..1b53e34ea --- /dev/null +++ b/debian/manpages/vtkWrapJava-9.1 @@ -0,0 +1,56 @@ +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.16. +.TH VTKWRAPJAVA-9.0 "1" "November 2020" "vtkWrapJava-9.0 9.0" "User Commands" +.SH NAME +vtkWrapJava-9.0 \- please refer to VTK documentation +.SH SYNOPSIS +.B vtkWrapJava-9.0 +[\fI\,options\/\fR] \fI\,infile\/\fR... +.SH DESCRIPTION +.TP +\fB\-\-help\fR +print this help message +.TP +\fB\-\-version\fR +print the VTK version +.TP +\fB\-o\fR +the output file +.TP +\fB\-I\fR +add an include directory +.TP +\fB\-D\fR +define a preprocessor macro +.TP +\fB\-U\fR +undefine a preprocessor macro +.TP +\fB\-imacros\fR +read macros from a header file +.TP +\fB\-undef\fR +do not predefine platform macros +.TP +@ +read arguments from a file +.TP +\fB\-dM\fR +dump all macro definitions to output +.TP +\fB\-\-hints\fR +the hints file to use +.TP +\fB\-\-types\fR +the type hierarchy file to use +.SH "SEE ALSO" +The full documentation for +.B vtkWrapJava-9.0 +is maintained as a Texinfo manual. If the +.B info +and +.B vtkWrapJava-9.0 +programs are properly installed at your site, the command +.IP +.B info vtkWrapJava-9.0 +.PP +should give you access to the complete manual. diff --git a/debian/manpages/vtkWrapPython-9.0.1 b/debian/manpages/vtkWrapPython-9.0.1 deleted file mode 100644 index 6d3b899c3..000000000 --- a/debian/manpages/vtkWrapPython-9.0.1 +++ /dev/null @@ -1,56 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.16. -.TH VTKWRAPPYTHON-9.0 "1" "November 2020" "vtkWrapPython-9.0 9.0" "User Commands" -.SH NAME -vtkWrapPython-9.0 \- please refer to VTK documentation -.SH SYNOPSIS -.B vtkWrapPython-9.0 -[\fI\,options\/\fR] \fI\,infile\/\fR... -.SH DESCRIPTION -.TP -\fB\-\-help\fR -print this help message -.TP -\fB\-\-version\fR -print the VTK version -.TP -\fB\-o\fR -the output file -.TP -\fB\-I\fR -add an include directory -.TP -\fB\-D\fR -define a preprocessor macro -.TP -\fB\-U\fR -undefine a preprocessor macro -.TP -\fB\-imacros\fR -read macros from a header file -.TP -\fB\-undef\fR -do not predefine platform macros -.TP -@ -read arguments from a file -.TP -\fB\-dM\fR -dump all macro definitions to output -.TP -\fB\-\-hints\fR -the hints file to use -.TP -\fB\-\-types\fR -the type hierarchy file to use -.SH "SEE ALSO" -The full documentation for -.B vtkWrapPython-9.0 -is maintained as a Texinfo manual. If the -.B info -and -.B vtkWrapPython-9.0 -programs are properly installed at your site, the command -.IP -.B info vtkWrapPython-9.0 -.PP -should give you access to the complete manual. diff --git a/debian/manpages/vtkWrapPython-9.1 b/debian/manpages/vtkWrapPython-9.1 new file mode 100644 index 000000000..6d3b899c3 --- /dev/null +++ b/debian/manpages/vtkWrapPython-9.1 @@ -0,0 +1,56 @@ +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.16. +.TH VTKWRAPPYTHON-9.0 "1" "November 2020" "vtkWrapPython-9.0 9.0" "User Commands" +.SH NAME +vtkWrapPython-9.0 \- please refer to VTK documentation +.SH SYNOPSIS +.B vtkWrapPython-9.0 +[\fI\,options\/\fR] \fI\,infile\/\fR... +.SH DESCRIPTION +.TP +\fB\-\-help\fR +print this help message +.TP +\fB\-\-version\fR +print the VTK version +.TP +\fB\-o\fR +the output file +.TP +\fB\-I\fR +add an include directory +.TP +\fB\-D\fR +define a preprocessor macro +.TP +\fB\-U\fR +undefine a preprocessor macro +.TP +\fB\-imacros\fR +read macros from a header file +.TP +\fB\-undef\fR +do not predefine platform macros +.TP +@ +read arguments from a file +.TP +\fB\-dM\fR +dump all macro definitions to output +.TP +\fB\-\-hints\fR +the hints file to use +.TP +\fB\-\-types\fR +the type hierarchy file to use +.SH "SEE ALSO" +The full documentation for +.B vtkWrapPython-9.0 +is maintained as a Texinfo manual. If the +.B info +and +.B vtkWrapPython-9.0 +programs are properly installed at your site, the command +.IP +.B info vtkWrapPython-9.0 +.PP +should give you access to the complete manual. diff --git a/debian/manpages/vtkWrapPythonInit-9.0.1 b/debian/manpages/vtkWrapPythonInit-9.0.1 deleted file mode 100644 index 55eef6657..000000000 --- a/debian/manpages/vtkWrapPythonInit-9.0.1 +++ /dev/null @@ -1,56 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.16. -.TH VTKWRAPPYTHONINIT-9.0 "1" "November 2020" "vtkWrapPythonInit-9.0 9.0" "User Commands" -.SH NAME -vtkWrapPythonInit-9.0 \- please refer to VTK documentation -.SH SYNOPSIS -.B vtkWrapPythonInit-9.0 -[\fI\,options\/\fR] \fI\,infile\/\fR... -.SH DESCRIPTION -.TP -\fB\-\-help\fR -print this help message -.TP -\fB\-\-version\fR -print the VTK version -.TP -\fB\-o\fR -the output file -.TP -\fB\-I\fR -add an include directory -.TP -\fB\-D\fR -define a preprocessor macro -.TP -\fB\-U\fR -undefine a preprocessor macro -.TP -\fB\-imacros\fR -read macros from a header file -.TP -\fB\-undef\fR -do not predefine platform macros -.TP -@ -read arguments from a file -.TP -\fB\-dM\fR -dump all macro definitions to output -.TP -\fB\-\-hints\fR -the hints file to use -.TP -\fB\-\-types\fR -the type hierarchy file to use -.SH "SEE ALSO" -The full documentation for -.B vtkWrapPythonInit-9.0 -is maintained as a Texinfo manual. If the -.B info -and -.B vtkWrapPythonInit-9.0 -programs are properly installed at your site, the command -.IP -.B info vtkWrapPythonInit-9.0 -.PP -should give you access to the complete manual. diff --git a/debian/manpages/vtkWrapPythonInit-9.1 b/debian/manpages/vtkWrapPythonInit-9.1 new file mode 100644 index 000000000..55eef6657 --- /dev/null +++ b/debian/manpages/vtkWrapPythonInit-9.1 @@ -0,0 +1,56 @@ +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.16. +.TH VTKWRAPPYTHONINIT-9.0 "1" "November 2020" "vtkWrapPythonInit-9.0 9.0" "User Commands" +.SH NAME +vtkWrapPythonInit-9.0 \- please refer to VTK documentation +.SH SYNOPSIS +.B vtkWrapPythonInit-9.0 +[\fI\,options\/\fR] \fI\,infile\/\fR... +.SH DESCRIPTION +.TP +\fB\-\-help\fR +print this help message +.TP +\fB\-\-version\fR +print the VTK version +.TP +\fB\-o\fR +the output file +.TP +\fB\-I\fR +add an include directory +.TP +\fB\-D\fR +define a preprocessor macro +.TP +\fB\-U\fR +undefine a preprocessor macro +.TP +\fB\-imacros\fR +read macros from a header file +.TP +\fB\-undef\fR +do not predefine platform macros +.TP +@ +read arguments from a file +.TP +\fB\-dM\fR +dump all macro definitions to output +.TP +\fB\-\-hints\fR +the hints file to use +.TP +\fB\-\-types\fR +the type hierarchy file to use +.SH "SEE ALSO" +The full documentation for +.B vtkWrapPythonInit-9.0 +is maintained as a Texinfo manual. If the +.B info +and +.B vtkWrapPythonInit-9.0 +programs are properly installed at your site, the command +.IP +.B info vtkWrapPythonInit-9.0 +.PP +should give you access to the complete manual. diff --git a/debian/manpages/vtkpython-9.0.1 b/debian/manpages/vtkpython-9.0.1 deleted file mode 100644 index 4490bb924..000000000 --- a/debian/manpages/vtkpython-9.0.1 +++ /dev/null @@ -1,153 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.16. -.TH PYTHON "1" "November 2020" "Python 3.9.0+" "User Commands" -.SH NAME -Python \- manual page for vtkPython 3.9.0+ : VTK-Wrapper for Python -.SH DESCRIPTION -usage: /usr/bin/../lib/x86_64\-linux\-gnu/vtkpython [option] ... [\-c cmd | \fB\-m\fR mod | file | \fB\-]\fR [arg] ... -Options and arguments (and corresponding environment variables): -\fB\-b\fR : issue warnings about str(bytes_instance), str(bytearray_instance) -.IP -and comparing bytes/bytearray with str. (\fB\-bb\fR: issue errors) -.PP -\fB\-B\fR : don't write .pyc files on import; also PYTHONDONTWRITEBYTECODE=x -\fB\-c\fR cmd : program passed in as string (terminates option list) -\fB\-d\fR : debug output from parser; also PYTHONDEBUG=x -\fB\-E\fR : ignore PYTHON* environment variables (such as PYTHONPATH) -\fB\-h\fR : print this help message and exit (also \fB\-\-help\fR) -\fB\-i\fR : inspect interactively after running script; forces a prompt even -.IP -if stdin does not appear to be a terminal; also PYTHONINSPECT=x -.PP -\fB\-I\fR : isolate Python from the user's environment (implies \fB\-E\fR and \fB\-s\fR) -\fB\-m\fR mod : run library module as a script (terminates option list) -\fB\-O\fR : remove assert and __debug__\-dependent statements; add .opt\-1 before -.IP -\&.pyc extension; also PYTHONOPTIMIZE=x -.PP -\fB\-OO\fR : do \fB\-O\fR changes and also discard docstrings; add .opt\-2 before -.IP -\&.pyc extension -.PP -\fB\-q\fR : don't print version and copyright messages on interactive startup -\fB\-s\fR : don't add user site directory to sys.path; also PYTHONNOUSERSITE -\fB\-S\fR : don't imply 'import site' on initialization -\fB\-u\fR : force the stdout and stderr streams to be unbuffered; -.IP -this option has no effect on stdin; also PYTHONUNBUFFERED=x -.PP -\fB\-v\fR : verbose (trace import statements); also PYTHONVERBOSE=x -.IP -can be supplied multiple times to increase verbosity -.PP -\fB\-V\fR : print the Python version number and exit (also \fB\-\-version\fR) -.IP -when given twice, print more information about the build -.PP -\fB\-W\fR arg : warning control; arg is action:message:category:module:lineno -.IP -also PYTHONWARNINGS=arg -.PP -\fB\-x\fR : skip first line of source, allowing use of non\-Unix forms of #!cmd -\fB\-X\fR opt : set implementation\-specific option. The following options are available: -.HP -\fB\-X\fR faulthandler: enable faulthandler -.HP -\fB\-X\fR oldparser: enable the traditional LL(1) parser; also PYTHONOLDPARSER -.HP -\fB\-X\fR showrefcount: output the total reference count and number of used -.IP -memory blocks when the program finishes or after each statement in the -interactive interpreter. This only works on debug builds -.HP -\fB\-X\fR tracemalloc: start tracing Python memory allocations using the -.IP -tracemalloc module. By default, only the most recent frame is stored in a -traceback of a trace. Use \fB\-X\fR tracemalloc=NFRAME to start tracing with a -traceback limit of NFRAME frames -.HP -\fB\-X\fR importtime: show how long each import takes. It shows module name, -.IP -cumulative time (including nested imports) and self time (excluding -nested imports). Note that its output may be broken in multi\-threaded -application. Typical usage is python3 \fB\-X\fR importtime \fB\-c\fR 'import asyncio' -.HP -\fB\-X\fR dev: enable CPython's "development mode", introducing additional runtime -.IP -checks which are too expensive to be enabled by default. Effect of the -developer mode: -.IP -* Add default warning filter, as \fB\-W\fR default -* Install debug hooks on memory allocators: see the PyMem_SetupDebugHooks() C function -* Enable the faulthandler module to dump the Python traceback on a crash -* Enable asyncio debug mode -* Set the dev_mode attribute of sys.flags to True -* io.IOBase destructor logs close() exceptions -.HP -\fB\-X\fR utf8: enable UTF\-8 mode for operating system interfaces, overriding the default -.IP -locale\-aware mode. \fB\-X\fR utf8=0 explicitly disables UTF\-8 mode (even when it would -otherwise activate automatically) -.HP -\fB\-X\fR pycache_prefix=PATH: enable writing .pyc files to a parallel tree rooted at the -.IP -given directory instead of to the code tree -.SS "--check-hash-based-pycs always|default|never:" -.IP -control how Python invalidates hash\-based .pyc files -.PP -file : program read from script file -\- : program read from stdin (default; interactive mode if a tty) -arg ...: arguments passed to program in sys.argv[1:] -.PP -Other environment variables: -PYTHONSTARTUP: file executed on interactive startup (no default) -PYTHONPATH : ':'\-separated list of directories prefixed to the -.TP -default module search path. -The result is sys.path. -.PP -PYTHONHOME : alternate directory (or :). -.IP -The default module search path uses /lib/pythonX.X. -.PP -PYTHONPLATLIBDIR : override sys.platlibdir. -PYTHONCASEOK : ignore case in 'import' statements (Windows). -PYTHONUTF8: if set to 1, enable the UTF\-8 mode. -PYTHONIOENCODING: Encoding[:errors] used for stdin/stdout/stderr. -PYTHONFAULTHANDLER: dump the Python traceback on fatal errors. -PYTHONHASHSEED: if this variable is set to 'random', a random value is used -.TP -to seed the hashes of str and bytes objects. -It can also be set to an -.IP -integer in the range [0,4294967295] to get hash values with a -predictable seed. -.PP -PYTHONMALLOC: set the Python memory allocators and/or install debug hooks -.IP -on Python memory allocators. Use PYTHONMALLOC=debug to install debug -hooks. -.PP -PYTHONCOERCECLOCALE: if this variable is set to 0, it disables the locale -.IP -coercion behavior. Use PYTHONCOERCECLOCALE=warn to request display of -locale coercion and locale compatibility warnings on stderr. -.PP -PYTHONBREAKPOINT: if this variable is set to 0, it disables the default -.IP -debugger. It can be set to the callable of your debugger of choice. -.PP -PYTHONDEVMODE: enable the development mode. -PYTHONPYCACHEPREFIX: root directory for bytecode cache (pyc) files. -.SH "SEE ALSO" -The full documentation for -.B Python -is maintained as a Texinfo manual. If the -.B info -and -.B Python -programs are properly installed at your site, the command -.IP -.B info Python -.PP -should give you access to the complete manual. diff --git a/debian/manpages/vtkpython-9.1 b/debian/manpages/vtkpython-9.1 new file mode 100644 index 000000000..4490bb924 --- /dev/null +++ b/debian/manpages/vtkpython-9.1 @@ -0,0 +1,153 @@ +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.16. +.TH PYTHON "1" "November 2020" "Python 3.9.0+" "User Commands" +.SH NAME +Python \- manual page for vtkPython 3.9.0+ : VTK-Wrapper for Python +.SH DESCRIPTION +usage: /usr/bin/../lib/x86_64\-linux\-gnu/vtkpython [option] ... [\-c cmd | \fB\-m\fR mod | file | \fB\-]\fR [arg] ... +Options and arguments (and corresponding environment variables): +\fB\-b\fR : issue warnings about str(bytes_instance), str(bytearray_instance) +.IP +and comparing bytes/bytearray with str. (\fB\-bb\fR: issue errors) +.PP +\fB\-B\fR : don't write .pyc files on import; also PYTHONDONTWRITEBYTECODE=x +\fB\-c\fR cmd : program passed in as string (terminates option list) +\fB\-d\fR : debug output from parser; also PYTHONDEBUG=x +\fB\-E\fR : ignore PYTHON* environment variables (such as PYTHONPATH) +\fB\-h\fR : print this help message and exit (also \fB\-\-help\fR) +\fB\-i\fR : inspect interactively after running script; forces a prompt even +.IP +if stdin does not appear to be a terminal; also PYTHONINSPECT=x +.PP +\fB\-I\fR : isolate Python from the user's environment (implies \fB\-E\fR and \fB\-s\fR) +\fB\-m\fR mod : run library module as a script (terminates option list) +\fB\-O\fR : remove assert and __debug__\-dependent statements; add .opt\-1 before +.IP +\&.pyc extension; also PYTHONOPTIMIZE=x +.PP +\fB\-OO\fR : do \fB\-O\fR changes and also discard docstrings; add .opt\-2 before +.IP +\&.pyc extension +.PP +\fB\-q\fR : don't print version and copyright messages on interactive startup +\fB\-s\fR : don't add user site directory to sys.path; also PYTHONNOUSERSITE +\fB\-S\fR : don't imply 'import site' on initialization +\fB\-u\fR : force the stdout and stderr streams to be unbuffered; +.IP +this option has no effect on stdin; also PYTHONUNBUFFERED=x +.PP +\fB\-v\fR : verbose (trace import statements); also PYTHONVERBOSE=x +.IP +can be supplied multiple times to increase verbosity +.PP +\fB\-V\fR : print the Python version number and exit (also \fB\-\-version\fR) +.IP +when given twice, print more information about the build +.PP +\fB\-W\fR arg : warning control; arg is action:message:category:module:lineno +.IP +also PYTHONWARNINGS=arg +.PP +\fB\-x\fR : skip first line of source, allowing use of non\-Unix forms of #!cmd +\fB\-X\fR opt : set implementation\-specific option. The following options are available: +.HP +\fB\-X\fR faulthandler: enable faulthandler +.HP +\fB\-X\fR oldparser: enable the traditional LL(1) parser; also PYTHONOLDPARSER +.HP +\fB\-X\fR showrefcount: output the total reference count and number of used +.IP +memory blocks when the program finishes or after each statement in the +interactive interpreter. This only works on debug builds +.HP +\fB\-X\fR tracemalloc: start tracing Python memory allocations using the +.IP +tracemalloc module. By default, only the most recent frame is stored in a +traceback of a trace. Use \fB\-X\fR tracemalloc=NFRAME to start tracing with a +traceback limit of NFRAME frames +.HP +\fB\-X\fR importtime: show how long each import takes. It shows module name, +.IP +cumulative time (including nested imports) and self time (excluding +nested imports). Note that its output may be broken in multi\-threaded +application. Typical usage is python3 \fB\-X\fR importtime \fB\-c\fR 'import asyncio' +.HP +\fB\-X\fR dev: enable CPython's "development mode", introducing additional runtime +.IP +checks which are too expensive to be enabled by default. Effect of the +developer mode: +.IP +* Add default warning filter, as \fB\-W\fR default +* Install debug hooks on memory allocators: see the PyMem_SetupDebugHooks() C function +* Enable the faulthandler module to dump the Python traceback on a crash +* Enable asyncio debug mode +* Set the dev_mode attribute of sys.flags to True +* io.IOBase destructor logs close() exceptions +.HP +\fB\-X\fR utf8: enable UTF\-8 mode for operating system interfaces, overriding the default +.IP +locale\-aware mode. \fB\-X\fR utf8=0 explicitly disables UTF\-8 mode (even when it would +otherwise activate automatically) +.HP +\fB\-X\fR pycache_prefix=PATH: enable writing .pyc files to a parallel tree rooted at the +.IP +given directory instead of to the code tree +.SS "--check-hash-based-pycs always|default|never:" +.IP +control how Python invalidates hash\-based .pyc files +.PP +file : program read from script file +\- : program read from stdin (default; interactive mode if a tty) +arg ...: arguments passed to program in sys.argv[1:] +.PP +Other environment variables: +PYTHONSTARTUP: file executed on interactive startup (no default) +PYTHONPATH : ':'\-separated list of directories prefixed to the +.TP +default module search path. +The result is sys.path. +.PP +PYTHONHOME : alternate directory (or :). +.IP +The default module search path uses /lib/pythonX.X. +.PP +PYTHONPLATLIBDIR : override sys.platlibdir. +PYTHONCASEOK : ignore case in 'import' statements (Windows). +PYTHONUTF8: if set to 1, enable the UTF\-8 mode. +PYTHONIOENCODING: Encoding[:errors] used for stdin/stdout/stderr. +PYTHONFAULTHANDLER: dump the Python traceback on fatal errors. +PYTHONHASHSEED: if this variable is set to 'random', a random value is used +.TP +to seed the hashes of str and bytes objects. +It can also be set to an +.IP +integer in the range [0,4294967295] to get hash values with a +predictable seed. +.PP +PYTHONMALLOC: set the Python memory allocators and/or install debug hooks +.IP +on Python memory allocators. Use PYTHONMALLOC=debug to install debug +hooks. +.PP +PYTHONCOERCECLOCALE: if this variable is set to 0, it disables the locale +.IP +coercion behavior. Use PYTHONCOERCECLOCALE=warn to request display of +locale coercion and locale compatibility warnings on stderr. +.PP +PYTHONBREAKPOINT: if this variable is set to 0, it disables the default +.IP +debugger. It can be set to the callable of your debugger of choice. +.PP +PYTHONDEVMODE: enable the development mode. +PYTHONPYCACHEPREFIX: root directory for bytecode cache (pyc) files. +.SH "SEE ALSO" +The full documentation for +.B Python +is maintained as a Texinfo manual. If the +.B info +and +.B Python +programs are properly installed at your site, the command +.IP +.B info Python +.PP +should give you access to the complete manual. diff --git a/debian/patches/10_matplotlib.patch b/debian/patches/10_matplotlib.patch index b917377a4..c7e78fb47 100644 --- a/debian/patches/10_matplotlib.patch +++ b/debian/patches/10_matplotlib.patch @@ -1,9 +1,9 @@ Description: _matplotlib -Index: VTK-9.0.1/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h +Index: VTK-9.1.0/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h =================================================================== ---- VTK-9.0.1.orig/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h -+++ VTK-9.0.1/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h -@@ -151,6 +151,10 @@ private: +--- VTK-9.1.0.orig/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h ++++ VTK-9.1.0/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h +@@ -197,6 +197,10 @@ private: * to implement IsAvailable. */ static Availability CheckMPLAvailability(); @@ -12,5 +12,5 @@ Index: VTK-9.0.1/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h + MPLMathTextAvailable = UNAVAILABLE; + }; - //@{ + ///@{ /** diff --git a/debian/patches/fix_ftbfs.patch b/debian/patches/fix_ftbfs.patch new file mode 100644 index 000000000..630b3ced1 --- /dev/null +++ b/debian/patches/fix_ftbfs.patch @@ -0,0 +1,15 @@ +Description: Fix FTBFS +Author: Anton Gladky +Last-Update: 2021-11-14 + +--- vtk9-9.1.0+dfsg1.orig/CMake/vtkCompilerExtraFlags.cmake ++++ vtk9-9.1.0+dfsg1/CMake/vtkCompilerExtraFlags.cmake +@@ -3,7 +3,7 @@ if(CMAKE_COMPILER_IS_GNUCXX) + include(CheckCXXCompilerFlag) + + # Additional warnings for GCC +- set(CMAKE_CXX_FLAGS_WARN "-Wnon-virtual-dtor -Wno-long-long -ansi -Wcast-align -Wchar-subscripts -Wall -Wextra -Wpointer-arith -Wformat-security -Woverloaded-virtual -Wshadow -Wunused-parameter -fno-check-new -fno-common -Werror=undef") ++ set(CMAKE_CXX_FLAGS_WARN "-Wnon-virtual-dtor -Wno-long-long -ansi -Wcast-align -Wchar-subscripts -Wall -Wextra -Wpointer-arith -Wformat-security -Woverloaded-virtual -Wshadow -Wunused-parameter -fno-check-new -fno-common") + + # This flag is useful as not returning from a non-void function is an error + # with MSVC, but it is not supported on all GCC compiler versions diff --git a/debian/patches/series b/debian/patches/series index 3ebf461ba..174092621 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,13 +4,14 @@ 40_vtkpython-9.patch 50_fix_python-modules_path.patch 60_fix_path_perl.patch -70_fix_python_numpy_warning.patch -80_allow_gles_platforms.patch -81_allow_gles_platforms.patch -82_allow_gles_platforms.patch -83_allow_gles_platforms.patch -91_include_limits.patch -92_proj8.patch +#70_fix_python_numpy_warning.patch +#80_allow_gles_platforms.patch +#81_allow_gles_platforms.patch +#82_allow_gles_platforms.patch +#83_allow_gles_platforms.patch +#91_include_limits.patch +#92_proj8.patch 95_java_mach-arch_fix.patch 97_reproducible_builds.patch 98_fix_mpi4py.py +fix_ftbfs.patch diff --git a/debian/python3-vtk9.install b/debian/python3-vtk9.install index 5e635d887..607890b3d 100644 --- a/debian/python3-vtk9.install +++ b/debian/python3-vtk9.install @@ -1,5 +1,5 @@ usr/lib/python3 usr/bin/pvtkpython usr/bin/vtkpython-9.0 -usr/bin/vtkWrapPython-9.0 -usr/bin/vtkWrapPythonInit-9.0 +usr/bin/vtkWrapPython-9.1 +usr/bin/vtkWrapPythonInit-9.1 diff --git a/debian/python3-vtk9.manpages b/debian/python3-vtk9.manpages index c8798d1ff..b7d585d08 100644 --- a/debian/python3-vtk9.manpages +++ b/debian/python3-vtk9.manpages @@ -1,3 +1,3 @@ -debian/manpages/vtkWrapPython-9.0.1 -debian/manpages/vtkWrapPythonInit-9.0.1 -debian/manpages/vtkpython-9.0.1 +debian/manpages/vtkWrapPython-9.1 +debian/manpages/vtkWrapPythonInit-9.1 +debian/manpages/vtkpython-9.1 diff --git a/debian/rules b/debian/rules index 819a0b708..5e97368b8 100755 --- a/debian/rules +++ b/debian/rules @@ -32,6 +32,7 @@ extra_flags += \ -DVTK_EXTRA_COMPILER_WARNINGS=ON \ -DVTK_GROUP_ENABLE_Qt:STRING="YES" \ -DVTK_MODULE_ENABLE_VTK_GUISupportQtSQL:STRING="NO" \ + -DVTK_MODULE_ENABLE_VTK_GUISupportQtQuick:STRING="DONT_WANT" \ -DVTK_GROUP_ENABLE_Rendering:STRING="YES" \ -DVTK_GROUP_ENABLE_StandAlone:STRING="YES" \ -DVTK_GROUP_ENABLE_Views:STRING="YES" \ @@ -91,7 +92,7 @@ ifneq ($(JAVA_HOME),) # Correct headers for paraview mv $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/java/vtk.jar $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/java/vtk9.jar endif - sed -i -e "s/FATAL_ERROR/STATUS/g" $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/cmake/vtk-9.0/VTK-targets.cmake + sed -i -e "s/FATAL_ERROR/STATUS/g" $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/cmake/vtk-9.1/VTK-targets.cmake execute_after_dh_install: rm -rf $(CURDIR)/debian/tmp/usr/share/licenses diff --git a/debian/vtk9-doc.docs b/debian/vtk9-doc.docs index dba89dfb0..3cdba6c33 100644 --- a/debian/vtk9-doc.docs +++ b/debian/vtk9-doc.docs @@ -1,2 +1,2 @@ -debian/tmp/usr/share/doc/vtk-9.0/doxygen +debian/tmp/usr/share/doc/vtk-9.1/doxygen debian/build/Utilities/Doxygen/doc/html diff --git a/debian/vtk9.install b/debian/vtk9.install index 30059ddd8..c216fad72 100644 --- a/debian/vtk9.install +++ b/debian/vtk9.install @@ -1,2 +1,2 @@ -usr/bin/vtkWrapHierarchy-9.0 -usr/bin/vtkProbeOpenGLVersion-9.0 +usr/bin/vtkWrapHierarchy-9.1 +usr/bin/vtkProbeOpenGLVersion-9.1 diff --git a/debian/vtk9.manpages b/debian/vtk9.manpages index 9565d6264..0978fb401 100644 --- a/debian/vtk9.manpages +++ b/debian/vtk9.manpages @@ -1,2 +1,2 @@ -debian/manpages/vtkWrapHierarchy-9.0.1 -debian/manpages/vtkProbeOpenGLVersion-9.0.1 +debian/manpages/vtkWrapHierarchy-9.1 +debian/manpages/vtkProbeOpenGLVersion-9.1