diff options
author | Thomas Ascher | 2017-02-19 17:05:47 +0100 |
---|---|---|
committer | Thomas Ascher | 2017-02-19 17:05:47 +0100 |
commit | 7f231a94df1dc8d8e05c9cdab7533fb0587212fa (patch) | |
tree | 749e7c29354b473efcb8c723301313805df04093 | |
parent | 3ce009faa18af6e7ce1d0317d753230d3c483e95 (diff) | |
download | aur-7f231a94df1dc8d8e05c9cdab7533fb0587212fa.tar.gz |
fixed build break due to gtkmm header changes
-rw-r--r-- | .SRCINFO | 15 | ||||
-rw-r--r-- | PKGBUILD | 41 | ||||
-rw-r--r-- | cmake_paths_and_defs_fixes.patch | 120 | ||||
-rw-r--r-- | glew.patch | 82 | ||||
-rw-r--r-- | gtkmm_inclues.patch | 13 |
5 files changed, 37 insertions, 234 deletions
@@ -1,7 +1,7 @@ pkgbase = k3d pkgdesc = A free 3D modelling and animation software - pkgver = 0.8.0.5 - pkgrel = 4 + pkgver = 0.8.0.6 + pkgrel = 2 url = http://www.k-3d.org arch = x86_64 arch = i686 @@ -14,6 +14,7 @@ pkgbase = k3d makedepends = graphviz makedepends = libxslt depends = cgal + depends = collada-dom depends = ftgl depends = glew depends = gnome-vfs @@ -27,12 +28,10 @@ pkgbase = k3d depends = ode depends = openexr optdepends = aqsis - source = git+https://github.com/K-3D/k3d.git#tag=k3d-0.8.0.5 - source = cmake_paths_and_defs_fixes.patch - source = glew.patch - sha256sums = SKIP - sha256sums = fc8b7be14382b6b49fa908ff43773df5ec4e7b3401cc22629f6e2f6f7c4ee704 - sha256sums = dbfb367e1a55b40e6e1c6a91f3d30d762e321128779e7fcf0557dbdf825b3b99 + source = https://github.com/K-3D/k3d/archive/k3d-0.8.0.6.tar.gz + source = gtkmm_inclues.patch + sha256sums = c884667715c13543354d1e3e8edca9557a20d5ad3aa6bc35762394916655e817 + sha256sums = 701865e74d57c93688a463d19df98afbe2f7b9030ce4201515abd7fdbd98da85 pkgname = k3d @@ -1,13 +1,14 @@ # Maintainer: Thomas Ascher <thomas.ascher@gmx.at> # Contributor: Thomas Ascher <thomas.ascher@gmx.at> pkgname=k3d -pkgver=0.8.0.5 -pkgrel=4 +pkgver=0.8.0.6 +pkgrel=2 pkgdesc="A free 3D modelling and animation software" arch=('x86_64' 'i686') url="http://www.k-3d.org" license=('GPL') depends=('cgal' + 'collada-dom' 'ftgl' 'glew' 'gnome-vfs' @@ -25,41 +26,33 @@ makedepends=('asciidoc' 'boost' 'cmake' 'doxygen' - 'git' + 'git' 'graphviz' 'libxslt') -source=("git+https://github.com/K-3D/${pkgname}.git#tag=${pkgname}-${pkgver}" - "cmake_paths_and_defs_fixes.patch" - "glew.patch") -sha256sums=(SKIP - 'fc8b7be14382b6b49fa908ff43773df5ec4e7b3401cc22629f6e2f6f7c4ee704' - 'dbfb367e1a55b40e6e1c6a91f3d30d762e321128779e7fcf0557dbdf825b3b99') +source=("https://github.com/K-3D/k3d/archive/${pkgname}-${pkgver}.tar.gz" + "gtkmm_inclues.patch") +sha256sums=('c884667715c13543354d1e3e8edca9557a20d5ad3aa6bc35762394916655e817' + '701865e74d57c93688a463d19df98afbe2f7b9030ce4201515abd7fdbd98da85') prepare() { - cd "${srcdir}/${pkgname}" - patch -Np1 -i "${srcdir}/cmake_paths_and_defs_fixes.patch" - patch -Np1 -i "${srcdir}/glew.patch" + cd "${pkgname}-${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/gtkmm_inclues.patch" } build() { - mkdir -p "${srcdir}/${pkgname}-build" - cd "${srcdir}/${pkgname}-build" - # carve: current library version is no longer compatible - # collada io: current library version is no longer compatible - # google perftools: current library version is no longer compatible - # opencascade: current library version is no longer compatible - cmake "${srcdir}/${pkgname}" \ + mkdir -p "${srcdir}/build" + cd "${srcdir}/build" + # for profiling add -DK3D_ENABLE_PROFILING=ON to cmake configuration and gperftools to dependencies + cmake "${srcdir}/${pkgname}-${pkgname}-${pkgver}" \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DK3D_BUILD_AQSIS_MODULE=OFF \ -DK3D_BUILD_CARVE_MODULE=OFF \ - -DK3D_BUILD_COLLADA_IO_MODULE=OFF \ - -DK3D_BUILD_GOOGLE_PERFTOOLS_MODULE=OFF \ - -DK3D_BUILD_OPENCASCADE_MODULE=OFF + -DBOOST_SYSTEM_NO_DEPRECATED=1 \ + -DPython_ADDITIONAL_VERSIONS=2.7 make } package() { - cd "${srcdir}/${pkgname}-build" + cd "${srcdir}/build" make DESTDIR="${pkgdir}/" install } diff --git a/cmake_paths_and_defs_fixes.patch b/cmake_paths_and_defs_fixes.patch deleted file mode 100644 index 017de55ef317..000000000000 --- a/cmake_paths_and_defs_fixes.patch +++ /dev/null @@ -1,120 +0,0 @@ -diff -crB k3d.pristine/cmake/modules/K3DFindCARVE.cmake k3d/cmake/modules/K3DFindCARVE.cmake -*** k3d.pristine/cmake/modules/K3DFindCARVE.cmake 2016-07-15 22:06:59.900038000 +0200 ---- k3d/cmake/modules/K3DFindCARVE.cmake 2016-07-15 23:30:29.437934552 +0200 -*************** -*** 7,13 **** - ) - MARK_AS_ADVANCED(K3D_CARVE_INCLUDE_DIR) - -! FIND_LIBRARY(K3D_CARVE_LIBRARY intersect - DOC "The CARVE polyhedron boolean library" - ) - MARK_AS_ADVANCED(K3D_CARVE_LIBRARY) ---- 7,13 ---- - ) - MARK_AS_ADVANCED(K3D_CARVE_INCLUDE_DIR) - -! FIND_LIBRARY(K3D_CARVE_LIBRARY carve - DOC "The CARVE polyhedron boolean library" - ) - MARK_AS_ADVANCED(K3D_CARVE_LIBRARY) -diff -crB k3d.pristine/cmake/modules/K3DFindCollada.cmake k3d/cmake/modules/K3DFindCollada.cmake -*** k3d.pristine/cmake/modules/K3DFindCollada.cmake 2016-07-15 22:06:59.900038000 +0200 ---- k3d/cmake/modules/K3DFindCollada.cmake 2016-07-16 11:27:42.736775201 +0200 -*************** -*** 1,18 **** - SET(K3D_COLLADA_FOUND FALSE) - - IF(NOT APPLE) -! FIND_PATH(K3D_COLLADA_BASE_INCLUDE_PATH colladadom - DOC "Directory where the colladadom base directory is located" - ) - -! SET(K3D_COLLADA_DAE_INCLUDE_PATH ${K3D_COLLADA_BASE_INCLUDE_PATH}/colladadom CACHE PATH - "Directoy containing the Collada dae.h include file") - -! SET(K3D_COLLADA_DOM_INCLUDE_PATH ${K3D_COLLADA_BASE_INCLUDE_PATH}/colladadom/1.4 CACHE PATH - "Directoy containing the Collada dom includes") - - FIND_LIBRARY(K3D_COLLADA_LIBRARY -! NAMES collada14dom - PATHS - /usr/local/lib - /usr/lib ---- 1,18 ---- - SET(K3D_COLLADA_FOUND FALSE) - - IF(NOT APPLE) -! FIND_PATH(K3D_COLLADA_BASE_INCLUDE_PATH collada-dom2.4 - DOC "Directory where the colladadom base directory is located" - ) - -! SET(K3D_COLLADA_DAE_INCLUDE_PATH ${K3D_COLLADA_BASE_INCLUDE_PATH}/collada-dom2.4 CACHE PATH - "Directoy containing the Collada dae.h include file") - -! SET(K3D_COLLADA_DOM_INCLUDE_PATH ${K3D_COLLADA_BASE_INCLUDE_PATH}/collada-dom2.4/1.5 CACHE PATH - "Directoy containing the Collada dom includes") - - FIND_LIBRARY(K3D_COLLADA_LIBRARY -! NAMES collada-dom2.4-dp - PATHS - /usr/local/lib - /usr/lib -diff -crB k3d.pristine/cmake/modules/K3DFindOpenCascade.cmake k3d/cmake/modules/K3DFindOpenCascade.cmake -*** k3d.pristine/cmake/modules/K3DFindOpenCascade.cmake 2016-07-15 22:06:59.900038000 +0200 ---- k3d/cmake/modules/K3DFindOpenCascade.cmake 2016-07-15 22:10:14.223207779 +0200 -*************** -*** 1,12 **** - SET(K3D_OPENCASCADE_FOUND 0) - - FIND_PATH(K3D_OPENCASCADE_INCLUDE_DIR TDocStd_Document.hxx -! /opt/opencascade/ros/inc - DOC "Directory where the .hxx OpenCascade header files are located" - ) - MARK_AS_ADVANCED(K3D_OPENCASCADE_INCLUDE_DIR) - -! SET(K3D_OPENCASCADE_LIB_DIR /opt/opencascade/ros/Linux/lib CACHE PATH "Directory where the OpenCascade libraries are located") - MARK_AS_ADVANCED(K3D_OPENCASCADE_LIB_DIR) - - IF(K3D_OPENCASCADE_INCLUDE_DIR) ---- 1,12 ---- - SET(K3D_OPENCASCADE_FOUND 0) - - FIND_PATH(K3D_OPENCASCADE_INCLUDE_DIR TDocStd_Document.hxx -! /opt/opencascade/inc - DOC "Directory where the .hxx OpenCascade header files are located" - ) - MARK_AS_ADVANCED(K3D_OPENCASCADE_INCLUDE_DIR) - -! SET(K3D_OPENCASCADE_LIB_DIR /opt/opencascade/lib CACHE PATH "Directory where the OpenCascade libraries are located") - MARK_AS_ADVANCED(K3D_OPENCASCADE_LIB_DIR) - - IF(K3D_OPENCASCADE_INCLUDE_DIR) -diff -crB k3d.pristine/cmake/modules/K3DFindPython.cmake k3d/cmake/modules/K3DFindPython.cmake -*** k3d.pristine/cmake/modules/K3DFindPython.cmake 2016-07-15 22:06:59.900038000 +0200 ---- k3d/cmake/modules/K3DFindPython.cmake 2016-07-15 22:10:14.223207779 +0200 -*************** -*** 40,45 **** ---- 40,46 ---- - ENDIF() - ENDIF() - ELSE(APPLE) -+ SET(Python_ADDITIONAL_VERSIONS 2.7) - INCLUDE(FindPythonInterp) - INCLUDE(FindPythonLibs) - -diff -crB k3d.pristine/CMakeLists.txt k3d/CMakeLists.txt -*** k3d.pristine/CMakeLists.txt 2016-07-15 22:06:59.886705000 +0200 ---- k3d/CMakeLists.txt 2016-07-15 22:10:14.223207779 +0200 -*************** -*** 13,18 **** ---- 13,20 ---- - SET(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules") - SET(CMAKE_INSTALL_NAME_DIR "@exectuable_path/../lib/") - -+ ADD_DEFINITIONS(-DBOOST_SYSTEM_NO_DEPRECATED) -+ - INCLUDE(K3DOutOfSourceBuild) # Disallow in-source builds - INCLUDE(K3DCompileResource) - INCLUDE(K3DGenerateDEF) # Convenience macro for linking Win32 DLLs using MSVC -Only in k3d: CMakeLists.txt.user diff --git a/glew.patch b/glew.patch deleted file mode 100644 index 3f6cbd11cddf..000000000000 --- a/glew.patch +++ /dev/null @@ -1,82 +0,0 @@ -diff --git a/cmake/modules/K3DFindOpenGL.cmake b/cmake/modules/K3DFindOpenGL.cmake -index ea4cf71..0192557 100644 ---- a/cmake/modules/K3DFindOpenGL.cmake -+++ b/cmake/modules/K3DFindOpenGL.cmake -@@ -2,15 +2,13 @@ SET(K3D_OPENGL_FOUND 0) - - FIND_PACKAGE(OpenGL) - --FIND_LIBRARY(K3D_GLEW_LIBRARY NAMES GLEWmx GLEW -- DOC "The Glew shared library file" --) -- --FIND_PATH(K3D_GLEW_INCLUDE_DIR GL/glew.h ${OPENGL_INCLUDE_DIR}) -- --IF(OPENGL_FOUND AND OPENGL_GLU_FOUND AND K3D_GLEW_LIBRARY AND K3D_GLEW_INCLUDE_DIR) -- SET(K3D_OPENGL_INCLUDE_DIR ${OPENGL_INCLUDE_DIR} ${K3D_GLEW_INCLUDE_DIR}) -- SET(K3D_OPENGL_LIBRARIES ${K3D_GLEW_LIBRARY} ${OPENGL_LIBRARIES}) -+pkg_search_module(GLEW glewmx glew) -+ -+IF(OPENGL_FOUND AND OPENGL_GLU_FOUND AND GLEW_FOUND) -+ SET(K3D_OPENGL_INCLUDE_DIR ${OPENGL_INCLUDE_DIR} ${GLEW_INCLUDE_DIRS}) -+ SET(K3D_OPENGL_LIBRARIES ${GLEW_LIBRARIES} ${OPENGL_LIBRARIES}) -+ SET(K3D_GLEW_VERSION ${GLEW_VERSION}) -+ string(REPLACE "." ";" GLEW_VERSION_LIST ${GLEW_VERSION}) -+ list(GET GLEW_VERSION_LIST 0 K3D_GLEW_MAJOR_VERSION) - SET(K3D_OPENGL_FOUND 1) - ENDIF() -- -diff --git a/k3dsdk/gl/context.h b/k3dsdk/gl/context.h -index 39057d1..6f3cbc6 100644 ---- a/k3dsdk/gl/context.h -+++ b/k3dsdk/gl/context.h -@@ -27,6 +27,10 @@ - #include <k3dsdk/iunknown.h> - #include <boost/scoped_ptr.hpp> - -+#if K3D_GLEW_MAJOR_VERSION > 1 -+ struct GLEWContext {}; -+#endif -+ - namespace k3d - { - -@@ -45,13 +49,13 @@ class context : - - /// Returns the currently-active context, if any, or NULL. - static context* current(); -- -+ - /// Returns the currently-active GLEW context, if any, or NULL. Mostly used internally by GLEW - static GLEWContext* current_glew_context(); - - /// If the context is double-buffered, swaps the front and back buffers. Otherwise, a no-op. - void end(); -- -+ - /// Return the GLEW context associated with this context, or NULL if there is none - GLEWContext* glew_context(); - -@@ -76,4 +80,3 @@ class context : - #define glewGetContext() k3d::gl::context::current_glew_context() - - #endif // !K3DSDK_GL_CONTEXT_H -- -diff --git a/k3dsdk/k3d-platform-config.h.in b/k3dsdk/k3d-platform-config.h.in -index 63fd3ca..68985e6 100644 ---- a/k3dsdk/k3d-platform-config.h.in -+++ b/k3dsdk/k3d-platform-config.h.in -@@ -14,6 +14,8 @@ - #cmakedefine K3D_UINT_T_32_BITS - #cmakedefine K3D_UINT_T_64_BITS - -+#define K3D_GLEW_MAJOR_VERSION @K3D_GLEW_MAJOR_VERSION@ -+ - #define K3D_OSX_MAJOR_VERSION @K3D_OSX_MAJOR_VERSION@ - #define K3D_OSX_MINOR_VERSION @K3D_OSX_MINOR_VERSION@ - -@@ -26,4 +28,3 @@ - #endif - - #endif // !K3DSDK_PLATFORM_CONFIG_H -- diff --git a/gtkmm_inclues.patch b/gtkmm_inclues.patch new file mode 100644 index 000000000000..ee9d92e3a55c --- /dev/null +++ b/gtkmm_inclues.patch @@ -0,0 +1,13 @@ +diff -crB k3d-k3d-0.8.0.6-pristine/k3dsdk/ngui/utility.cpp k3d-k3d-0.8.0.6/k3dsdk/ngui/utility.cpp +*** k3d-k3d-0.8.0.6-pristine/k3dsdk/ngui/utility.cpp 2016-09-18 23:40:35.000000000 +0200 +--- k3d-k3d-0.8.0.6/k3dsdk/ngui/utility.cpp 2017-02-19 14:11:38.981744005 +0100 +*************** +*** 27,32 **** +--- 27,33 ---- + + #include <gdkmm/pixbuf.h> + #include <gtkmm/main.h> ++ #include <glibmm/main.h> + + namespace k3d + { |