summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--kde-apps/kalzium/files/kalzium-21.03.90-cmake.patch28
-rw-r--r--kde-apps/kalzium/kalzium-9999.ebuild5
2 files changed, 32 insertions, 1 deletions
diff --git a/kde-apps/kalzium/files/kalzium-21.03.90-cmake.patch b/kde-apps/kalzium/files/kalzium-21.03.90-cmake.patch
new file mode 100644
index 00000000000..4339fbf0ce1
--- /dev/null
+++ b/kde-apps/kalzium/files/kalzium-21.03.90-cmake.patch
@@ -0,0 +1,28 @@
+From 137a209512e632ccc7b297355a6b54301657c9ff Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Mon, 12 Apr 2021 00:02:48 +0200
+Subject: [PATCH] Drop brackets around OpenBabel3_FOUND
+
+It breaks when cmake is run with -DCMAKE_DISABLE_FIND_PACKAGE_OpenBabel3=ON.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index abc8120b..a370e5da 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -27,7 +27,7 @@ find_package(Gettext REQUIRED)
+ find_package(PythonInterp REQUIRED)
+ find_package(PkgConfig)
+ find_package(OpenBabel3 3.1)
+-if(NOT ${OpenBabel3_FOUND})
++if(NOT OpenBabel3_FOUND)
+ find_package(OpenBabel2)
+ endif()
+ find_package(AvogadroLibs)
+--
+2.31.1
+
diff --git a/kde-apps/kalzium/kalzium-9999.ebuild b/kde-apps/kalzium/kalzium-9999.ebuild
index 21fe0cb0392..598c5eb5570 100644
--- a/kde-apps/kalzium/kalzium-9999.ebuild
+++ b/kde-apps/kalzium/kalzium-9999.ebuild
@@ -39,7 +39,7 @@ DEPEND="
dev-cpp/eigen:3
>=dev-qt/qtopengl-${QTMIN}:5
>=kde-frameworks/knewstuff-${KFMIN}:5
- sci-chemistry/openbabel
+ sci-chemistry/openbabel:=
>=sci-libs/avogadrolibs-1.93[qt5]
)
solver? ( dev-ml/facile[ocamlopt] )
@@ -48,11 +48,14 @@ RDEPEND="${DEPEND}
sci-chemistry/chemical-mime-data
"
+PATCHES=( "${FILESDIR}/${PN}-21.03.90-cmake.patch" )
+
src_configure(){
# Fix missing finite()
[[ ${CHOST} == *-solaris* ]] && append-cppflags -DHAVE_IEEEFP_H
local mycmakeargs=(
+ -DCMAKE_DISABLE_FIND_PACKAGE_OpenBabel3=ON # TODO: not packaged yet
$(cmake_use_find_package editor Eigen3)
$(cmake_use_find_package editor AvogadroLibs)
$(cmake_use_find_package editor OpenBabel2)