[arch-commits] Commit in paraview/trunk (4 files)

[Bruno Pagani]

    Date: Saturday, March 19, 2022 @ 23:09:04
  Author: archange
Revision: 1162710

upgpkg: paraview 5.9.1-15

Added:
  paraview/trunk/paraview-wrapper.sh
  paraview/trunk/paraview.sh
  paraview/trunk/pvpython.sh
Modified:
  paraview/trunk/PKGBUILD

---------------------+
 PKGBUILD            |   28 +++++++++++++++++++++++++---
 paraview-wrapper.sh |    7 +++++++
 paraview.sh         |    3 +++
 pvpython.sh         |    3 +++
 4 files changed, 38 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-03-19 23:09:03 UTC (rev 1162709)
+++ PKGBUILD	2022-03-19 23:09:04 UTC (rev 1162710)
@@ -8,7 +8,7 @@
 pkgname=${_pkg}
 #-${_mpi}
 pkgver=5.9.1
-pkgrel=14
+pkgrel=15
 pkgdesc="Parallel Visualization application using VTK (${_mpi} version)"
 arch=(x86_64)
 url="https://www.paraview.org"
@@ -21,8 +21,10 @@
 optdepends=(python-matplotlib python-pandas)
 makedepends=(cmake boost mesa gcc-fortran ninja qt5-tools qt5-xmlpatterns eigen utf8cpp)
 # pegtl https://gitlab.kitware.com/vtk/vtk/-/issues/18151
-conflicts=(vtk)
 source=(${url}/files/v${pkgver%.*}/ParaView-v${pkgver/R/-R}.tar.xz
+        paraview-wrapper.sh
+        paraview.sh
+        pvpython.sh
         vtk-gcc11.patch::https://gitlab.kitware.com/vtk/vtk/-/merge_requests/7554.patch
         vtk-fix-shader-initialization.patch::https://gitlab.kitware.com/vtk/vtk/-/merge_requests/7978.patch
         vtk-tbb-2021.patch
@@ -30,6 +32,9 @@
         vtkm-tbb-2021.patch::https://gitlab.kitware.com/vtk/vtk-m/-/merge_requests/2509.patch
         vtk-ffmpeg5.patch::https://gitlab.kitware.com/vtk/vtk/-/merge_requests/8863.patch)
 sha256sums=('0d486cb6fbf55e428845c9650486f87466efcb3155e40489182a7ea85dfd4c8d'
+            '05bd6268b3a6dddfcdbc106a3414d0aa9663ae48ce4775fdd9f5ed02c1bbae02'
+            'e81fa887b484d98fd0df3b13e9ba19f57e50131c173ea126265cec0b529dd3f5'
+            '0f3557fd21de013628826c2c971a48564dca63cbf943c76a6f7021a9a84e6223'
             'c9959adcb59e2f2657f0144b0b68239d4174947fb2ab8051f2575241281e4d68'
             '10864f69e2d6577c56cc536438b5dd7a52b004f6bb253a17569899922d804fe8'
             '5e621ed053ae6e27fea32c09ff64a700684983703d2361c658e1701b0b413189'
@@ -38,6 +43,10 @@
             '066ad5eb3f7cd101c4bbbe4d91ba97419f18537f9dadf6654776b7151c7c6a8d')
 
 prepare() {
+  # Specify python version in wrapper
+  local python_version=$(python -c 'import sys; print(".".join(map(str, sys.version_info[:2])))')
+  sed -i "s|@PYTHON@|${python_version}|" paraview-wrapper.sh
+  # Arch required changes
   cd ParaView-v${pkgver/R/-R}
   # We have a patched libharu
   sed -i "s|2.4.0|2.3.0|" VTK/ThirdParty/libharu/CMakeLists.txt
@@ -66,7 +75,7 @@
   export CXXFLAGS+=" -ffat-lto-objects"
   cmake -B build -S ParaView-v${pkgver/R/-R} -G Ninja \
     -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_PREFIX=/opt/paraview \
     -DCMAKE_INSTALL_LICENSEDIR=share/licenses/paraview \
     -DCMAKE_SKIP_INSTALL_RPATH=OFF \
     -DPARAVIEW_ENABLE_ADIOS2=ON \
@@ -92,4 +101,17 @@
 
 package() {
   DESTDIR="${pkgdir}" ninja -C build install
+
+  # Install wrappers
+  for file in paraview-wrapper.sh paraview.sh pvpython.sh
+  do
+      install -Dm755 ${file} "${pkgdir}"/usr/bin/${file%.sh}
+  done
+
+  # Install licenses, shortcuts, icons
+  install -dm755 "${pkgdir}"/usr/share
+  mv "${pkgdir}"/{opt/paraview,usr}/share/applications
+  mv "${pkgdir}"/{opt/paraview,usr}/share/icons
+  mv "${pkgdir}"/{opt/paraview,usr}/share/licenses
+  mv "${pkgdir}"/{opt/paraview,usr}/share/metainfo
 }

Added: paraview-wrapper.sh
===================================================================
--- paraview-wrapper.sh	                        (rev 0)
+++ paraview-wrapper.sh	2022-03-19 23:09:04 UTC (rev 1162710)
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+export PATH=/opt/paraview/bin:"${PATH}"
+export PYTHONPATH=/opt/paraview/lib/python at PYTHON@/site-packages/:"${PYTHONPATH}"
+export LD_LIBRARY_PATH=/opt/paraview/lib/:"${LD_LIBRARY_PATH}"
+
+exec /opt/paraview/bin/$1

Added: paraview.sh
===================================================================
--- paraview.sh	                        (rev 0)
+++ paraview.sh	2022-03-19 23:09:04 UTC (rev 1162710)
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec paraview-wrapper paraview

Added: pvpython.sh
===================================================================
--- pvpython.sh	                        (rev 0)
+++ pvpython.sh	2022-03-19 23:09:04 UTC (rev 1162710)
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec paraview-wrapper pvpython