[packages/OpenCASCADE] - up to 7.8.1, fix libdir path in cmake

[baggins]

commit defc15334e33d37e7b3c64ed2da23f123e00eb47
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Mon Dec 9 23:41:07 2024 +0100

    - up to 7.8.1, fix libdir path in cmake

 OpenCASCADE.spec   | 18 +++++++++++-------
 cmake-libdir.patch | 11 +++++++++++
 strict-const.patch | 11 +++++++++++
 3 files changed, 33 insertions(+), 7 deletions(-)
---
diff --git a/OpenCASCADE.spec b/OpenCASCADE.spec
index 5aa64aa..88a2b84 100644
--- a/OpenCASCADE.spec
+++ b/OpenCASCADE.spec
@@ -23,19 +23,21 @@
 Summary:	OpenCASCADE CAE platform
 Summary(pl.UTF-8):	Platforma CAE OpenCASCADE
 Name:		OpenCASCADE
-Version:	7.8.0
+Version:	7.8.1
 %define	tagver	%(echo %{version} | tr . _)
 Release:	1
 License:	LGPL v2.1 with Open CASCADE Exception v1.0
 Group:		Applications/Engineering
 #Source0Download https://dev.opencascade.org/release
 Source0:	https://github.com/Open-Cascade-SAS/OCCT/archive/V%{tagver}/OCCT-%{tagver}.tar.gz
-# Source0-md5:	a8307c25f082a58013a5bcf03a02e417
+# Source0-md5:	a1ae2c20422dd7a4352758667f34851f
 Patch0:		%{name}-cmake.patch
 Patch1:		%{name}-inspector-data.patch
 Patch2:		%{name}-draco.patch
 Patch3:		%{name}-openvr.patch
 Patch4:		%{name}-X.patch
+Patch5:		cmake-libdir.patch
+Patch6:		strict-const.patch
 URL:		https://www.opencascade.com/open-cascade-technology/
 %{?with_freeimage:BuildRequires:	FreeImage-devel}
 BuildRequires:	OpenGL-GLU-devel
@@ -218,11 +220,13 @@ Przykłady do OpenCASCADE.
 
 %prep
 %setup -q -n OCCT-%{tagver}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
+%patch -P 0 -p1
+%patch -P 1 -p1
+%patch -P 2 -p1
+%patch -P 3 -p1
+%patch -P 4 -p1
+%patch -P 5 -p1
+%patch -P 6 -p1
 
 %{__sed} -i -e '/set (CMAKE_CONFIGURATION_TYPES/ { s/INTERNAL/STRING/;s/ FORCE// }' CMakeLists.txt
 %{__sed} -i -e 's/IMPORTED_LOCATION_RELEASE/IMPORTED_LOCATION_PLD/' adm/cmake/tbb.cmake
diff --git a/cmake-libdir.patch b/cmake-libdir.patch
new file mode 100644
index 0000000..cbfaf7e
--- /dev/null
+++ b/cmake-libdir.patch
@@ -0,0 +1,11 @@
+--- OCCT-7_8_1/adm/templates/OpenCASCADEConfig.cmake.in~	2024-04-01 00:05:22.000000000 +0200
++++ OCCT-7_8_1/adm/templates/OpenCASCADEConfig.cmake.in	2024-12-09 22:50:52.914992145 +0100
+@@ -27,7 +27,7 @@
+ if (OpenCASCADE_INSTALL_PREFIX MATCHES "/cmake$")
+   get_filename_component (OpenCASCADE_INSTALL_PREFIX "${OpenCASCADE_INSTALL_PREFIX}" PATH)
+ endif()
+-if (OpenCASCADE_INSTALL_PREFIX MATCHES "/lib$")
++if (OpenCASCADE_INSTALL_PREFIX MATCHES "/lib(|64|x32)$")
+   get_filename_component (OpenCASCADE_INSTALL_PREFIX "${OpenCASCADE_INSTALL_PREFIX}" PATH)
+ endif()
+ if (OpenCASCADE_INSTALL_PREFIX MATCHES "/libs/${CMAKE_ANDROID_ARCH_ABI}$")
diff --git a/strict-const.patch b/strict-const.patch
new file mode 100644
index 0000000..2b4b5ef
--- /dev/null
+++ b/strict-const.patch
@@ -0,0 +1,11 @@
+--- OCCT-7_8_1/src/StdPrs/StdPrs_BRepFont.cxx~	2024-04-01 00:05:22.000000000 +0200
++++ OCCT-7_8_1/src/StdPrs/StdPrs_BRepFont.cxx	2024-12-09 23:18:11.268003395 +0100
+@@ -457,7 +457,7 @@
+   for (short aContour = 0, aStartIndex = 0; aContour < anOutline->n_contours; ++aContour)
+   {
+     const FT_Vector* aPntList = &anOutline->points[aStartIndex];
+-    const char* aTags      = &anOutline->tags[aStartIndex];
++    unsigned char* aTags      = &anOutline->tags[aStartIndex];
+     const short anEndIndex = anOutline->contours[aContour];
+     const short aPntsNb    = (anEndIndex - aStartIndex) + 1;
+     aStartIndex = anEndIndex + 1;
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/OpenCASCADE.git/commitdiff/defc15334e33d37e7b3c64ed2da23f123e00eb47