Date: Monday, July 17, 2017 @ 16:01:30 Author: arojas Revision: 300701
Reenable the solver Added: kalzium/trunk/kalzium-ocaml-4.04.patch Modified: kalzium/trunk/PKGBUILD --------------------------+ PKGBUILD | 14 ++++++++++---- kalzium-ocaml-4.04.patch | 13 +++++++++++++ 2 files changed, 23 insertions(+), 4 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-07-17 15:51:31 UTC (rev 300700) +++ PKGBUILD 2017-07-17 16:01:30 UTC (rev 300701) @@ -4,24 +4,30 @@ pkgname=kalzium pkgver=17.04.3 -pkgrel=1 +pkgrel=2 pkgdesc="Periodic Table of Elements" url="https://kde.org/applications/education/kalzium/"; arch=(i686 x86_64) license=(GPL LGPL FDL) depends=(khtml kdelibs4support knewstuff kplotting avogadrolibs openbabel chemical-mime-data) -makedepends=(extra-cmake-modules kdoctools kdesignerplugin python eigen) # ocaml facile +makedepends=(extra-cmake-modules kdoctools kdesignerplugin python eigen ocaml facile) conflicts=(kdeedu-kalzium) replaces=(kdeedu-kalzium) groups=(kde-applications kdeedu) -source=("https://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig}) +source=("https://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig} + kalzium-ocaml-4.04.patch) sha256sums=('8dfe48d336d746cfc2387d67c5bcb921f9ea4dea1c0231864f7dcd87c35a9d5f' - 'SKIP') + 'SKIP' + '1bb03588d074331fb78d4647aa038353cc202b9eff20f6bfec95c9e8340dc83b') validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7 # Albert Astals Cid <[email protected]> F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck <[email protected]> prepare() { mkdir -p build + +# Fix solver build with ocaml 4.04 + cd $pkgname-$pkgver + patch -p2 -i ../kalzium-ocaml-4.04.patch } build() { Added: kalzium-ocaml-4.04.patch =================================================================== --- kalzium-ocaml-4.04.patch (rev 0) +++ kalzium-ocaml-4.04.patch 2017-07-17 16:01:30 UTC (rev 300701) @@ -0,0 +1,13 @@ +diff --git a/kalzium-17.04.3.orig/src/CMakeOCamlInstructions.cmake b/kalzium-17.04.3/src/CMakeOCamlInstructions.cmake +--- a/kalzium-17.04.3.orig/src/CMakeOCamlInstructions.cmake ++++ b/kalzium-17.04.3/src/CMakeOCamlInstructions.cmake +@@ -58,7 +58,7 @@ + # object files + + add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/modwrap.o +- COMMAND ${OCAML_OCAMLOPT_EXECUTABLE} -I ${LIBFACILE_INCLUDE_DIR} -c ${CMAKE_CURRENT_SOURCE_DIR}/solver/modwrap.c -o ${CMAKE_CURRENT_BINARY_DIR}/modwrap.o ++ COMMAND ${OCAML_OCAMLOPT_EXECUTABLE} -I ${LIBFACILE_INCLUDE_DIR} -c ${CMAKE_CURRENT_SOURCE_DIR}/solver/modwrap.c + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/solver/modwrap.c ${CMAKE_CURRENT_BINARY_DIR}/solver.o + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) + set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES ${CMAKE_CURRENT_BINARY_DIR}/modwrap.o) +
