Jakub Klinkovský pushed to branch main at Arch Linux / Packaging / Packages / paraview
Commits: fdcfdda2 by Jakub Klinkovský at 2025-03-04T22:13:28+01:00 add a patch for cli11 2.5.0 The release made a breaking change: https://github.com/CLIUtils/CLI11/pull/866/files#diff-5a9fa08a012d9524723020aeeb9eb7c3440d80dc7a603ac22ccad70c37851993L148-R176 - - - - - 6ca774ca by Jakub Klinkovský at 2025-03-04T22:45:27+01:00 upgpkg: 5.13.2-6: rebuild for protobuf 29.3 - - - - - 3 changed files: - .SRCINFO - PKGBUILD - + cli11-2.5.0.patch Changes: ===================================== .SRCINFO ===================================== @@ -1,7 +1,7 @@ pkgbase = paraview pkgdesc = Parallel Visualization application using VTK pkgver = 5.13.2 - pkgrel = 5 + pkgrel = 6 url = https://www.paraview.org arch = x86_64 license = BSD-3-Clause @@ -92,6 +92,7 @@ pkgbase = paraview source = fix-vtk-python313-encoding.patch source = fix-pygments-formatters.patch source = netcdf-4.9.3.patch + source = cli11-2.5.0.patch sha256sums = 4e116250f8e1a9c480f97c5696c9cd72b4d4998b039ca46da8b224f27445f13e sha256sums = d1cdb4a81db280d6b21bee3d9e5f8fc3a87f00a909d33850a1964c72091ec138 sha256sums = 844d44a14817c656ba8d6998298785125a98f03f7b5ece58d966c226db1e0d83 @@ -101,5 +102,6 @@ pkgbase = paraview sha256sums = ab1b5b0ee08ae7714aa5c4924de0e2997b0feac1d4563ce73ef4b8c8204a4777 sha256sums = fc61d6d62e4e9f2c846d80b786b1e71ae7a14a2a28753868a0bc0018ba5a2278 sha256sums = 87535578bbb0023ede506fd64afae95cdf4fb698c543f9735e6267730634afbc + sha256sums = dd4053537565d0929ea87caa8f182b5451adb4b9e64f3297a60648c43f27c3f2 pkgname = paraview ===================================== PKGBUILD ===================================== @@ -6,7 +6,7 @@ pkgname=paraview pkgver=5.13.2 -pkgrel=5 +pkgrel=6 pkgdesc="Parallel Visualization application using VTK" arch=(x86_64) url="https://www.paraview.org"; @@ -88,6 +88,7 @@ source=( fix-vtk-python313-encoding.patch fix-pygments-formatters.patch netcdf-4.9.3.patch + cli11-2.5.0.patch ) sha256sums=('4e116250f8e1a9c480f97c5696c9cd72b4d4998b039ca46da8b224f27445f13e' 'd1cdb4a81db280d6b21bee3d9e5f8fc3a87f00a909d33850a1964c72091ec138' @@ -97,7 +98,8 @@ sha256sums=('4e116250f8e1a9c480f97c5696c9cd72b4d4998b039ca46da8b224f27445f13e' '83fcd0c7709ccbea87b39a7702d6f777d6a5c4e5dfbb9e5adf066b5fecdfa9d7' 'ab1b5b0ee08ae7714aa5c4924de0e2997b0feac1d4563ce73ef4b8c8204a4777' 'fc61d6d62e4e9f2c846d80b786b1e71ae7a14a2a28753868a0bc0018ba5a2278' - '87535578bbb0023ede506fd64afae95cdf4fb698c543f9735e6267730634afbc') + '87535578bbb0023ede506fd64afae95cdf4fb698c543f9735e6267730634afbc' + 'dd4053537565d0929ea87caa8f182b5451adb4b9e64f3297a60648c43f27c3f2') prepare() { # Specify python version in wrapper @@ -130,6 +132,9 @@ prepare() { # Fix build with netcdf 4.9.3 patch -Np1 -d VTK -i "$srcdir"/netcdf-4.9.3.patch + + # Fix build with cli11 2.5.0 + patch -Np1 -i "$srcdir"/cli11-2.5.0.patch } build() { ===================================== cli11-2.5.0.patch ===================================== @@ -0,0 +1,22 @@ +diff --git a/VTKExtensions/Core/vtkCLIOptions.cxx b/VTKExtensions/Core/vtkCLIOptions.cxx +index f7ef870415..5aefd1c95a 100644 +--- a/VTKExtensions/Core/vtkCLIOptions.cxx ++++ b/VTKExtensions/Core/vtkCLIOptions.cxx +@@ -52,10 +52,17 @@ class PVFormatter : public CLI::Formatter + + public: + // overridden to add a new line before each group. ++#if (CLI11_VERSION_MAJOR > 2 || (CLI11_VERSION_MAJOR == 2 && CLI11_VERSION_MINOR >= 5)) ++ std::string make_expanded(const CLI::App* sub, CLI::AppFormatMode mode) const override ++ { ++ return "\n" + Superclass::make_expanded(sub, mode); ++ } ++#else + std::string make_expanded(const CLI::App* sub) const override + { + return "\n" + Superclass::make_expanded(sub); + } ++#endif + + // overridden to ensure good word wrapping for description text. + std::string make_option_desc(const CLI::Option* option) const override View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/paraview/-/compare/4ea6071d89b6c58a3cddac7a15feb8bb53715f69...6ca774ca3cf55faaca524a9b2309706bd0e364c1 -- View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/paraview/-/compare/4ea6071d89b6c58a3cddac7a15feb8bb53715f69...6ca774ca3cf55faaca524a9b2309706bd0e364c1 You're receiving this email because of your account on gitlab.archlinux.org.
