Ticket #56981: paraview-5.5.2.patch

File paraview-5.5.2.patch, 7.3 KB (added by rubendibattista (Ruben Di Battista), 6 years ago)

  • science/paraview/Portfile 

    diff --git a/science/paraview/Portfile b/science/paraview/Portfile
index c986cb7aa5..3820b08bb0 100644
    a b  
    33PortSystem          1.0
    44
    55PortGroup           cmake 1.0
    6 PortGroup           qt4 1.0
     6PortGroup           qt5 1.0
    77PortGroup           mpi 1.0
    88
    99name                paraview
    10 version             5.5.0
    11 revision            1
     10version             5.5.2
    1211
    1312categories          science graphics
    1413platforms           darwin
    … … master_sites ${homepage}/files/v${branch}/ 
    3231
    3332distname            ParaView-v${version}
    3433
    35 checksums           sha256  1b619e326ff574de808732ca9a7447e4cd14e94ae6568f55b6581896cd569dff \
    36                     rmd160  3d8b47989bba8664aa781425731088754c0cd35d \
    37                     size    51414419
     34checksums           sha256  64561f34c4402b88f3cb20a956842394dde5838efd7ebb301157a837114a0e2d \
     35                    rmd160  b8bb2f50615e9db85dc986e108531ffffad1c96e \
     36                    size    51418473
    3837
    3938depends_build-append    port:readline \
    4039    port:netcdf \
    41     port:qt4-mac-sqlite3-plugin port:qt5-qttools
     40    port:qt5-sqlite-plugin port:qt5-qttools
     41
     42patchfiles patch-incomplete-types.patch
    4243
    4344cmake.out_of_source yes
    4445
    … … configure.args-delete \ 
    5556configure.args-append \
    5657    -DBUILD_TESTING:BOOL=OFF \
    5758    -DMACOSX_APP_INSTALL_PREFIX=${destroot}${applications_dir} \
    58     -DBUILD_SHARED_LIBS:BOOL=ON
     59    -DBUILD_SHARED_LIBS:BOOL=ON \
     60    -DPARAVIEW_QT_VERSION=5 \
     61    -DQt5_DIR=${qt_dir} \
     62    -DQT_HELP_GENERATOR=${qt_bins_dir}/qhelpgenerator \
     63    -DQT_XMLPATTERNS_EXECUTABLE=${qt_bins_dir}/xmlpatterns
    5964
    6065pre-configure {
    6166    configure.args-append -DCMAKE_CXX_COMPILER=${configure.cxx} \

  • new file science/paraview/files/patch-incomplete-types.patch 

    diff --git a/science/paraview/files/patch-incomplete-types.patch b/science/paraview/files/patch-incomplete-types.patch
new file mode 100644
index 0000000000..404301d02e
    - +  
     1diff --git Plugins/SLACTools/pqSLACDataLoadManager.cxx Plugins/SLACTools/pqSLACDataLoadManager.cxx
     2index 3ba019c26b..ce38396f68 100644
     3--- Plugins/SLACTools/pqSLACDataLoadManager.cxx
     4+++ Plugins/SLACTools/pqSLACDataLoadManager.cxx
     5@@ -34,6 +34,7 @@
     6 #include "vtkSMProperty.h"
     7 #include "vtkSMSourceProxy.h"
     8 
     9+#include <QAction>
     10 #include <QPushButton>
     11 #include <QtDebug>
     12 
     13diff --git Plugins/StreamLinesRepresentation/CMakeLists.txt Plugins/StreamLinesRepresentation/CMakeLists.txt
     14index 5d656a54b8..86c24964fe 100644
     15--- Plugins/StreamLinesRepresentation/CMakeLists.txt
     16+++ Plugins/StreamLinesRepresentation/CMakeLists.txt
     17@@ -41,7 +41,6 @@ encode_files_as_strings(ENCODED_STRING_FILES
     18 
     19 add_paraview_plugin(
     20   StreamLinesRepresentation "0.1"
     21-  DOCUMENTATION_DIR "${CMAKE_CURRENT_SOURCE_DIR}/doc"
     22   SERVER_MANAGER_XML StreamLinesRepresentation.xml
     23   SERVER_MANAGER_SOURCES
     24     vtkStreamLinesRepresentation.cxx
     25diff --git Qt/ApplicationComponents/pqColorMapEditor.cxx Qt/ApplicationComponents/pqColorMapEditor.cxx
     26index 0395185e0a..88b56745eb 100644
     27--- Qt/ApplicationComponents/pqColorMapEditor.cxx
     28+++ Qt/ApplicationComponents/pqColorMapEditor.cxx
     29@@ -59,6 +59,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     30 #include <QDebug>
     31 #include <QKeyEvent>
     32 #include <QPointer>
     33+#include <QStyle>
     34 #include <QVBoxLayout>
     35 
     36 class pqColorMapEditor::pqInternals
     37diff --git Qt/ApplicationComponents/pqDoubleRangeSliderPropertyWidget.cxx Qt/ApplicationComponents/pqDoubleRangeSliderPropertyWidget.cxx
     38index 908e4598e0..820361a2b3 100644
     39--- Qt/ApplicationComponents/pqDoubleRangeSliderPropertyWidget.cxx
     40+++ Qt/ApplicationComponents/pqDoubleRangeSliderPropertyWidget.cxx
     41@@ -43,6 +43,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     42 #include "vtkSMUncheckedPropertyHelper.h"
     43 
     44 #include <QGridLayout>
     45+#include <QStyle>
     46 
     47 class pqDoubleRangeSliderPropertyWidget::pqInternals
     48 {
     49diff --git Qt/ApplicationComponents/pqStandardViewFrameActionsImplementation.cxx Qt/ApplicationComponents/pqStandardViewFrameActionsImplementation.cxx
     50index c297dc3d9e..501633f63a 100644
     51--- Qt/ApplicationComponents/pqStandardViewFrameActionsImplementation.cxx
     52+++ Qt/ApplicationComponents/pqStandardViewFrameActionsImplementation.cxx
     53@@ -69,6 +69,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     54 #include <QPushButton>
     55 #include <QSet>
     56 #include <QShortcut>
     57+#include <QStyle>
     58 
     59 //-----------------------------------------------------------------------------
     60 pqStandardViewFrameActionsImplementation::pqStandardViewFrameActionsImplementation(
     61diff --git Qt/ApplicationComponents/pqTimeInspectorWidget.cxx Qt/ApplicationComponents/pqTimeInspectorWidget.cxx
     62index 6774c2e48e..3430f70376 100644
     63--- Qt/ApplicationComponents/pqTimeInspectorWidget.cxx
     64+++ Qt/ApplicationComponents/pqTimeInspectorWidget.cxx
     65@@ -51,6 +51,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     66 
     67 #include <QLineF>
     68 #include <QPainter>
     69+#include <QStyle>
     70 #include <QVariant>
     71 #include <QtDebug>
     72 
     73diff --git Qt/ApplicationComponents/pqTransferFunctionWidgetPropertyDialog.cxx Qt/ApplicationComponents/pqTransferFunctionWidgetPropertyDialog.cxx
     74index 55d3146447..225879cd4c 100644
     75--- Qt/ApplicationComponents/pqTransferFunctionWidgetPropertyDialog.cxx
     76+++ Qt/ApplicationComponents/pqTransferFunctionWidgetPropertyDialog.cxx
     77@@ -34,6 +34,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     78 
     79 #include "pqTransferFunctionWidgetPropertyWidget.h"
     80 #include "vtkPiecewiseFunction.h"
     81+#include <qvalidator>
     82 #include <QString>
     83 
     84 class pqTransferFunctionWidgetPropertyDialog::pqInternals
     85diff --git Qt/ApplicationComponents/pqViewResolutionPropertyWidget.cxx Qt/ApplicationComponents/pqViewResolutionPropertyWidget.cxx
     86index 6d2865431e..8d2c4b61cd 100644
     87--- Qt/ApplicationComponents/pqViewResolutionPropertyWidget.cxx
     88+++ Qt/ApplicationComponents/pqViewResolutionPropertyWidget.cxx
     89@@ -39,6 +39,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     90 #include "vtkSMProxy.h"
     91 
     92 #include <QIntValidator>
     93+#include <QStyle>
     94 
     95 class pqViewResolutionPropertyWidget::pqInternals
     96 {
     97diff --git Qt/Widgets/pqAnimationWidget.h Qt/Widgets/pqAnimationWidget.h
     98index 283493a276..1c9a678cfe 100644
     99--- Qt/Widgets/pqAnimationWidget.h
     100+++ Qt/Widgets/pqAnimationWidget.h
     101@@ -36,10 +36,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     102 #include "pqWidgetsModule.h"
     103 
     104 #include <QAbstractScrollArea>
     105+#include <QHeaderView>
     106 #include <QStandardItemModel>
     107 
     108 class QGraphicsView;
     109-class QHeaderView;
     110 class pqAnimationModel;
     111 class pqAnimationTrack;
     112 
     113diff --git Qt/Widgets/pqFlatTreeView.h Qt/Widgets/pqFlatTreeView.h
     114index a0ba740dbc..e44e0d43a5 100644
     115--- Qt/Widgets/pqFlatTreeView.h
     116+++ Qt/Widgets/pqFlatTreeView.h
     117@@ -39,6 +39,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     118 #define _pqFlatTreeView_h
     119 
     120 #include "pqWidgetsModule.h"
     121+#include <QHeaderView>
     122 #include <QAbstractScrollArea>
     123 #include <QModelIndex>          // Needed for return type
     124 #include <QStyleOptionViewItem> // Needed for return type
     125@@ -50,7 +51,6 @@ class pqFlatTreeViewInternal;
     126 class QAbstractItemModel;
     127 class QColor;
     128 class QFontMetrics;
     129-class QHeaderView;
     130 class QItemSelection;
     131 class QItemSelectionModel;
     132 class QPoint;