gentoo resync : 18.08.2019

2 files changed, 63 insertions, 156 deletions

diff --git a/sci-visualization/paraview/files/paraview-5.5.2-qt-5.11.patch b/sci-visualization/paraview/files/paraview-5.5.2-qt-5.11.patch
deleted file mode 100644
index b4299d4ee370..000000000000
--- a/sci-visualization/paraview/files/paraview-5.5.2-qt-5.11.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-From 931c779dde8460fe32aa8a3d19956b175b96e4f9 Mon Sep 17 00:00:00 2001
-From: Robert O'Bara <bob.obara@kitware.com>
-Date: Thu, 24 May 2018 09:49:28 -0400
-Subject: [PATCH] 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 +
- .../pqStandardViewFrameActionsImplementation.cxx                | 1 +
- Qt/ApplicationComponents/pqTimeInspectorWidget.cxx              | 1 +
- .../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(+)
-
-diff --git a/Plugins/SLACTools/pqSLACDataLoadManager.cxx b/Plugins/SLACTools/pqSLACDataLoadManager.cxx
-index 3ba019c26b..ce38396f68 100644
---- a/Plugins/SLACTools/pqSLACDataLoadManager.cxx
-+++ b/Plugins/SLACTools/pqSLACDataLoadManager.cxx
-@@ -34,6 +34,7 @@
- #include "vtkSMProperty.h"
- #include "vtkSMSourceProxy.h"
- 
-+#include <QAction>
- #include <QPushButton>
- #include <QtDebug>
- 
-diff --git a/Qt/ApplicationComponents/pqColorMapEditor.cxx b/Qt/ApplicationComponents/pqColorMapEditor.cxx
-index 0395185e0a..88b56745eb 100644
---- a/Qt/ApplicationComponents/pqColorMapEditor.cxx
-+++ b/Qt/ApplicationComponents/pqColorMapEditor.cxx
-@@ -59,6 +59,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- #include <QDebug>
- #include <QKeyEvent>
- #include <QPointer>
-+#include <QStyle>
- #include <QVBoxLayout>
- 
- class pqColorMapEditor::pqInternals
-diff --git a/Qt/ApplicationComponents/pqDoubleRangeSliderPropertyWidget.cxx b/Qt/ApplicationComponents/pqDoubleRangeSliderPropertyWidget.cxx
-index 908e4598e0..820361a2b3 100644
---- a/Qt/ApplicationComponents/pqDoubleRangeSliderPropertyWidget.cxx
-+++ b/Qt/ApplicationComponents/pqDoubleRangeSliderPropertyWidget.cxx
-@@ -43,6 +43,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- #include "vtkSMUncheckedPropertyHelper.h"
- 
- #include <QGridLayout>
-+#include <QStyle>
- 
- class pqDoubleRangeSliderPropertyWidget::pqInternals
- {
-diff --git a/Qt/ApplicationComponents/pqStandardViewFrameActionsImplementation.cxx b/Qt/ApplicationComponents/pqStandardViewFrameActionsImplementation.cxx
-index c297dc3d9e..501633f63a 100644
---- a/Qt/ApplicationComponents/pqStandardViewFrameActionsImplementation.cxx
-+++ b/Qt/ApplicationComponents/pqStandardViewFrameActionsImplementation.cxx
-@@ -69,6 +69,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- #include <QPushButton>
- #include <QSet>
- #include <QShortcut>
-+#include <QStyle>
- 
- //-----------------------------------------------------------------------------
- pqStandardViewFrameActionsImplementation::pqStandardViewFrameActionsImplementation(
-diff --git a/Qt/ApplicationComponents/pqTimeInspectorWidget.cxx b/Qt/ApplicationComponents/pqTimeInspectorWidget.cxx
-index 6774c2e48e..e85e614f04 100644
---- a/Qt/ApplicationComponents/pqTimeInspectorWidget.cxx
-+++ b/Qt/ApplicationComponents/pqTimeInspectorWidget.cxx
-@@ -49,6 +49,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- #include "vtkSMPropertyHelper.h"
- #include "vtkSMSourceProxy.h"
- 
-+#include <QHeaderView>
- #include <QLineF>
- #include <QPainter>
- #include <QVariant>
-diff --git a/Qt/ApplicationComponents/pqTransferFunctionWidgetPropertyDialog.cxx b/Qt/ApplicationComponents/pqTransferFunctionWidgetPropertyDialog.cxx
-index 55d3146447..93cd995d92 100644
---- a/Qt/ApplicationComponents/pqTransferFunctionWidgetPropertyDialog.cxx
-+++ b/Qt/ApplicationComponents/pqTransferFunctionWidgetPropertyDialog.cxx
-@@ -36,6 +36,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- #include "vtkPiecewiseFunction.h"
- #include <QString>
- 
-+#include <QDoubleValidator>
-+
- class pqTransferFunctionWidgetPropertyDialog::pqInternals
- {
- public:
-diff --git a/Qt/ApplicationComponents/pqViewResolutionPropertyWidget.cxx b/Qt/ApplicationComponents/pqViewResolutionPropertyWidget.cxx
-index 6d2865431e..8d2c4b61cd 100644
---- a/Qt/ApplicationComponents/pqViewResolutionPropertyWidget.cxx
-+++ b/Qt/ApplicationComponents/pqViewResolutionPropertyWidget.cxx
-@@ -39,6 +39,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- #include "vtkSMProxy.h"
- 
- #include <QIntValidator>
-+#include <QStyle>
- 
- class pqViewResolutionPropertyWidget::pqInternals
- {
-diff --git a/Qt/Components/pqChangeInputDialog.cxx b/Qt/Components/pqChangeInputDialog.cxx
-index 8a67b10095..86db3de01c 100644
---- a/Qt/Components/pqChangeInputDialog.cxx
-+++ b/Qt/Components/pqChangeInputDialog.cxx
-@@ -45,6 +45,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- #include "vtkSMProxy.h"
- #include "vtkSmartPointer.h"
- 
-+#include <QHeaderView>
- #include <QItemSelectionModel>
- #include <QLineEdit>
- #include <QRadioButton>
-diff --git a/Qt/Components/pqCinemaTrackSelection.cxx b/Qt/Components/pqCinemaTrackSelection.cxx
-index 3d6d9dde19..eea2e37680 100644
---- a/Qt/Components/pqCinemaTrackSelection.cxx
-+++ b/Qt/Components/pqCinemaTrackSelection.cxx
-@@ -30,6 +30,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- 
- ========================================================================*/
- #include <QDebug>
-+#include <QHeaderView>
- 
- #include "vtkPVArrayInformation.h"
- #include "vtkPVDataInformation.h"
-diff --git a/Qt/Python/pqPythonShell.cxx b/Qt/Python/pqPythonShell.cxx
-index 3d01fd0a96..bc1a014936 100644
---- a/Qt/Python/pqPythonShell.cxx
-+++ b/Qt/Python/pqPythonShell.cxx
-@@ -52,6 +52,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- #include "vtkStringOutputWindow.h"
- #include "vtkWeakPointer.h"
- 
-+#include <QAbstractItemView>
- #include <QApplication>
- #include <QCursor>
- #include <QFile>
--- 
-2.17.1
diff --git a/sci-visualization/paraview/files/paraview-5.6.1-fix_openmp_4.0.patch b/sci-visualization/paraview/files/paraview-5.6.1-fix_openmp_4.0.patch
index 515624150315..cf2150708935 100644
--- a/sci-visualization/paraview/files/paraview-5.6.1-fix_openmp_4.0.patch
+++ b/sci-visualization/paraview/files/paraview-5.6.1-fix_openmp_4.0.patch
@@ -1,32 +1,81 @@
-diff -urNd ParaView-v5.6.0/VTK/ThirdParty/vtkm/vtk-m/vtkm/cont/openmp/internal/FunctorsOpenMP.h ParaView-v5.6.0-openmp/VTK/ThirdParty/vtkm/vtk-m/vtkm/cont/openmp/internal/FunctorsOpenMP.h
---- ParaView-v5.6.0/VTK/ThirdParty/vtkm/vtk-m/vtkm/cont/openmp/internal/FunctorsOpenMP.h	2018-11-07 05:05:18.000000000 +1000
-+++ ParaView-v5.6.0-openmp/VTK/ThirdParty/vtkm/vtk-m/vtkm/cont/openmp/internal/FunctorsOpenMP.h	2019-06-28 14:04:02.292922908 +1000
-@@ -290,7 +290,7 @@
+From e30cb0872593d1614392817762b871de36e4c2f3 Mon Sep 17 00:00:00 2001
+From: Allison Vacanti <allison.vacanti@kitware.com>
+Date: Thu, 27 Jun 2019 16:04:53 -0400
+Subject: [PATCH] Fix OpenMP for gcc-9 backwards incompatibility.
+
+For details, see
+
+https://www.gnu.org/software/gcc/gcc-9/porting_to.html
+---
+ vtkm/cont/openmp/internal/FunctorsOpenMP.h     | 18 +++++++++++++++---
+ vtkm/cont/openmp/internal/ParallelSortOpenMP.h |  4 +++-
+ 2 files changed, 18 insertions(+), 4 deletions(-)
+
+diff --git ParaView-v5.6.0/VTK/ThirdParty/vtkm/vtk-m/vtkm/cont/openmp/internal/FunctorsOpenMP.h b/vtkm/cont/openmp/internal/FunctorsOpenMP.h
+index 27cd2bc0..0271754c 100644
+--- ParaView-v5.6.0/VTK/ThirdParty/vtkm/vtk-m/vtkm/cont/openmp/internal/FunctorsOpenMP.h
++++ ParaView-v5.6.0/VTK/ThirdParty/vtkm/vtk-m/vtkm/cont/openmp/internal/FunctorsOpenMP.h
+@@ -36,6 +36,18 @@
+ #define VTKM_OPENMP_DIRECTIVE(directive)
+ #endif // _OPENMP
+ 
++// See "OpenMP data sharing" section of
++// https://www.gnu.org/software/gcc/gcc-9/porting_to.html. OpenMP broke
++// backwards compatibility regarding const variable handling.
++// tl;dr, put all const variables accessed from openmp blocks in a
++// VTKM_OPENMP_SHARED_CONST(var1, var2, ...) macro. This will do The Right Thing
++// on all gcc.
++#if defined(__GNUC__) && __GNUC__ >= 9
++#define VTKM_OPENMP_SHARED_CONST(...) shared(__VA_ARGS__)
++#else
++#define VTKM_OPENMP_SHARED_CONST(...)
++#endif
++
+ // When defined, supported type / operator combinations will use the OpenMP
+ // reduction(...) clause. Otherwise, all reductions use the general
+ // implementation with a manual reduction once the threads complete.
+@@ -279,8 +291,8 @@ struct ReduceHelper
+     int numThreads = 0;
      std::unique_ptr<ReturnType[]> threadData;
  
-     VTKM_OPENMP_DIRECTIVE(parallel default(none) firstprivate(f)
+-    VTKM_OPENMP_DIRECTIVE(parallel default(none) firstprivate(f)
 -                            shared(data, doParallel, numThreads, threadData))
-+                            shared(data, doParallel, numThreads, threadData, numVals))
++    VTKM_OPENMP_DIRECTIVE(parallel default(none) firstprivate(f) shared(
++      data, doParallel, numThreads, threadData) VTKM_OPENMP_SHARED_CONST(numVals))
      {
  
        int tid = omp_get_thread_num();
-@@ -422,7 +422,7 @@
+@@ -412,7 +424,7 @@ void ReduceByKeyHelper(KeysInArray keysInArray,
    vtkm::Id outIdx = 0;
  
    VTKM_OPENMP_DIRECTIVE(parallel default(none) firstprivate(keysIn, valuesIn, keysOut, valuesOut, f)
 -                          shared(outIdx))
-+                          shared(outIdx, numValues))
++                          shared(outIdx) VTKM_OPENMP_SHARED_CONST(numValues))
    {
      int tid = omp_get_thread_num();
      int numThreads = omp_get_num_threads();
-diff -urNd ParaView-v5.6.0/VTK/ThirdParty/vtkm/vtk-m/vtkm/cont/openmp/internal/ParallelSortOpenMP.h ParaView-v5.6.0-openmp/VTK/ThirdParty/vtkm/vtk-m/vtkm/cont/openmp/internal/ParallelSortOpenMP.h
---- ParaView-v5.6.0/VTK/ThirdParty/vtkm/vtk-m/vtkm/cont/openmp/internal/ParallelSortOpenMP.h	2018-11-07 05:05:18.000000000 +1000
-+++ ParaView-v5.6.0-openmp/VTK/ThirdParty/vtkm/vtk-m/vtkm/cont/openmp/internal/ParallelSortOpenMP.h	2019-06-28 13:54:33.132064191 +1000
-@@ -133,6 +133,7 @@
+diff --git a/vtkm/cont/openmp/internal/ParallelSortOpenMP.h b/vtkm/cont/openmp/internal/ParallelSortOpenMP.h
+index e06d1762..a973eee6 100644
+--- ParaView-v5.6.0/VTK/ThirdParty/vtkm/vtk-m/vtkm/cont/openmp/internal/ParallelSortOpenMP.h
++++ ParaView-v5.6.0/VTK/ThirdParty/vtkm/vtk-m/vtkm/cont/openmp/internal/ParallelSortOpenMP.h
+@@ -123,7 +123,8 @@ void parallel_sort_bykey(vtkm::cont::ArrayHandle<T, StorageT>& keys,
        VTKM_OPENMP_DIRECTIVE(parallel for
                              default(none)
                              firstprivate(valuesInPortal, indexPortal, valuesOutPortal)
-+                            shared(size)
-                             schedule(static))
+-                            schedule(static))
++                            schedule(static)
++                            VTKM_OPENMP_SHARED_CONST(size))
        for (vtkm::Id i = 0; i < size; ++i)
        {
+         valuesOutPortal.Set(i, valuesInPortal.Get(indexPortal.Get(i)));
+@@ -209,6 +210,7 @@ void parallel_sort_bykey(vtkm::cont::ArrayHandle<T, StorageT>& keys,
+     VTKM_OPENMP_DIRECTIVE(parallel for
+                           default(none)
+                           firstprivate(valuesInPortal, indexPortal, valuesOutPortal)
++                          VTKM_OPENMP_SHARED_CONST(size)
+                           schedule(static))
+     for (vtkm::Id i = 0; i < size; ++i)
+     {
+-- 
+2.21.0
+