Use OCE

2 files changed, 7 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 864bfc0f1e93..bfec3c5b4dcd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -13,10 +13,11 @@ pkgbase = freecad-python3-git
 	makedepends = qt5-tools
 	depends = netcdf
 	depends = boost-libs
-	depends = coin-hg
 	depends = med
-	depends = opencascade7
+	depends = oce
+	depends = vtk
 	depends = python-numpy
+	depends = glew
 	depends = xerces-c
 	depends = qt5-svg
 	depends = qt5-webkit
@@ -24,7 +25,6 @@ pkgbase = freecad-python3-git
 	depends = hicolor-icon-theme
 	depends = python-pyside2
 	depends = python-pivy-git
-	depends = glew
 	source = freecad-python3::git+https://github.com/FreeCAD/FreeCAD.git
 	source = FreeCAD-Python3
 	source = FreeCADCmd-Python3
diff --git a/PKGBUILD b/PKGBUILD
index f57e5b09f4cd..83a6e5b78257 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,9 +8,9 @@ pkgdesc='A general purpose 3D CAD modeler'
 arch=('x86_64')
 url='http://www.freecadweb.org/'
 license=('LGPL')
-depends=('netcdf' 'boost-libs' 'coin-hg' 'med' 'opencascade7' 'python-numpy'
+depends=('netcdf' 'boost-libs' 'med' 'oce' 'vtk' 'python-numpy' 'glew'
          'xerces-c' 'qt5-svg' 'qt5-webkit' 'jsoncpp' 'hicolor-icon-theme'
-         'python-pyside2' 'python-pivy-git' 'glew')
+         'python-pyside2' 'python-pivy-git')
 makedepends=('git' 'cmake' 'boost' 'eigen' 'desktop-file-utils' 'qt5-tools')
 source=("${_appname}::git+https://github.com/FreeCAD/FreeCAD.git"
         "FreeCAD-Python3"
@@ -32,14 +32,9 @@ build() {
     cd "$srcdir/${_appname}"
     cmake -DCMAKE_BUILD_TYPE=Release \
           -DCMAKE_INSTALL_PREFIX="/opt/${_appname}" \
+          -DFREECAD_USE_OCC_VARIANT="Community Edition" \
           -DPYTHON_EXECUTABLE="/usr/bin/python3" \
-          -DBUILD_QT5=ON \
-          -DOCC_INCLUDE_DIR="/opt/opencascade7/include/opencascade" \
-          -DOCC_LIBRARY_DIR="/opt/opencascade7/lib" \
-          -DCMAKE_PREFIX_PATH="/opt/opencascade7" \
-          -DCMAKE_INCLUDE_PATH="/opt/opencascade7/include/opencascade" \
-          -DCMAKE_LIBRARY_PATH="/opt/opencascade7/lib" \
-          -DCMAKE_INSTALL_RPATH="/opt/opencascade7/lib;/usr/lib"
+          -DBUILD_QT5=ON
 
     make
 }