diff options
| author | Michal Ulianko | 2018-06-24 15:45:50 +0200 |
|---|---|---|
| committer | Michal Ulianko | 2018-06-24 15:46:44 +0200 |
| commit | 5173f0d54098b34e6540ad618e7f6f845d574edb (patch) | |
| tree | 9af3a630483ad975f59651e4bce41ffc0bbf6905 | |
| parent | 493c466e86b0fea8aa78c77ba0d55bd4b6c90db8 (diff) | |
| download | aur-5173f0d54098b34e6540ad618e7f6f845d574edb.tar.gz | |
Remove ugly python version patch
| -rw-r--r-- | .SRCINFO | 2 | ||||
| -rw-r--r-- | PKGBUILD | 8 | ||||
| -rw-r--r-- | python_version.patch | 13 |
3 files changed, 1 insertions, 22 deletions
@@ -26,13 +26,11 @@ pkgbase = freecad-python3-git depends = python-pivy-git depends = glew source = freecad-python3::git+https://github.com/FreeCAD/FreeCAD.git - source = python_version.patch source = FreeCAD-Python3 source = FreeCADCmd-Python3 source = freecad-python3.desktop source = freecad-python3.xml md5sums = SKIP - md5sums = c6fcaa9963687bcadf4df8afb44effc5 md5sums = 11de902a9afd6b1e4a6cde867e167bb0 md5sums = 6ef4c2f2e40d5185401819c8e76453e5 md5sums = bc7b8caca5f8e6b7812f47af2dfa79c6 @@ -13,13 +13,11 @@ depends=('netcdf' 'boost-libs' 'coin-hg' 'med' 'opencascade7' 'python-numpy' 'python-pyside2' 'python-pivy-git' 'glew') makedepends=('git' 'cmake' 'boost' 'eigen' 'desktop-file-utils' 'qt5-tools') source=("${_appname}::git+https://github.com/FreeCAD/FreeCAD.git" - "python_version.patch" "FreeCAD-Python3" "FreeCADCmd-Python3" "freecad-python3.desktop" "freecad-python3.xml") md5sums=('SKIP' - 'c6fcaa9963687bcadf4df8afb44effc5' '11de902a9afd6b1e4a6cde867e167bb0' '6ef4c2f2e40d5185401819c8e76453e5' 'bc7b8caca5f8e6b7812f47af2dfa79c6' @@ -30,15 +28,11 @@ pkgver() { git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g' } -prepare() { - cd "$srcdir/${_appname}" - patch -p1 -i "$srcdir/python_version.patch" -} - build() { cd "$srcdir/${_appname}" cmake -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX="/opt/${_appname}" \ + -DPYTHON_EXECUTABLE="/usr/bin/python3" \ -DBUILD_QT5=ON \ -DOCC_INCLUDE_DIR="/opt/opencascade7/include/opencascade" \ -DOCC_LIBRARY_DIR="/opt/opencascade7/lib" \ diff --git a/python_version.patch b/python_version.patch deleted file mode 100644 index ee4691cfe221..000000000000 --- a/python_version.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3ecfe23a6..35d280d68 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -445,7 +445,7 @@ if(NOT FREECAD_LIBPACK_USE OR FREECAD_LIBPACK_CHECKFILE_CLBUNDLER) - - # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=677598 - # Acceptable versions of Python --set(Python_ADDITIONAL_VERSIONS "2.7") -+set(Python_ADDITIONAL_VERSIONS "3.6") - - # For building on OS X - if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") |