Date: Saturday, October 19, 2019 @ 02:26:52 Author: yan12125 Revision: 517265
upgpkg: paraview 5.7.0-1 - fix building with system pugixml Upstream ticket is https://gitlab.kitware.com/vtk/vtk/issues/17538. Also, the fix for man pages is no longer needed as man pages are not installed after https://gitlab.kitware.com/paraview/icet/commit/24bc74220c906c10174013dcda89d8fc48ab8de9#9a2aa4db38d3115ed60da621e012c0efc0172aae_254_311 Added: paraview/trunk/paraview-system-pugixml.patch Modified: paraview/trunk/PKGBUILD -------------------------------+ PKGBUILD | 11 +++++------ paraview-system-pugixml.patch | 19 +++++++++++++++++++ 2 files changed, 24 insertions(+), 6 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-10-18 23:42:06 UTC (rev 517264) +++ PKGBUILD 2019-10-19 02:26:52 UTC (rev 517265) @@ -29,11 +29,14 @@ # sqlite apparently not used in this VTK configuration optdepends=(python-matplotlib) makedepends=(cmake boost mesa gcc-fortran ninja qt5-tools qt5-xmlpatterns eigen pegtl utf8cpp) -source=("${url}/files/v${pkgver:0:3}/ParaView-v${pkgver}.tar.xz") -sha256sums=('e41e597e1be462974a03031380d9e5ba9a7efcdb22e4ca2f3fec50361f310874') +source=("${url}/files/v${pkgver:0:3}/ParaView-v${pkgver}.tar.xz" + paraview-system-pugixml.patch) +sha256sums=('e41e597e1be462974a03031380d9e5ba9a7efcdb22e4ca2f3fec50361f310874' + 'dd2e23298ab5a07da0e799c3db313ed3f9d2a403d7228d50748206b535b6f65f') prepare() { mkdir -p build + patch -Np0 -i ./paraview-system-pugixml.patch } build() { @@ -92,8 +95,4 @@ # Install license install -Dm644 "${srcdir}"/ParaView-v${pkgver}/License_v1.2.txt "${pkgdir}"/usr/share/licenses/paraview/LICENSE - - # Remove IceT man pages to avoid conflicts - rm -- "${pkgdir}"/usr/share/man/man3/icet*.3 - rmdir "${pkgdir}"/usr/share/man/{man3/,} } Added: paraview-system-pugixml.patch =================================================================== --- paraview-system-pugixml.patch (rev 0) +++ paraview-system-pugixml.patch 2019-10-19 02:26:52 UTC (rev 517265) @@ -0,0 +1,19 @@ +--- ParaView-v5.7.0/VTK/ThirdParty/pugixml/CMakeLists.txt.orig 2019-10-18 16:22:47.612817047 +0800 ++++ ParaView-v5.7.0/VTK/ThirdParty/pugixml/CMakeLists.txt 2019-10-18 16:29:12.692090865 +0800 +@@ -1,7 +1,12 @@ +-vtk_module_third_party_internal( +- LICENSE_FILES "vtkpugixml/LICENSE" +- VERSION "1.9" +- STANDARD_INCLUDE_DIRS) ++vtk_module_third_party( ++ INTERNAL ++ LICENSE_FILES "vtkpugixml/LICENSE" ++ VERSION "1.9" ++ STANDARD_INCLUDE_DIRS ++ EXTERNAL ++ PACKAGE pugixml ++ TARGETS pugixml ++ STANDARD_INCLUDE_DIRS) + + configure_file( + "${CMAKE_CURRENT_SOURCE_DIR}/vtk_pugixml.h.in"
