diff options
| author | Matteo Bernardini <ponce@slackbuilds.org> | 2021-04-06 15:48:52 +0200 |
|---|---|---|
| committer | Robby Workman <rworkman@slackbuilds.org> | 2021-04-17 22:59:26 -0500 |
| commit | a7313e3532d7dd899e331dc07e388fa7b88d4d27 (patch) | |
| tree | 6663fa7048d83ceed4e7f1159c8c1061c7775de1 /graphics/OpenCASCADE | |
| parent | f118d94665464b11fd12e4a0b61b081ee03de5c1 (diff) | |
graphics/OpenCASCADE: Fix building with cmake >= 3.20.x.
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
Diffstat (limited to 'graphics/OpenCASCADE')
| -rw-r--r-- | graphics/OpenCASCADE/OpenCASCADE.SlackBuild | 2 | ||||
| -rw-r--r-- | graphics/OpenCASCADE/fix-flow-control-nesting.patch | 31 |
2 files changed, 33 insertions, 0 deletions
diff --git a/graphics/OpenCASCADE/OpenCASCADE.SlackBuild b/graphics/OpenCASCADE/OpenCASCADE.SlackBuild index b9ce861e666dc..c9336eb31a5e8 100644 --- a/graphics/OpenCASCADE/OpenCASCADE.SlackBuild +++ b/graphics/OpenCASCADE/OpenCASCADE.SlackBuild @@ -74,6 +74,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +patch -p1 < $CWD/fix-flow-control-nesting.patch + # Thanks to Chris Willing for the fix for VTK-8.1.0 compatibility. # This new version of the patch is still needed for occt 7.3.0 :( patch -p0 < $CWD/occt-7.3.0_vtk_InsertNextTupleValue.diff diff --git a/graphics/OpenCASCADE/fix-flow-control-nesting.patch b/graphics/OpenCASCADE/fix-flow-control-nesting.patch new file mode 100644 index 0000000000000..7e2bb1d7b2ab6 --- /dev/null +++ b/graphics/OpenCASCADE/fix-flow-control-nesting.patch @@ -0,0 +1,31 @@ +From e69c42386239bcc08143607df12b8bb3f1ff14ba Mon Sep 17 00:00:00 2001 +From: Bernd Waibel <waebbl-gentoo@posteo.net> +Date: Wed, 24 Feb 2021 20:06:02 +0100 +Subject: [PATCH] adm/cmake/vtk.cmake: fix flow control nesting + +Fix an unbalanced nesting of flow control statements +for >=cmake-3.20.0 + +Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net> +--- + adm/cmake/vtk.cmake | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/adm/cmake/vtk.cmake b/adm/cmake/vtk.cmake +index c5692fd6..00b7ff4a 100644 +--- a/adm/cmake/vtk.cmake ++++ b/adm/cmake/vtk.cmake +@@ -156,8 +156,8 @@ if (VTK_FOUND) + endif() + endif() + endif() +- endif() +- endforeach() ++ endforeach() ++ endif() + endif() + + if (3RDPARTY_VTK_INCLUDE_DIRS) +-- +2.30.1 + |