<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d3e87104ba6b27df5984cb775a313ca87ffc0610">https://github.com/macports/macports-ports/commit/d3e87104ba6b27df5984cb775a313ca87ffc0610</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit d3e87104ba6b27df5984cb775a313ca87ffc0610
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Thu Jun 27 19:07:54 2019 -0700
<span style='display:block; white-space:pre;color:#404040;'> paraview: update version 5.5.2->5.6.1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Use MacPorts Libraries whenever possible.
</span>---
science/paraview/Portfile | 60 +++++++--
science/paraview/files/patch-icon-size.diff | 68 ++++++++++
.../paraview/files/patch-incomplete-types.patch | 144 ---------------------
science/paraview/files/patch-ogg_dependency.diff | 10 ++
science/paraview/files/patch-system_ok.diff | 11 ++
.../paraview/files/patch-vtk_target_export.diff | 26 ++++
6 files changed, 163 insertions(+), 156 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/paraview/Portfile b/science/paraview/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4e8144c..2a2f05c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/paraview/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/paraview/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,8 +8,8 @@ PortGroup qt5 1.0
</span> PortGroup mpi 1.0
name paraview
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 5.5.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 5.6.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span>
categories science graphics
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,19 +32,53 @@ homepage https://www.paraview.org/
</span> master_sites ${homepage}/files/v${branch}/
distname ParaView-v${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums sha256 64561f34c4402b88f3cb20a956842394dde5838efd7ebb301157a837114a0e2d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 b8bb2f50615e9db85dc986e108531ffffad1c96e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 51418473
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build-append port:readline \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:netcdf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_xz yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums sha256 50ef01f54db6358b402e50d1460ef47c04d675bf26f250c6937737169f1e6612 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 623a29d65d39d65644605bb40943f22df3918fff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 38756076
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Fix the icon size of the render area. This should be already included
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# version > 5.6.0. So when you bump the version, you should be able to remove
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# this patch file.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-icon-size.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-vtk_target_export.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-ogg_dependency.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-system_ok.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append path:include/eigen3/Eigen/Eigen:eigen3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:glew \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:double-conversion \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:lz4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:zlib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:expat \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:jpeg \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libpng \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:tiff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:jsoncpp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pugixml \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:protobuf3-cpp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libogg \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libtheora \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libxml2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:freetype \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:hdf5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:netcdf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:netcdf-cxx \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gl2ps \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:cgnslib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:icet \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:diy2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:PEGTL \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:qttesting \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:readline
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+mpi.enforce_variant icet
</span>
qt5.depends_component sqlite-plugin qttools qtxmlpatterns
qt5.min_version 5.6
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-incomplete-types.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> cmake.install_rpath
# paraview sets its own optimization flags
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -75,7 +109,9 @@ configure.args-append \
</span> -DPARAVIEW_QT_VERSION=5 \
-DQt5_DIR=${qt_dir} \
-DQT_HELP_GENERATOR=${qt_bins_dir}/qhelpgenerator \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DQT_XMLPATTERNS_EXECUTABLE=${qt_bins_dir}/xmlpatterns
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DQT_XMLPATTERNS_EXECUTABLE=${qt_bins_dir}/xmlpatterns \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DVTK_USE_SYSTEM_LIBRARIES:BOOL=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DVTK_USE_SYSTEM_XDMF2:BOOL=OFF
</span>
pre-configure {
configure.args-append -DCMAKE_CXX_COMPILER=${configure.cxx} \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/paraview/files/patch-icon-size.diff b/science/paraview/files/patch-icon-size.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..6c34f9e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/paraview/files/patch-icon-size.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,68 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 34c71b9941d8473bc7d1f6920b37fdba16cd8d6b Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Utkarsh Ayachit <utkarsh.ayachit@kitware.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sat, 30 Mar 2019 08:25:17 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] fix pixmap size
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+On macOS with Qt 5.12, the icon for popping a layout tab out was
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+rendered quite large. Fixed that. Also uses newer api
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+QStyle::standardIcon instead of QStyle::standardPixmap which has been
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+deprecated.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Qt/Components/pqTabbedMultiViewWidget.cxx | 18 ++++++++++++------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 12 insertions(+), 6 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/Qt/Components/pqTabbedMultiViewWidget.cxx b/Qt/Components/pqTabbedMultiViewWidget.cxx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index b84c1ad493..ccf37034af 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Qt/Components/pqTabbedMultiViewWidget.cxx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Qt/Components/pqTabbedMultiViewWidget.cxx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -67,6 +67,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <QTabWidget>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <QtDebug>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static const int PQTABBED_WIDGET_PIXMAP_SIZE = 16;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //-----------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // ******************** pqTabWidget **********************
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //-----------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -123,19 +124,23 @@ int pqTabbedMultiViewWidget::pqTabWidget::addAsTab(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ this->connect(item, SIGNAL(nameChanged(pqServerManagerModelItem*)), self,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SLOT(onLayoutNameChanged(pqServerManagerModelItem*)));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- QLabel* label = new QLabel(this);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ QLabel* label = new QLabel();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ label->setObjectName("popout");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ label->setToolTip(pqTabWidget::popoutLabelText(false));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ label->setStatusTip(pqTabWidget::popoutLabelText(false));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- label->setPixmap(this->style()->standardPixmap(pqTabWidget::popoutLabelPixmap(false)));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ label->setPixmap(label->style()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ->standardIcon(pqTabWidget::popoutLabelPixmap(false))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .pixmap(PQTABBED_WIDGET_PIXMAP_SIZE, PQTABBED_WIDGET_PIXMAP_SIZE));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ this->setTabButton(tab_index, QTabBar::LeftSide, label);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ label->installEventFilter(self);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- label = new QLabel(this);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ label = new QLabel();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ label->setObjectName("close");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ label->setToolTip("Close layout");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ label->setStatusTip("Close layout");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- label->setPixmap(this->style()->standardPixmap(QStyle::SP_TitleBarCloseButton));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ label->setPixmap(label->style()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ->standardIcon(QStyle::SP_TitleBarCloseButton)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .pixmap(PQTABBED_WIDGET_PIXMAP_SIZE, PQTABBED_WIDGET_PIXMAP_SIZE));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ this->setTabButton(tab_index, QTabBar::RightSide, label);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ label->installEventFilter(self);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ label->setVisible(!this->ReadOnly);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -592,8 +597,9 @@ bool pqTabbedMultiViewWidget::eventFilter(QObject* obj, QEvent* evt)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QLabel* label = qobject_cast<QLabel*>(obj);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool popped_out = tabPage->togglePopout();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- label->setPixmap(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- this->style()->standardPixmap(pqTabWidget::popoutLabelPixmap(popped_out)));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ label->setPixmap(label->style()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ->standardIcon(pqTabWidget::popoutLabelPixmap(popped_out))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .pixmap(PQTABBED_WIDGET_PIXMAP_SIZE, PQTABBED_WIDGET_PIXMAP_SIZE));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ label->setToolTip(pqTabWidget::popoutLabelText(popped_out));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ label->setStatusTip(pqTabWidget::popoutLabelText(popped_out));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.21.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/paraview/files/patch-incomplete-types.patch b/science/paraview/files/patch-incomplete-types.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0794d33..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/paraview/files/patch-incomplete-types.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,144 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git Plugins/SLACTools/pqSLACDataLoadManager.cxx Plugins/SLACTools/pqSLACDataLoadManager.cxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 3ba019c26b..ce38396f68 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Plugins/SLACTools/pqSLACDataLoadManager.cxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Plugins/SLACTools/pqSLACDataLoadManager.cxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -34,6 +34,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "vtkSMProperty.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "vtkSMSourceProxy.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <QAction>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <QPushButton>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <QtDebug>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git Plugins/StreamLinesRepresentation/CMakeLists.txt Plugins/StreamLinesRepresentation/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 5d656a54b8..86c24964fe 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Plugins/StreamLinesRepresentation/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Plugins/StreamLinesRepresentation/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -41,7 +41,6 @@ encode_files_as_strings(ENCODED_STRING_FILES
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_paraview_plugin(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- StreamLinesRepresentation "0.1"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- DOCUMENTATION_DIR "${CMAKE_CURRENT_SOURCE_DIR}/doc"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SERVER_MANAGER_XML StreamLinesRepresentation.xml
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SERVER_MANAGER_SOURCES
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vtkStreamLinesRepresentation.cxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git Qt/ApplicationComponents/pqColorMapEditor.cxx Qt/ApplicationComponents/pqColorMapEditor.cxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 0395185e0a..88b56745eb 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Qt/ApplicationComponents/pqColorMapEditor.cxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Qt/ApplicationComponents/pqColorMapEditor.cxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -59,6 +59,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <QDebug>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <QKeyEvent>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <QPointer>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <QStyle>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <QVBoxLayout>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- class pqColorMapEditor::pqInternals
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git Qt/ApplicationComponents/pqDoubleRangeSliderPropertyWidget.cxx Qt/ApplicationComponents/pqDoubleRangeSliderPropertyWidget.cxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 908e4598e0..820361a2b3 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Qt/ApplicationComponents/pqDoubleRangeSliderPropertyWidget.cxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Qt/ApplicationComponents/pqDoubleRangeSliderPropertyWidget.cxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -43,6 +43,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "vtkSMUncheckedPropertyHelper.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <QGridLayout>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <QStyle>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- class pqDoubleRangeSliderPropertyWidget::pqInternals
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git Qt/ApplicationComponents/pqStandardViewFrameActionsImplementation.cxx Qt/ApplicationComponents/pqStandardViewFrameActionsImplementation.cxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index c297dc3d9e..501633f63a 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Qt/ApplicationComponents/pqStandardViewFrameActionsImplementation.cxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Qt/ApplicationComponents/pqStandardViewFrameActionsImplementation.cxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -69,6 +69,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <QPushButton>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <QSet>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <QShortcut>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <QStyle>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- //-----------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pqStandardViewFrameActionsImplementation::pqStandardViewFrameActionsImplementation(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git Qt/ApplicationComponents/pqTimeInspectorWidget.cxx Qt/ApplicationComponents/pqTimeInspectorWidget.cxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 6774c2e48e..3430f70376 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Qt/ApplicationComponents/pqTimeInspectorWidget.cxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Qt/ApplicationComponents/pqTimeInspectorWidget.cxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -51,6 +51,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <QLineF>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <QPainter>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <QStyle>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <QVariant>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <QtDebug>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git Qt/ApplicationComponents/pqTransferFunctionWidgetPropertyDialog.cxx Qt/ApplicationComponents/pqTransferFunctionWidgetPropertyDialog.cxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 55d3146447..225879cd4c 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Qt/ApplicationComponents/pqTransferFunctionWidgetPropertyDialog.cxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Qt/ApplicationComponents/pqTransferFunctionWidgetPropertyDialog.cxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -34,6 +34,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "pqTransferFunctionWidgetPropertyWidget.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "vtkPiecewiseFunction.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <QValidator>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <QString>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- class pqTransferFunctionWidgetPropertyDialog::pqInternals
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git Qt/ApplicationComponents/pqViewResolutionPropertyWidget.cxx Qt/ApplicationComponents/pqViewResolutionPropertyWidget.cxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 6d2865431e..8d2c4b61cd 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Qt/ApplicationComponents/pqViewResolutionPropertyWidget.cxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Qt/ApplicationComponents/pqViewResolutionPropertyWidget.cxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -39,6 +39,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "vtkSMProxy.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <QIntValidator>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <QStyle>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- class pqViewResolutionPropertyWidget::pqInternals
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git Qt/Widgets/pqAnimationWidget.h Qt/Widgets/pqAnimationWidget.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 283493a276..1c9a678cfe 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Qt/Widgets/pqAnimationWidget.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Qt/Widgets/pqAnimationWidget.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -36,10 +36,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "pqWidgetsModule.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <QAbstractScrollArea>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <QHeaderView>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <QStandardItemModel>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- class QGraphicsView;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--class QHeaderView;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- class pqAnimationModel;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- class pqAnimationTrack;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git Qt/Widgets/pqFlatTreeView.h Qt/Widgets/pqFlatTreeView.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index a0ba740dbc..e44e0d43a5 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Qt/Widgets/pqFlatTreeView.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Qt/Widgets/pqFlatTreeView.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -39,6 +39,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define _pqFlatTreeView_h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "pqWidgetsModule.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <QHeaderView>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <QAbstractScrollArea>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <QModelIndex> // Needed for return type
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <QStyleOptionViewItem> // Needed for return type
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -50,7 +51,6 @@ class pqFlatTreeViewInternal;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- class QAbstractItemModel;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- class QColor;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- class QFontMetrics;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--class QHeaderView;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- class QItemSelection;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- class QItemSelectionModel;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- class QPoint;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/Qt/Python/pqPythonShell.cxx b/Qt/Python/pqPythonShell.cxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 3d01fd0a96..7cb356fbc4 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Qt/Python/pqPythonShell.cxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Qt/Python/pqPythonShell.cxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -61,6 +61,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <QTextCharFormat>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <QVBoxLayout>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <QtDebug>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <QtWidgets>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QStringList pqPythonShell::Preamble;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/paraview/files/patch-ogg_dependency.diff b/science/paraview/files/patch-ogg_dependency.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..6f0e3d4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/paraview/files/patch-ogg_dependency.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- VTK/IO/Movie/module.cmake.orig 2019-06-05 14:17:54.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ VTK/IO/Movie/module.cmake 2019-07-13 12:23:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -14,6 +14,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ vtkIO
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DEPENDS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${vtkIOMovie_vtkoggtheora}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ vtkogg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ vtkCommonExecutionModel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PRIVATE_DEPENDS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ vtkCommonCore
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/paraview/files/patch-system_ok.diff b/science/paraview/files/patch-system_ok.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..9b192b7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/paraview/files/patch-system_ok.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ThirdParty/IceT/vtk_icet.h.in.orig 2019-06-05 14:17:54.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ThirdParty/IceT/vtk_icet.h.in 2019-07-15 07:32:29.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -18,7 +18,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Use the icet library configured for VTK. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #cmakedefine VTK_USE_SYSTEM_ICET
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef VTK_USE_SYSTEM_ICET
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# error "Using System IceT is not supported by ParaView"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++//# error "Using System IceT is not supported by ParaView"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # include "vtkConfigure.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/paraview/files/patch-vtk_target_export.diff b/science/paraview/files/patch-vtk_target_export.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..aa19367
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/paraview/files/patch-vtk_target_export.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,26 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ThirdParty/QtTesting/CMakeLists.txt.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ThirdParty/QtTesting/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -47,4 +47,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${CMAKE_CURRENT_BINARY_DIR}/vtkqttesting
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBRARIES QtTesting
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if(NOT ${VTK_USE_SYSTEM_QTTESTING})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ vtk_target_export(QtTesting)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ThirdParty/IceT/CMakeLists.txt.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ThirdParty/IceT/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -68,12 +68,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBRARIES IceTCore IceTMPI IceTGL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if(NOT ${VTK_USE_SYSTEM_ICET})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # icet exports its build dir targets to a custom IceTTargets.cmake file. We
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # don't care much about it. We just ensure that we export the targets we are
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # interested in here again.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ vtk_target_export(IceTCore)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ vtk_target_export(IceTMPI)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ vtk_target_export(IceTGL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # keep IceT variables from polluting the space.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mark_as_advanced(
</span></pre><pre style='margin:0'>
</pre>