diff options
| -rw-r--r-- | .SRCINFO | 8 | ||||
| -rw-r--r-- | PKGBUILD | 17 | ||||
| -rw-r--r-- | cmake_python2_detection.patch | 20 | ||||
| -rw-r--r-- | iostream_includes.patch | 20 |
4 files changed, 57 insertions, 8 deletions
@@ -1,7 +1,7 @@ pkgbase = k3d pkgdesc = A free 3D modelling and animation software pkgver = 0.8.0.6 - pkgrel = 2 + pkgrel = 3 url = http://www.k-3d.org arch = x86_64 arch = i686 @@ -27,11 +27,15 @@ pkgbase = k3d depends = libjpeg-turbo depends = ode depends = openexr - optdepends = aqsis + optdepends = aqsis: Rendering engine source = https://github.com/K-3D/k3d/archive/k3d-0.8.0.6.tar.gz source = gtkmm_inclues.patch + source = cmake_python2_detection.patch + source = iostream_includes.patch sha256sums = c884667715c13543354d1e3e8edca9557a20d5ad3aa6bc35762394916655e817 sha256sums = 701865e74d57c93688a463d19df98afbe2f7b9030ce4201515abd7fdbd98da85 + sha256sums = ec8d4c398350baf4c8694f0faa06a5a160f88e8e826cd7ca6d079bd0afceef35 + sha256sums = fdf2378ec7a0813eb56dfb168b81f9146e02516fc0bfbe5e7be11108fa81926c pkgname = k3d @@ -2,7 +2,7 @@ # Contributor: Thomas Ascher <thomas.ascher@gmx.at> pkgname=k3d pkgver=0.8.0.6 -pkgrel=2 +pkgrel=3 pkgdesc="A free 3D modelling and animation software" arch=('x86_64' 'i686') url="http://www.k-3d.org" @@ -21,7 +21,7 @@ depends=('cgal' 'libjpeg-turbo' 'ode' 'openexr') -optdepends=('aqsis') +optdepends=('aqsis: Rendering engine') makedepends=('asciidoc' 'boost' 'cmake' @@ -30,13 +30,19 @@ makedepends=('asciidoc' 'graphviz' 'libxslt') source=("https://github.com/K-3D/k3d/archive/${pkgname}-${pkgver}.tar.gz" - "gtkmm_inclues.patch") + "gtkmm_inclues.patch" + "cmake_python2_detection.patch" + "iostream_includes.patch") sha256sums=('c884667715c13543354d1e3e8edca9557a20d5ad3aa6bc35762394916655e817' - '701865e74d57c93688a463d19df98afbe2f7b9030ce4201515abd7fdbd98da85') + '701865e74d57c93688a463d19df98afbe2f7b9030ce4201515abd7fdbd98da85' + 'ec8d4c398350baf4c8694f0faa06a5a160f88e8e826cd7ca6d079bd0afceef35' + 'fdf2378ec7a0813eb56dfb168b81f9146e02516fc0bfbe5e7be11108fa81926c') prepare() { cd "${pkgname}-${pkgname}-${pkgver}" patch -Np1 -i "${srcdir}/gtkmm_inclues.patch" + patch -Np1 -i "${srcdir}/cmake_python2_detection.patch" + patch -Np1 -i "${srcdir}/iostream_includes.patch" } build() { @@ -46,8 +52,7 @@ build() { cmake "${srcdir}/${pkgname}-${pkgname}-${pkgver}" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DK3D_BUILD_CARVE_MODULE=OFF \ - -DBOOST_SYSTEM_NO_DEPRECATED=1 \ - -DPython_ADDITIONAL_VERSIONS=2.7 + -DBOOST_SYSTEM_NO_DEPRECATED=1 make } diff --git a/cmake_python2_detection.patch b/cmake_python2_detection.patch new file mode 100644 index 000000000000..bce2882198b4 --- /dev/null +++ b/cmake_python2_detection.patch @@ -0,0 +1,20 @@ +diff -crB k3d-k3d-0.8.0.6-pristine/CMakeLists.txt k3d-k3d-0.8.0.6/CMakeLists.txt +*** k3d-k3d-0.8.0.6-pristine/CMakeLists.txt 2016-09-18 23:40:35.000000000 +0200 +--- k3d-k3d-0.8.0.6/CMakeLists.txt 2018-01-04 17:17:50.616954533 +0100 +*************** +*** 8,14 **** + ENDIF() + + set(CMAKE_CXX_STANDARD 11) +! + + SET(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules") + SET(CMAKE_INSTALL_NAME_DIR "@exectuable_path/../lib/") +--- 8,14 ---- + ENDIF() + + set(CMAKE_CXX_STANDARD 11) +! find_package(PythonLibs 2 EXACT REQUIRED) + + SET(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules") + SET(CMAKE_INSTALL_NAME_DIR "@exectuable_path/../lib/") diff --git a/iostream_includes.patch b/iostream_includes.patch new file mode 100644 index 000000000000..daf713cb1abf --- /dev/null +++ b/iostream_includes.patch @@ -0,0 +1,20 @@ +diff -crB k3d-k3d-0.8.0.6-pristine/k3dsdk/measurement.h k3d-k3d-0.8.0.6/k3dsdk/measurement.h +*** k3d-k3d-0.8.0.6-pristine/k3dsdk/measurement.h 2016-09-18 23:40:35.000000000 +0200 +--- k3d-k3d-0.8.0.6/k3dsdk/measurement.h 2018-01-05 02:33:12.009950182 +0100 +*************** +*** 26,32 **** + */ + + #include <cassert> +! #include <iosfwd> + #include <map> + #include <string> + #include <typeinfo> +--- 26,32 ---- + */ + + #include <cassert> +! #include <iostream> + #include <map> + #include <string> + #include <typeinfo> |