switch to oce and fix hardcoded calls to python

2 files changed, 7 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index da1231755125..87407caeba4e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Mon Feb 20 16:35:10 UTC 2017
+# Sat Feb 25 18:00:23 UTC 2017
 pkgbase = heekscad-git
 	pkgdesc = HeeksCNC is an open source, 3D CAD/CAM software
 	pkgver = 1449.008d7b6f
@@ -8,8 +8,8 @@ pkgbase = heekscad-git
 	arch = x86_64
 	license = custom:BSD3
 	makedepends = cmake
-	depends = python
-	depends = opencascade
+	depends = python2
+	depends = oce
 	depends = wxgtk
 	depends = libarea-git
 	optdepends = heekscnc-git
diff --git a/PKGBUILD b/PKGBUILD
index d88795a64ae4..bc16e267abb7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@ pkgdesc="HeeksCNC is an open source, 3D CAD/CAM software"
 arch=('x86_64')
 url="http://heeks.net"
 license=('custom:BSD3')
-depends=('python' 'opencascade' 'wxgtk' 'libarea-git')
+depends=('python2' 'oce' 'wxgtk' 'libarea-git')
 optdepends=('heekscnc-git')
 makedepends=('cmake')
 provides=('heekscad')
@@ -20,17 +20,18 @@ pkgver() {
 }
 
 prepare() {
+  # fix the hardcoded calls to python
   sed -i 's,#find OCE or OpenCASCADE,set( CMAKE_CXX_FLAGS "-std=c++11" )\n#find OCE or OpenCASCADE,g' "${srcdir}/heekscad/CMakeLists.txt"
   sed -i 's,#find OCE or OpenCASCADE,set( CMAKE_CXX_FLAGS "-std=c++11" )\n#find OCE or OpenCASCADE,g' "${srcdir}/heekscad/src/CMakeLists.txt"
 }
 
 build() {
   msg "Starting build..."
-  export CASROOT=/opt/opencascade
   cd "${srcdir}/heekscad"
   mkdir -p build
   cd build
-  cmake -DCMAKE_INSTALL_PREFIX=/usr ..
+  export OCE_DIR="/opt/oce/lib/oce-0.18"
+  cmake -DPYTHON_EXECUTABLE="/usr/bin/python2" -DPYTHON_LIBRARY="/usr/lib/libpython2.7.so" -DPYTHON_INCLUDE_DIR="/usr/include/python2.7" -DCMAKE_INSTALL_PREFIX=/usr ..
 }
 
 package() {