Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/kalzium/files/, kde-apps/kalzium/
Date: Sun, 08 Apr 2018 01:03:58
Message-Id: 1523149348.32d4b9449d4fa47cc1dd0a3cb75d77bc990071e5.asturm@gentoo
1 commit: 32d4b9449d4fa47cc1dd0a3cb75d77bc990071e5
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sun Apr 8 01:02:28 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sun Apr 8 01:02:28 2018 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=32d4b944
7
8 kde-apps/kalzium: Fix build with USE=editor, fix DEPENDs
9
10 Package-Manager: Portage-2.3.28, Repoman-2.3.9
11
12 .../files/kalzium-18.03.90-missing-header.patch | 24 ++++++++++++++++++++++
13 kde-apps/kalzium/kalzium-18.03.90.ebuild | 3 +++
14 kde-apps/kalzium/kalzium-18.04.49.9999.ebuild | 1 +
15 kde-apps/kalzium/kalzium-9999.ebuild | 1 +
16 4 files changed, 29 insertions(+)
17
18 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
19 new file mode 100644
20 index 0000000000..8d1eee5720
21 --- /dev/null
22 +++ b/kde-apps/kalzium/files/kalzium-18.03.90-missing-header.patch
23 @@ -0,0 +1,24 @@
24 +From a56c48890a21f0d9556474e3edae9c11be898243 Mon Sep 17 00:00:00 2001
25 +From: Andreas Sturmlechner <andreas.sturmlechner@×××××.com>
26 +Date: Sun, 8 Apr 2018 02:35:14 +0200
27 +Subject: [PATCH] Add missing header when building with AvogadroLibs support
28 +
29 +---
30 + src/kalzium.cpp | 1 +
31 + 1 file changed, 1 insertion(+)
32 +
33 +diff --git a/src/kalzium.cpp b/src/kalzium.cpp
34 +index d7c9b4c6..4636308c 100644
35 +--- a/src/kalzium.cpp
36 ++++ b/src/kalzium.cpp
37 +@@ -42,6 +42,7 @@
38 + #ifdef HAVE_OPENBABEL2
39 + #if defined(HAVE_EIGEN) && defined(HAVE_AVOGADRO)
40 + #include "tools/moleculeview.h"
41 ++#include <QGLFormat>
42 + #endif
43 + #include "tools/obconverter.h"
44 + #endif
45 +--
46 +2.17.0
47 +
48
49 diff --git a/kde-apps/kalzium/kalzium-18.03.90.ebuild b/kde-apps/kalzium/kalzium-18.03.90.ebuild
50 index 18d7618887..17bbb2a991 100644
51 --- a/kde-apps/kalzium/kalzium-18.03.90.ebuild
52 +++ b/kde-apps/kalzium/kalzium-18.03.90.ebuild
53 @@ -32,6 +32,7 @@ DEPEND="
54 $(add_qt_dep qtwidgets)
55 $(add_qt_dep qtxml)
56 editor? (
57 + $(add_qt_dep qtopengl)
58 $(add_frameworks_dep knewstuff)
59 dev-cpp/eigen:3
60 sci-chemistry/openbabel
61 @@ -43,6 +44,8 @@ RDEPEND="${DEPEND}
62 sci-chemistry/chemical-mime-data
63 "
64
65 +PATCHES=( "${FILESDIR}/${P}-missing-header.patch" )
66 +
67 src_configure(){
68 # Fix missing finite()
69 [[ ${CHOST} == *-solaris* ]] && append-cppflags -DHAVE_IEEEFP_H
70
71 diff --git a/kde-apps/kalzium/kalzium-18.04.49.9999.ebuild b/kde-apps/kalzium/kalzium-18.04.49.9999.ebuild
72 index 06a1e39dc7..3d6301a922 100644
73 --- a/kde-apps/kalzium/kalzium-18.04.49.9999.ebuild
74 +++ b/kde-apps/kalzium/kalzium-18.04.49.9999.ebuild
75 @@ -32,6 +32,7 @@ DEPEND="
76 $(add_qt_dep qtwidgets)
77 $(add_qt_dep qtxml)
78 editor? (
79 + $(add_qt_dep qtopengl)
80 $(add_frameworks_dep knewstuff)
81 dev-cpp/eigen:3
82 sci-chemistry/openbabel
83
84 diff --git a/kde-apps/kalzium/kalzium-9999.ebuild b/kde-apps/kalzium/kalzium-9999.ebuild
85 index 06a1e39dc7..3d6301a922 100644
86 --- a/kde-apps/kalzium/kalzium-9999.ebuild
87 +++ b/kde-apps/kalzium/kalzium-9999.ebuild
88 @@ -32,6 +32,7 @@ DEPEND="
89 $(add_qt_dep qtwidgets)
90 $(add_qt_dep qtxml)
91 editor? (
92 + $(add_qt_dep qtopengl)
93 $(add_frameworks_dep knewstuff)
94 dev-cpp/eigen:3
95 sci-chemistry/openbabel