fix freecad build

3 files changed, 56 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9c3a34f9c8e3..0e138c1a4fed 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -21,7 +21,9 @@ pkgbase = opencascade-rc
 	conflicts = opencascade-git
 	source = opencascade-rc-7.6.0.tgz::https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=refs/tags/V7_6_0;sf=tgz
 	source = opencascade.sh
+	source = opencascade-cmake.patch
 	sha256sums = e7f989d52348c3b3acb7eb4ee001bb5c2eed5250cdcceaa6ae97edc294f2cabd
 	sha256sums = 9acb2439f1f7f066c111adef5d9f34dcb19c906cc928f87b71eb194317948dfb
+	sha256sums = 4782d4d93cbd7f5489d23a855a1d31801bd61383d7cf9dc0e613fae34541cfde
 
 pkgname = opencascade-rc
diff --git a/PKGBUILD b/PKGBUILD
index 475335cde3ea..6fce087cf700 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -36,13 +36,20 @@ rapidjson
 source=(
 "${pkgname}-${pkgver}.tgz::https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=refs/tags/${_pkgver};sf=tgz"
 opencascade.sh
+opencascade-cmake.patch
+#"fix-freecad-build.patch::https://git.dev.opencascade.org/gitweb/?p=occt.git;a=patch;h=5e7632824302761b84cfceb5bfb2241d906d0eb4"
 )
 sha256sums=('e7f989d52348c3b3acb7eb4ee001bb5c2eed5250cdcceaa6ae97edc294f2cabd'
-            '9acb2439f1f7f066c111adef5d9f34dcb19c906cc928f87b71eb194317948dfb')
+            '9acb2439f1f7f066c111adef5d9f34dcb19c906cc928f87b71eb194317948dfb'
+            'b3a2583fd21576d454952894f92a2a9e710015051403a3759b4a2ccbfc78a048')
 
 prepare() {
   cd occt-${_pkgver}
 
+  #patch -p1 -i ../fix-freecad-build.patch # Fix build of FreeCAD
+
+  patch -p1 -i ../opencascade-cmake.patch
+  
   #curl https://src.fedoraproject.org/rpms/opencascade/raw/rawhide/f/opencascade-cmake.patch | patch -p1
 
   #curl https://raw.githubusercontent.com/archlinux/svntogit-community/packages/opencascade/trunk/vtk9.patch | patch -p1
@@ -117,7 +124,7 @@ package() {
   # remove the pollution from bin
   rm -rf "${pkgdir}/usr/bin/"*.sh
   
-  install -m644 -Dt "${pkgdir}/etc/profile.d" opencascade.sh
-  install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE_LGPL_21.txt
-  install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" OCCT_LGPL_EXCEPTION.txt
+  install -m644 -Dt "${pkgdir}"/etc/profile.d ${srcdir}/opencascade.sh
+  install -m644 -Dt "${pkgdir}"/usr/share/licenses/${pkgname} LICENSE_LGPL_21.txt
+  install -m644 -Dt "${pkgdir}"/usr/share/licenses/${pkgname} OCCT_LGPL_EXCEPTION.txt
 }
diff --git a/opencascade-cmake.patch b/opencascade-cmake.patch
new file mode 100644
index 000000000000..b52ac04ae39a
--- /dev/null
+++ b/opencascade-cmake.patch
@@ -0,0 +1,43 @@
+Index: opencascade-7.5.0/CMakeLists.txt
+===================================================================
+--- opencascade-7.5.0.orig/CMakeLists.txt
++++ opencascade-7.5.0/CMakeLists.txt
+@@ -1156,7 +1156,7 @@ foreach (OCCT_CONFIGURATION ${CMAKE_CONF
+ endforeach()
+ # install OpenCASCADE config file with compile definitions and C/C++ flags ONLY for current configuration
+ install (CODE "string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\" CMAKE_INSTALL_CONFIG_NAME_LOWER)")
+-install (CODE "configure_file(\"${CMAKE_BINARY_DIR}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" \"${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" COPYONLY)")
++install (CODE "configure_file(\"${CMAKE_BINARY_DIR}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" \"$ENV{DESTDIR}/${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" COPYONLY)")
+ 
+ foreach (OCCT_MODULE ${OCCT_MODULES})
+   if (BUILD_MODULE_${OCCT_MODULE})
+Index: opencascade-7.5.0/adm/templates/OpenCASCADEConfig.cmake.in
+===================================================================
+--- opencascade-7.5.0.orig/adm/templates/OpenCASCADEConfig.cmake.in
++++ opencascade-7.5.0/adm/templates/OpenCASCADEConfig.cmake.in
+@@ -27,7 +27,7 @@ get_filename_component (OpenCASCADE_INST
+ 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$" OR OpenCASCADE_INSTALL_PREFIX MATCHES "/lib64$")
+   get_filename_component (OpenCASCADE_INSTALL_PREFIX "${OpenCASCADE_INSTALL_PREFIX}" PATH)
+ endif()
+ if (OpenCASCADE_INSTALL_PREFIX MATCHES "/libs/${CMAKE_ANDROID_ARCH_ABI}$")
+Index: opencascade-7.5.0/adm/cmake/occt_toolkit.cmake
+===================================================================
+--- opencascade-7.5.0.orig/adm/cmake/occt_toolkit.cmake
++++ opencascade-7.5.0/adm/cmake/occt_toolkit.cmake
+@@ -244,9 +244,9 @@ else()
+ 
+   install (TARGETS ${PROJECT_NAME}
+            EXPORT OpenCASCADE${CURRENT_MODULE}Targets
+-           RUNTIME DESTINATION "${INSTALL_DIR_BIN}\${OCCT_INSTALL_BIN_LETTER}"
+-           ARCHIVE DESTINATION "${INSTALL_DIR_LIB}\${OCCT_INSTALL_BIN_LETTER}"
+-           LIBRARY DESTINATION "${INSTALL_DIR_LIB}\${OCCT_INSTALL_BIN_LETTER}")
++           RUNTIME DESTINATION "${INSTALL_DIR_BIN}"
++           ARCHIVE DESTINATION "${INSTALL_DIR_LIB}"
++           LIBRARY DESTINATION "${INSTALL_DIR_LIB}")
+ 
+   if (NOT WIN32)
+     if (BUILD_SHARED_LIBS AND NOT "${BUILD_SHARED_LIBRARY_NAME_POSTFIX}" STREQUAL "")