diff options
| -rw-r--r-- | .SRCINFO | 14 | ||||
| -rw-r--r-- | PKGBUILD | 4 | ||||
| -rw-r--r-- | fem-rpath.patch | 23 |
3 files changed, 10 insertions, 31 deletions
@@ -1,7 +1,7 @@ pkgbase = freecad-git pkgdesc = A general purpose 3D CAD modeler - git checkout - pkgver = 0.17pre.r3401.g99fa203f3 - pkgrel = 2 + pkgver = 0.17pre.r3794.g4f165179e + pkgrel = 1 epoch = 1 url = http://www.freecadweb.org/ arch = i686 @@ -16,16 +16,16 @@ pkgbase = freecad-git makedepends = eigen makedepends = gcc-fortran makedepends = swig - makedepends = patch depends = boost-libs depends = curl depends = hicolor-icon-theme depends = libspnav - depends = opencascade + depends = opencascade7 depends = med depends = xerces-c depends = python2-pivy depends = python2-pyside + depends = qtwebkit depends = libtheora depends = shared-mime-info depends = vtk-qt4 @@ -37,11 +37,13 @@ pkgbase = freecad-git source = freecad-git::git+https://github.com/FreeCAD/FreeCAD.git source = freecad.desktop source = freecad.xml - source = fem-rpath.patch + source = rpath.patch + source = fix-occ-search.patch md5sums = SKIP md5sums = 7e781d41e90a1c137930e47672996a52 md5sums = c2f4154c8e4678825411de8e7fa54c6b - md5sums = 99a41687a9ba980eea86aee4345d9a1d + md5sums = b313a990287bce43dc698affae35d58d + md5sums = 5a7beefb78ef73241b0e421fec67f4db pkgname = freecad-git @@ -10,10 +10,10 @@ arch=('i686' 'x86_64') url='http://www.freecadweb.org/' license=('LGPL') depends=('boost-libs' 'curl' 'hicolor-icon-theme' 'libspnav' 'opencascade7' - 'med' 'xerces-c' 'python2-pivy' 'python2-pyside' + 'med' 'xerces-c' 'python2-pivy' 'python2-pyside' 'qtwebkit' 'libtheora' 'shared-mime-info' 'vtk-qt4' 'jsoncpp') makedepends=('git' 'boost' 'cmake' 'coin' 'python2-pyside-tools' - 'desktop-file-utils' 'eigen' 'gcc-fortran' 'swig' 'patch') + 'desktop-file-utils' 'eigen' 'gcc-fortran' 'swig') optdepends=('python2-matplotlib' 'pycollada-git: Create, edit and load COLLADA documents.') provides=('freecad') diff --git a/fem-rpath.patch b/fem-rpath.patch deleted file mode 100644 index 69c6043edc37..000000000000 --- a/fem-rpath.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/src/Mod/Fem/App/CMakeLists.txt b/src/Mod/Fem/App/CMakeLists.txt -index fd57fa0..3c649d4 100755 ---- a/src/Mod/Fem/App/CMakeLists.txt -+++ b/src/Mod/Fem/App/CMakeLists.txt -@@ -263,5 +263,7 @@ fc_target_copy_resource(Fem - - SET_BIN_DIR(Fem Fem /Mod/Fem) - SET_PYTHON_PREFIX_SUFFIX(Fem) -+set_property(TARGET Fem APPEND PROPERTY INSTALL_RPATH "/opt/vtk-qt4/lib") -+ - - INSTALL(TARGETS Fem DESTINATION ${CMAKE_INSTALL_LIBDIR}) -diff --git a/src/Mod/Fem/Gui/CMakeLists.txt b/src/Mod/Fem/Gui/CMakeLists.txt -index cec8d78..b3a7c48 100755 ---- a/src/Mod/Fem/Gui/CMakeLists.txt -+++ b/src/Mod/Fem/Gui/CMakeLists.txt -@@ -344,5 +344,6 @@ INSTALL(FILES ${FemGuiIcon_SVG} DESTINATION "${CMAKE_INSTALL_DATADIR}/Mod/Fem/Re - - SET_BIN_DIR(FemGui FemGui /Mod/Fem) - SET_PYTHON_PREFIX_SUFFIX(FemGui) -+set_property(TARGET FemGui APPEND PROPERTY INSTALL_RPATH "/opt/vtk-qt4/lib") - - INSTALL(TARGETS FemGui DESTINATION ${CMAKE_INSTALL_LIBDIR}) |