[gentoo-commits] proj/kde:master commit in: kde-apps/kalzium/files/, kde-apps/kalzium/

[gentoo-commits] proj/kde:master commit in: kde-apps/kalzium/files/, kde-apps/kalzium/

[Andreas Sturmlechner]

commit:     32d4b9449d4fa47cc1dd0a3cb75d77bc990071e5
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Apr  8 01:02:28 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Apr  8 01:02:28 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=32d4b944

kde-apps/kalzium: Fix build with USE=editor, fix DEPENDs

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 .../files/kalzium-18.03.90-missing-header.patch    | 24 ++++++++++++++++++++++
 kde-apps/kalzium/kalzium-18.03.90.ebuild           |  3 +++
 kde-apps/kalzium/kalzium-18.04.49.9999.ebuild      |  1 +
 kde-apps/kalzium/kalzium-9999.ebuild               |  1 +
 4 files changed, 29 insertions(+)

diff --git a/kde-apps/kalzium/files/kalzium-18.03.90-missing-header.patch b/kde-apps/kalzium/files/kalzium-18.03.90-missing-header.patch
new file mode 100644
index 0000000000..8d1eee5720
--- /dev/null
+++ b/kde-apps/kalzium/files/kalzium-18.03.90-missing-header.patch
@@ -0,0 +1,24 @@
+From a56c48890a21f0d9556474e3edae9c11be898243 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Sun, 8 Apr 2018 02:35:14 +0200
+Subject: [PATCH] Add missing header when building with AvogadroLibs support
+
+---
+ src/kalzium.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/kalzium.cpp b/src/kalzium.cpp
+index d7c9b4c6..4636308c 100644
+--- a/src/kalzium.cpp
++++ b/src/kalzium.cpp
+@@ -42,6 +42,7 @@
+ #ifdef HAVE_OPENBABEL2
+ #if defined(HAVE_EIGEN) && defined(HAVE_AVOGADRO)
+ #include "tools/moleculeview.h"
++#include <QGLFormat>
+ #endif
+ #include "tools/obconverter.h"
+ #endif
+-- 
+2.17.0
+

diff --git a/kde-apps/kalzium/kalzium-18.03.90.ebuild b/kde-apps/kalzium/kalzium-18.03.90.ebuild
index 18d7618887..17bbb2a991 100644
--- a/kde-apps/kalzium/kalzium-18.03.90.ebuild
+++ b/kde-apps/kalzium/kalzium-18.03.90.ebuild
@@ -32,6 +32,7 @@ DEPEND="
 	$(add_qt_dep qtwidgets)
 	$(add_qt_dep qtxml)
 	editor? (
+		$(add_qt_dep qtopengl)
 		$(add_frameworks_dep knewstuff)
 		dev-cpp/eigen:3
 		sci-chemistry/openbabel
@@ -43,6 +44,8 @@ RDEPEND="${DEPEND}
 	sci-chemistry/chemical-mime-data
 "
 
+PATCHES=( "${FILESDIR}/${P}-missing-header.patch" )
+
 src_configure(){
 	# Fix missing finite()
 	[[ ${CHOST} == *-solaris* ]] && append-cppflags -DHAVE_IEEEFP_H

diff --git a/kde-apps/kalzium/kalzium-18.04.49.9999.ebuild b/kde-apps/kalzium/kalzium-18.04.49.9999.ebuild
index 06a1e39dc7..3d6301a922 100644
--- a/kde-apps/kalzium/kalzium-18.04.49.9999.ebuild
+++ b/kde-apps/kalzium/kalzium-18.04.49.9999.ebuild
@@ -32,6 +32,7 @@ DEPEND="
 	$(add_qt_dep qtwidgets)
 	$(add_qt_dep qtxml)
 	editor? (
+		$(add_qt_dep qtopengl)
 		$(add_frameworks_dep knewstuff)
 		dev-cpp/eigen:3
 		sci-chemistry/openbabel

diff --git a/kde-apps/kalzium/kalzium-9999.ebuild b/kde-apps/kalzium/kalzium-9999.ebuild
index 06a1e39dc7..3d6301a922 100644
--- a/kde-apps/kalzium/kalzium-9999.ebuild
+++ b/kde-apps/kalzium/kalzium-9999.ebuild
@@ -32,6 +32,7 @@ DEPEND="
 	$(add_qt_dep qtwidgets)
 	$(add_qt_dep qtxml)
 	editor? (
+		$(add_qt_dep qtopengl)
 		$(add_frameworks_dep knewstuff)
 		dev-cpp/eigen:3
 		sci-chemistry/openbabel