Skip to content
Permalink
Browse files

paraview: update version 5.5.2->5.6.1

Use MacPorts Libraries whenever possible.
  • Loading branch information
MarcusCalhoun-Lopez committed Jul 24, 2019
1 parent 5b41d3e commit d3e87104ba6b27df5984cb775a313ca87ffc0610
@@ -8,8 +8,8 @@ PortGroup qt5 1.0
PortGroup mpi 1.0

name paraview
version 5.5.2
revision 4
version 5.6.1
revision 0

categories science graphics
platforms darwin
@@ -32,19 +32,53 @@ homepage https://www.paraview.org/
master_sites ${homepage}/files/v${branch}/

distname ParaView-v${version}

checksums sha256 64561f34c4402b88f3cb20a956842394dde5838efd7ebb301157a837114a0e2d \
rmd160 b8bb2f50615e9db85dc986e108531ffffad1c96e \
size 51418473

depends_build-append port:readline \
port:netcdf
use_xz yes

checksums sha256 50ef01f54db6358b402e50d1460ef47c04d675bf26f250c6937737169f1e6612 \
rmd160 623a29d65d39d65644605bb40943f22df3918fff \
size 38756076

# Fix the icon size of the render area. This should be already included
# version > 5.6.0. So when you bump the version, you should be able to remove
# this patch file.
patchfiles patch-icon-size.diff \
patch-vtk_target_export.diff \
patch-ogg_dependency.diff \
patch-system_ok.diff

depends_lib-append path:include/eigen3/Eigen/Eigen:eigen3 \
port:glew \
port:double-conversion \
port:lz4 \
port:xz \
port:zlib \
port:expat \
port:jpeg \
port:libpng \
port:tiff \
port:jsoncpp \
port:pugixml \
port:protobuf3-cpp \
port:libogg \
port:libtheora \
port:libxml2 \
port:freetype \
port:hdf5 \
port:netcdf \
port:netcdf-cxx \
port:gl2ps \
port:cgnslib \
port:icet \
port:diy2 \
port:PEGTL \
port:qttesting \
port:readline

mpi.enforce_variant icet

qt5.depends_component sqlite-plugin qttools qtxmlpatterns
qt5.min_version 5.6

patchfiles patch-incomplete-types.patch

cmake.install_rpath

# paraview sets its own optimization flags
@@ -75,7 +109,9 @@ configure.args-append \
-DPARAVIEW_QT_VERSION=5 \
-DQt5_DIR=${qt_dir} \
-DQT_HELP_GENERATOR=${qt_bins_dir}/qhelpgenerator \
-DQT_XMLPATTERNS_EXECUTABLE=${qt_bins_dir}/xmlpatterns
-DQT_XMLPATTERNS_EXECUTABLE=${qt_bins_dir}/xmlpatterns \
-DVTK_USE_SYSTEM_LIBRARIES:BOOL=ON \
-DVTK_USE_SYSTEM_XDMF2:BOOL=OFF

