commit 0be96ccedb7e2fd8c1972a31f102945bce0b7b19
Author: Jan Rękorajski <[email protected]>
Date: Sun Jul 2 16:42:21 2017 +0200
- build fixes from fedora
kalzium-eigen2.patch | 103 +++++++++++++++++++++++++++++++++++++++++++++++++++
kalzium-ocaml.patch | 12 ++++++
kde4-kalzium.spec | 4 ++
3 files changed, 119 insertions(+)
---
diff --git a/kde4-kalzium.spec b/kde4-kalzium.spec
index cdbf13c..dca2e0a 100644
--- a/kde4-kalzium.spec
+++ b/kde4-kalzium.spec
@@ -10,6 +10,8 @@ License: GPL
Group: X11/Applications/Science
Source0:
http://download.kde.org/%{_state}/%{version}/src/%{orgname}-%{version}.tar.xz
# Source0-md5: f773692c7e58567a27d8129f0cc39d5c
+Patch0: kalzium-eigen2.patch
+Patch1: kalzium-ocaml.patch
URL: http://www.kde.org/
BuildRequires: avogadro-devel
BuildRequires: boost-python-devel
@@ -49,6 +51,8 @@ Pliki dla programistów kalzium.
%prep
%setup -q -n %{orgname}-%{version}
+%patch0 -p1
+%patch1 -p1
%build
install -d build
diff --git a/kalzium-eigen2.patch b/kalzium-eigen2.patch
new file mode 100644
index 0000000..cb83388
--- /dev/null
+++ b/kalzium-eigen2.patch
@@ -0,0 +1,103 @@
+diff -rupN kalzium-16.08.3/CMakeLists.txt kalzium-16.08.3-new/CMakeLists.txt
+--- kalzium-16.08.3/CMakeLists.txt 2016-12-22 11:12:40.135985025 +0100
++++ kalzium-16.08.3-new/CMakeLists.txt 2016-12-22 11:12:50.983986130 +0100
+@@ -35,7 +35,7 @@ kde4_no_enable_final(kalzium)
+
+ include(KalziumConfigureChecks.cmake)
+
+-if (OPENBABEL2_FOUND AND Avogadro_FOUND AND EIGEN3_FOUND)
++if (OPENBABEL2_FOUND AND Avogadro_FOUND AND EIGEN2_FOUND)
+ # avoid compilerwarnings about redefinitions
+ # todo: use check_function_exits() ?
+ message(STATUS "Kalzium molecular editor enabled")
+@@ -43,9 +43,9 @@ if (OPENBABEL2_FOUND AND Avogadro_FOUND
+ add_definitions(-DHAVE_SNPRINTF -DHAVE_STRCASECMP -DHAVE_STRNCASECMP)
+ endif (WIN32)
+ add_subdirectory(compoundviewer)
+-else (OPENBABEL2_FOUND AND Avogadro_FOUND AND EIGEN3_FOUND)
++else (OPENBABEL2_FOUND AND Avogadro_FOUND AND EIGEN2_FOUND)
+ message(STATUS "Kalzium molecular editor disabled")
+-endif (OPENBABEL2_FOUND AND Avogadro_FOUND AND EIGEN3_FOUND)
++endif (OPENBABEL2_FOUND AND Avogadro_FOUND AND EIGEN2_FOUND)
+
+ add_subdirectory(doc)
+ add_subdirectory(src)
+diff -rupN kalzium-16.08.3/compoundviewer/CMakeLists.txt
kalzium-16.08.3-new/compoundviewer/CMakeLists.txt
+--- kalzium-16.08.3/compoundviewer/CMakeLists.txt 2016-10-16
06:54:22.000000000 +0200
++++ kalzium-16.08.3-new/compoundviewer/CMakeLists.txt 2016-12-22
11:52:39.805923124 +0100
+@@ -2,7 +2,7 @@ include(${Avogadro_USE_FILE})
+
+ include_directories(
+ ${CMAKE_CURRENT_BINARY_DIR}/..
+- ${EIGEN3_INCLUDE_DIR}
++ ${EIGEN2_INCLUDE_DIRS}
+ ${OPENBABEL2_INCLUDE_DIR}
+ )
+
+diff -rupN kalzium-16.08.3/KalziumConfigureChecks.cmake
kalzium-16.08.3-new/KalziumConfigureChecks.cmake
+--- kalzium-16.08.3/KalziumConfigureChecks.cmake 2016-10-16
06:54:22.000000000 +0200
++++ kalzium-16.08.3-new/KalziumConfigureChecks.cmake 2016-12-22
11:37:37.017177818 +0100
+@@ -4,17 +4,17 @@ include(CheckFunctionExists)
+ macro_optional_find_package(OCaml)
+ macro_optional_find_package(Libfacile)
+ macro_optional_find_package(OpenBabel2)
+-macro_optional_find_package(Eigen3)
+ macro_optional_find_package(Avogadro 1.0.0 NO_MODULE)
+
+ find_package(PkgConfig)
+ pkg_check_modules(CHEMICAL_MIME_DATA chemical-mime-data)
++pkg_check_modules(EIGEN2 eigen2)
+
+ check_include_files(ieeefp.h HAVE_IEEEFP_H)
+
+ macro_bool_to_01(LIBFACILE_FOUND HAVE_FACILE)
+ macro_bool_to_01(OPENBABEL2_FOUND HAVE_OPENBABEL2)
+-macro_bool_to_01(EIGEN3_FOUND HAVE_EIGEN)
++macro_bool_to_01(EIGEN2_FOUND HAVE_EIGEN)
+ macro_bool_to_01(Avogadro_FOUND HAVE_AVOGADRO)
+
+ # at the end, output the configuration
+@@ -26,7 +26,7 @@ configure_file(
+ macro_log_feature(OCAML_FOUND "OCaml" "OCaml is needed by Kalzium for the
Equation Solver" "http://caml.inria.fr/"; FALSE "" "")
+ macro_log_feature(LIBFACILE_FOUND "LibFacile" "libfacile is needed by Kalzium
for the Equation Solver." "http://www.recherche.enac.fr/log/facile/"; FALSE ""
"")
+ macro_log_feature(OPENBABEL2_FOUND "OpenBabel2" "OpenBabel is needed by
Kalzium for the 3D-molecule viewer" "http://openbabel.sourceforge.net/"; FALSE
"2.2" "")
+-macro_log_feature(EIGEN3_FOUND "Eigen3" "A generic C++ template library for
dense and sparse matrices" "http://eigen.tuxfamily.org"; FALSE "3.0.0" "")
++macro_log_feature(EIGEN2_FOUND "Eigen2" "A generic C++ template library for
dense and sparse matrices" "http://eigen.tuxfamily.org"; FALSE "2.0.0" "")
+ macro_log_feature(Avogadro_FOUND "Avogadro" "Advanced molecular editor"
"http://avogadro.openmolecules.net"; FALSE "1.0" "")
+ macro_log_feature(CHEMICAL_MIME_DATA_FOUND "Chemical mime data" "Needed to
open CML molecules from the file manager"
"http://chemical-mime.sourceforge.net/"; FALSE "" "")
+
+diff -rupN kalzium-16.08.3/src/CMakeLists.txt
kalzium-16.08.3-new/src/CMakeLists.txt
+--- kalzium-16.08.3/src/CMakeLists.txt 2016-10-16 06:54:22.000000000 +0200
++++ kalzium-16.08.3-new/src/CMakeLists.txt 2016-12-22 11:12:50.985986130
+0100
+@@ -23,7 +23,7 @@ if (OPENBABEL2_FOUND)
+ )
+ include_directories(${OPENBABEL2_INCLUDE_DIR})
+
+- if (EIGEN3_FOUND AND Avogadro_FOUND)
++ if (EIGEN2_FOUND AND Avogadro_FOUND)
+
+ include(${Avogadro_USE_FILE})
+
+@@ -35,8 +35,8 @@ if (OPENBABEL2_FOUND)
+ kde4_add_ui_files(kalziumtools_SRCS
+ tools/moleculeviewerwidget.ui
+ )
+- include_directories(${EIGEN3_INCLUDE_DIR})
+- endif (EIGEN3_FOUND AND Avogadro_FOUND)
++ include_directories(${EIGEN2_INCLUDE_DIRS})
++ endif (EIGEN2_FOUND AND Avogadro_FOUND)
+ endif (OPENBABEL2_FOUND)
+
+ ## Kalzium calculator files
+@@ -137,9 +137,9 @@ target_link_libraries(kalzium ${KDE4_KHT
+
+ if (OPENBABEL2_FOUND)
+ target_link_libraries(kalzium ${OPENBABEL2_LIBRARIES})
+- if (EIGEN3_FOUND AND Avogadro_FOUND)
++ if (EIGEN2_FOUND AND Avogadro_FOUND)
+ target_link_libraries(kalzium ${QT_QTOPENGL_LIBRARY} compoundviewer
avogadro)
+- endif (EIGEN3_FOUND AND Avogadro_FOUND)
++ endif (EIGEN2_FOUND AND Avogadro_FOUND)
+ endif (OPENBABEL2_FOUND)
+
+ if (LIBFACILE_FOUND)
diff --git a/kalzium-ocaml.patch b/kalzium-ocaml.patch
new file mode 100644
index 0000000..9528d4c
--- /dev/null
+++ b/kalzium-ocaml.patch
@@ -0,0 +1,12 @@
+diff -up kalzium-16.12.2/src/CMakeOCamlInstructions.cmake.than
kalzium-16.12.2/src/CMakeOCamlInstructions.cmake
+--- kalzium-16.12.2/src/CMakeOCamlInstructions.cmake.than 2017-02-27
20:56:47.075109342 +0100
++++ kalzium-16.12.2/src/CMakeOCamlInstructions.cmake 2017-02-27
20:57:06.802362342 +0100
+@@ -58,7 +58,7 @@ ocaml_ml_to_cmx(${CMAKE_CURRENT_BINARY_D
+ # 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
${CMAKE_CURRENT_BINARY_DIR}/modwrap.o
+ 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)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kde4-kalzium.git/commitdiff/0be96ccedb7e2fd8c1972a31f102945bce0b7b19
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
