kde-apps/kalzium: Fix build with dev-lang/ocaml-4.04.0

See also: https://bugs.kde.org/show_bug.cgi?id=372671

Gentoo-bug: 603050

Package-Manager: Portage-2.3.6, Repoman-2.3.1

diff --git a/kde-apps/kalzium/files/kalzium-17.04.3-ocaml404.patch b/kde-apps/kalzium/files/kalzium-17.04.3-ocaml404.patch
new file mode 100644 (file)
index 0000000..b2c3157
--- /dev/null
+++ b/kde-apps/kalzium/files/kalzium-17.04.3-ocaml404.patch
@@ -0,0 +1,29 @@
+From 447d0ca4cc757f79ad02ca52ab5e086b78dfdfb1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jos=C3=A9=20Manuel=20Santamar=C3=ADa=20Lema?=
+ <panfaust@gmail.com>
+Date: Thu, 3 Aug 2017 18:10:53 +0200
+Subject: Fix build with ocaml 4.04
+
+BUG: 372671
+FIXED-IN: 17.08
+
+Differential Revision: https://phabricator.kde.org/D6752
+---
+ src/CMakeOCamlInstructions.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/CMakeOCamlInstructions.cmake b/src/CMakeOCamlInstructions.cmake
+index 483d003..da703b1 100644
+--- a/src/CMakeOCamlInstructions.cmake
++++ b/src/CMakeOCamlInstructions.cmake
+@@ -58,7 +58,7 @@ ocaml_ml_to_cmx(${CMAKE_CURRENT_BINARY_DIR}/lexer.cmx ${CMAKE_CURRENT_SOURCE_DIR
+ # 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)
+-- 
+cgit v0.11.2

diff --git a/kde-apps/kalzium/kalzium-17.04.3.ebuild b/kde-apps/kalzium/kalzium-17.04.3.ebuild
index 9245d7e29c7de2fe4d964339056b697309b7c39a..caeb6d64fc0e548375e621917ba50c50f47ca099 100644 (file)
--- a/kde-apps/kalzium/kalzium-17.04.3.ebuild
+++ b/kde-apps/kalzium/kalzium-17.04.3.ebuild
@@ -43,6 +43,8 @@ RDEPEND="${DEPEND}
        sci-chemistry/chemical-mime-data
 "
 
+PATCHES=( "${FILESDIR}/${P}-ocaml404.patch" ) # bug 603050
+
 src_configure(){
        # Fix missing finite()
        [[ ${CHOST} == *-solaris* ]] && append-cppflags -DHAVE_IEEEFP_H