pre-configure {
configure.args-append -DCMAKE_CXX_COMPILER=${configure.cxx} \
@@ -0,0 +1,68 @@
From 34c71b9941d8473bc7d1f6920b37fdba16cd8d6b Mon Sep 17 00:00:00 2001
From: Utkarsh Ayachit <utkarsh.ayachit@kitware.com>
Date: Sat, 30 Mar 2019 08:25:17 -0400
Subject: [PATCH] fix pixmap size

On macOS with Qt 5.12, the icon for popping a layout tab out was
rendered quite large. Fixed that. Also uses newer api
QStyle::standardIcon instead of QStyle::standardPixmap which has been
deprecated.
---
Qt/Components/pqTabbedMultiViewWidget.cxx | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/Qt/Components/pqTabbedMultiViewWidget.cxx b/Qt/Components/pqTabbedMultiViewWidget.cxx
index b84c1ad493..ccf37034af 100644
--- Qt/Components/pqTabbedMultiViewWidget.cxx
+++ Qt/Components/pqTabbedMultiViewWidget.cxx
@@ -67,6 +67,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <QTabWidget>
#include <QtDebug>

+static const int PQTABBED_WIDGET_PIXMAP_SIZE = 16;
//-----------------------------------------------------------------------------
// ******************** pqTabWidget **********************
//-----------------------------------------------------------------------------
@@ -123,19 +124,23 @@ int pqTabbedMultiViewWidget::pqTabWidget::addAsTab(
this->connect(item, SIGNAL(nameChanged(pqServerManagerModelItem*)), self,
SLOT(onLayoutNameChanged(pqServerManagerModelItem*)));

- QLabel* label = new QLabel(this);
+ QLabel* label = new QLabel();
label->setObjectName("popout");
label->setToolTip(pqTabWidget::popoutLabelText(false));
label->setStatusTip(pqTabWidget::popoutLabelText(false));
- label->setPixmap(this->style()->standardPixmap(pqTabWidget::popoutLabelPixmap(false)));
+ label->setPixmap(label->style()
+ ->standardIcon(pqTabWidget::popoutLabelPixmap(false))
+ .pixmap(PQTABBED_WIDGET_PIXMAP_SIZE, PQTABBED_WIDGET_PIXMAP_SIZE));
this->setTabButton(tab_index, QTabBar::LeftSide, label);
label->installEventFilter(self);

- label = new QLabel(this);
+ label = new QLabel();
label->setObjectName("close");
label->setToolTip("Close layout");
label->setStatusTip("Close layout");
- label->setPixmap(this->style()->standardPixmap(QStyle::SP_TitleBarCloseButton));
+ label->setPixmap(label->style()
+ ->standardIcon(QStyle::SP_TitleBarCloseButton)
+ .pixmap(PQTABBED_WIDGET_PIXMAP_SIZE, PQTABBED_WIDGET_PIXMAP_SIZE));
this->setTabButton(tab_index, QTabBar::RightSide, label);
label->installEventFilter(self);
label->setVisible(!this->ReadOnly);
@@ -592,8 +597,9 @@ bool pqTabbedMultiViewWidget::eventFilter(QObject* obj, QEvent* evt)
{
QLabel* label = qobject_cast<QLabel*>(obj);
bool popped_out = tabPage->togglePopout();
- label->setPixmap(
- this->style()->standardPixmap(pqTabWidget::popoutLabelPixmap(popped_out)));
+ label->setPixmap(label->style()
+ ->standardIcon(pqTabWidget::popoutLabelPixmap(popped_out))
+ .pixmap(PQTABBED_WIDGET_PIXMAP_SIZE, PQTABBED_WIDGET_PIXMAP_SIZE));
label->setToolTip(pqTabWidget::popoutLabelText(popped_out));
label->setStatusTip(pqTabWidget::popoutLabelText(popped_out));
}
--
2.21.0

This file was deleted.

@@ -0,0 +1,10 @@
--- VTK/IO/Movie/module.cmake.orig 2019-06-05 14:17:54.000000000 -0700
+++ VTK/IO/Movie/module.cmake 2019-07-13 12:23:52.000000000 -0700
@@ -14,6 +14,7 @@
vtkIO
DEPENDS
${vtkIOMovie_vtkoggtheora}
+ vtkogg
vtkCommonExecutionModel
PRIVATE_DEPENDS
vtkCommonCore
@@ -0,0 +1,11 @@
--- ThirdParty/IceT/vtk_icet.h.in.orig 2019-06-05 14:17:54.000000000 -0700
+++ ThirdParty/IceT/vtk_icet.h.in 2019-07-15 07:32:29.000000000 -0700
@@ -18,7 +18,7 @@
/* Use the icet library configured for VTK. */
#cmakedefine VTK_USE_SYSTEM_ICET
#ifdef VTK_USE_SYSTEM_ICET
-# error "Using System IceT is not supported by ParaView"
+//# error "Using System IceT is not supported by ParaView"
#else
# include "vtkConfigure.h"
#endif
@@ -0,0 +1,26 @@
--- ThirdParty/QtTesting/CMakeLists.txt.orig
+++ ThirdParty/QtTesting/CMakeLists.txt
@@ -47,4 +47,6 @@
${CMAKE_CURRENT_BINARY_DIR}/vtkqttesting
LIBRARIES QtTesting
)
+if(NOT ${VTK_USE_SYSTEM_QTTESTING})
vtk_target_export(QtTesting)
+endif()
--- ThirdParty/IceT/CMakeLists.txt.orig
+++ ThirdParty/IceT/CMakeLists.txt
@@ -68,12 +68,14 @@
LIBRARIES IceTCore IceTMPI IceTGL
)

+if(NOT ${VTK_USE_SYSTEM_ICET})
# icet exports its build dir targets to a custom IceTTargets.cmake file. We
# don't care much about it. We just ensure that we export the targets we are
# interested in here again.
vtk_target_export(IceTCore)
vtk_target_export(IceTMPI)
vtk_target_export(IceTGL)
+endif()

# keep IceT variables from polluting the space.
mark_as_advanced(

0 comments on commit d3e8710

Please sign in to comment.
You can’t perform that action at this time.