Control: tags 906714 + pending
Dear maintainer,
I've prepared an NMU for paraview (versioned as 5.4.1+dfsg4-3.1) and
uploaded it to DELAYED/14. Please feel free to tell me if I should
cancel it.
cu
Adrian
--
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed
diff -Nru paraview-5.4.1+dfsg4/debian/changelog paraview-5.4.1+dfsg4/debian/changelog
--- paraview-5.4.1+dfsg4/debian/changelog 2018-04-22 13:35:56.000000000 +0300
+++ paraview-5.4.1+dfsg4/debian/changelog 2018-09-17 19:59:09.000000000 +0300
@@ -1,3 +1,12 @@
+paraview (5.4.1+dfsg4-3.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Backport upstream FTBFS fixes, thanks to Juhani Numminen.
+ (Closes: #906714)
+ * Remove tcl8.5 as first dependency alternative. (Closes: #905980)
+
+ -- Adrian Bunk <[email protected]> Mon, 17 Sep 2018 19:59:09 +0300
+
paraview (5.4.1+dfsg4-3) unstable; urgency=medium
* Team upload
diff -Nru paraview-5.4.1+dfsg4/debian/control paraview-5.4.1+dfsg4/debian/control
--- paraview-5.4.1+dfsg4/debian/control 2018-04-22 13:35:56.000000000 +0300
+++ paraview-5.4.1+dfsg4/debian/control 2018-09-17 19:59:09.000000000 +0300
@@ -68,7 +68,7 @@
Package: paraview
Architecture: any
-Depends: tcl8.5 | tclsh,
+Depends: tclsh,
${shlibs:Depends},
${misc:Depends},
python-matplotlib,
diff -Nru paraview-5.4.1+dfsg4/debian/patches/0001-ENH-Changes-needed-to-support-Qt-5.11.patch paraview-5.4.1+dfsg4/debian/patches/0001-ENH-Changes-needed-to-support-Qt-5.11.patch
--- paraview-5.4.1+dfsg4/debian/patches/0001-ENH-Changes-needed-to-support-Qt-5.11.patch 1970-01-01 02:00:00.000000000 +0200
+++ paraview-5.4.1+dfsg4/debian/patches/0001-ENH-Changes-needed-to-support-Qt-5.11.patch 2018-09-17 19:59:09.000000000 +0300
@@ -0,0 +1,115 @@
+From 931c779dde8460fe32aa8a3d19956b175b96e4f9 Mon Sep 17 00:00:00 2001
+From: Robert O'Bara <[email protected]>
+Date: Thu, 24 May 2018 09:49:28 -0400
+Subject: ENH: Changes needed to support Qt 5.11
+
+Basically needed to add missing header files.
+---
+ Plugins/SLACTools/pqSLACDataLoadManager.cxx | 1 +
+ Qt/ApplicationComponents/pqColorMapEditor.cxx | 1 +
+ Qt/ApplicationComponents/pqDoubleRangeSliderPropertyWidget.cxx | 1 +
+ Qt/ApplicationComponents/pqStandardViewFrameActionsImplementation.cxx | 1 +
+ Qt/ApplicationComponents/pqTimeInspectorWidget.cxx | 1 +
+ Qt/ApplicationComponents/pqTransferFunctionWidgetPropertyDialog.cxx | 2 ++
+ Qt/ApplicationComponents/pqViewResolutionPropertyWidget.cxx | 1 +
+ Qt/Components/pqChangeInputDialog.cxx | 1 +
+ Qt/Components/pqCinemaTrackSelection.cxx | 1 +
+ Qt/Python/pqPythonShell.cxx | 1 +
+ 10 files changed, 11 insertions(+)
+
+Index: paraview-5.4.1+dfsg4/Plugins/SLACTools/pqSLACDataLoadManager.cxx
+===================================================================
+--- paraview-5.4.1+dfsg4.orig/Plugins/SLACTools/pqSLACDataLoadManager.cxx
++++ paraview-5.4.1+dfsg4/Plugins/SLACTools/pqSLACDataLoadManager.cxx
+@@ -33,6 +33,7 @@
+ #include "vtkSMProperty.h"
+ #include "vtkSMSourceProxy.h"
+
++#include <QAction>
+ #include <QPushButton>
+ #include <QtDebug>
+
+Index: paraview-5.4.1+dfsg4/Qt/ApplicationComponents/pqColorMapEditor.cxx
+===================================================================
+--- paraview-5.4.1+dfsg4.orig/Qt/ApplicationComponents/pqColorMapEditor.cxx
++++ paraview-5.4.1+dfsg4/Qt/ApplicationComponents/pqColorMapEditor.cxx
+@@ -59,6 +59,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI
+ #include <QDebug>
+ #include <QKeyEvent>
+ #include <QPointer>
++#include <QStyle>
+ #include <QVBoxLayout>
+
+ class pqColorMapEditor::pqInternals
+Index: paraview-5.4.1+dfsg4/Qt/ApplicationComponents/pqDoubleRangeSliderPropertyWidget.cxx
+===================================================================
+--- paraview-5.4.1+dfsg4.orig/Qt/ApplicationComponents/pqDoubleRangeSliderPropertyWidget.cxx
++++ paraview-5.4.1+dfsg4/Qt/ApplicationComponents/pqDoubleRangeSliderPropertyWidget.cxx
+@@ -43,6 +43,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI
+ #include "vtkSMUncheckedPropertyHelper.h"
+
+ #include <QGridLayout>
++#include <QStyle>
+
+ class pqDoubleRangeSliderPropertyWidget::pqInternals
+ {
+Index: paraview-5.4.1+dfsg4/Qt/ApplicationComponents/pqStandardViewFrameActionsImplementation.cxx
+===================================================================
+--- paraview-5.4.1+dfsg4.orig/Qt/ApplicationComponents/pqStandardViewFrameActionsImplementation.cxx
++++ paraview-5.4.1+dfsg4/Qt/ApplicationComponents/pqStandardViewFrameActionsImplementation.cxx
+@@ -69,6 +69,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI
+ #include <QPushButton>
+ #include <QSet>
+ #include <QShortcut>
++#include <QStyle>
+
+ //-----------------------------------------------------------------------------
+ pqStandardViewFrameActionsImplementation::pqStandardViewFrameActionsImplementation(
+Index: paraview-5.4.1+dfsg4/Qt/ApplicationComponents/pqTimeInspectorWidget.cxx
+===================================================================
+--- paraview-5.4.1+dfsg4.orig/Qt/ApplicationComponents/pqTimeInspectorWidget.cxx
++++ paraview-5.4.1+dfsg4/Qt/ApplicationComponents/pqTimeInspectorWidget.cxx
+@@ -49,6 +49,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI
+ #include "vtkSMPropertyHelper.h"
+ #include "vtkSMSourceProxy.h"
+
++#include <QHeaderView>
+ #include <QLineF>
+ #include <QPainter>
+ #include <QVariant>
+Index: paraview-5.4.1+dfsg4/Qt/ApplicationComponents/pqViewResolutionPropertyWidget.cxx
+===================================================================
+--- paraview-5.4.1+dfsg4.orig/Qt/ApplicationComponents/pqViewResolutionPropertyWidget.cxx
++++ paraview-5.4.1+dfsg4/Qt/ApplicationComponents/pqViewResolutionPropertyWidget.cxx
+@@ -39,6 +39,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI
+ #include "vtkSMProxy.h"
+
+ #include <QIntValidator>
++#include <QStyle>
+
+ class pqViewResolutionPropertyWidget::pqInternals
+ {
+Index: paraview-5.4.1+dfsg4/Qt/Components/pqChangeInputDialog.cxx
+===================================================================
+--- paraview-5.4.1+dfsg4.orig/Qt/Components/pqChangeInputDialog.cxx
++++ paraview-5.4.1+dfsg4/Qt/Components/pqChangeInputDialog.cxx
+@@ -45,6 +45,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI
+ #include "vtkSMProxy.h"
+ #include "vtkSmartPointer.h"
+
++#include <QHeaderView>
+ #include <QItemSelectionModel>
+ #include <QLineEdit>
+ #include <QRadioButton>
+Index: paraview-5.4.1+dfsg4/Qt/Components/pqCinemaTrackSelection.cxx
+===================================================================
+--- paraview-5.4.1+dfsg4.orig/Qt/Components/pqCinemaTrackSelection.cxx
++++ paraview-5.4.1+dfsg4/Qt/Components/pqCinemaTrackSelection.cxx
+@@ -30,6 +30,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI
+
+ ========================================================================*/
+ #include <QDebug>
++#include <QHeaderView>
+
+ #include "vtkPVArrayInformation.h"
+ #include "vtkPVDataInformation.h"
diff -Nru paraview-5.4.1+dfsg4/debian/patches/0001-Fix-StreamLinesRepresentation-plugin-documentation-i.patch paraview-5.4.1+dfsg4/debian/patches/0001-Fix-StreamLinesRepresentation-plugin-documentation-i.patch
--- paraview-5.4.1+dfsg4/debian/patches/0001-Fix-StreamLinesRepresentation-plugin-documentation-i.patch 1970-01-01 02:00:00.000000000 +0200
+++ paraview-5.4.1+dfsg4/debian/patches/0001-Fix-StreamLinesRepresentation-plugin-documentation-i.patch 2018-09-17 19:59:09.000000000 +0300
@@ -0,0 +1,24 @@
+From f9c7e4b01341f45aec55f452b583c544e2557ca4 Mon Sep 17 00:00:00 2001
+From: Joachim Pouderoux <[email protected]>
+Date: Thu, 9 Aug 2018 11:07:54 -0400
+Subject: Fix StreamLinesRepresentation plugin documentation issue
+
+---
+ Plugins/StreamLinesRepresentation/CMakeLists.txt | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/Plugins/StreamLinesRepresentation/CMakeLists.txt b/Plugins/StreamLinesRepresentation/CMakeLists.txt
+index 5d656a54b8..86c24964fe 100644
+--- a/Plugins/StreamLinesRepresentation/CMakeLists.txt
++++ b/Plugins/StreamLinesRepresentation/CMakeLists.txt
+@@ -41,7 +41,6 @@ encode_files_as_strings(ENCODED_STRING_FILES
+
+ add_paraview_plugin(
+ StreamLinesRepresentation "0.1"
+- DOCUMENTATION_DIR "${CMAKE_CURRENT_SOURCE_DIR}/doc"
+ SERVER_MANAGER_XML StreamLinesRepresentation.xml
+ SERVER_MANAGER_SOURCES
+ vtkStreamLinesRepresentation.cxx
+--
+2.11.0
+
diff -Nru paraview-5.4.1+dfsg4/debian/patches/series paraview-5.4.1+dfsg4/debian/patches/series
--- paraview-5.4.1+dfsg4/debian/patches/series 2018-04-22 13:35:56.000000000 +0300
+++ paraview-5.4.1+dfsg4/debian/patches/series 2018-09-17 19:59:09.000000000 +0300
@@ -7,3 +7,5 @@
fix_gl2ps_new.patch
fix_opengl_arm.patch
disable-local-FindMPI.patch
+0001-ENH-Changes-needed-to-support-Qt-5.11.patch
+0001-Fix-StreamLinesRepresentation-plugin-documentation-i.patch
