1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
|
Description: Build against openbabel v3.0.0.
Author: Shimi Chen <shimi.chen@gmail.com>
diff -ruN a/configure b/configure
--- a/configure 2017-02-12 11:11:04.000000000 +0200
+++ b/configure 2020-04-08 11:49:03.521504889 +0300
@@ -19695,12 +19695,12 @@
pkg_cv_openbabel_CFLAGS="$openbabel_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openbabel-2.0 >= 2.3.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "openbabel-2.0 >= 2.3.0") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openbabel-3\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "openbabel-3") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_openbabel_CFLAGS=`$PKG_CONFIG --cflags "openbabel-2.0 >= 2.3.0" 2>/dev/null`
+ pkg_cv_openbabel_CFLAGS=`$PKG_CONFIG --cflags "openbabel-3" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -19712,12 +19712,12 @@
pkg_cv_openbabel_LIBS="$openbabel_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openbabel-2.0 >= 2.3.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "openbabel-2.0 >= 2.3.0") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openbabel-3\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "openbabel-3") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_openbabel_LIBS=`$PKG_CONFIG --libs "openbabel-2.0 >= 2.3.0" 2>/dev/null`
+ pkg_cv_openbabel_LIBS=`$PKG_CONFIG --libs "openbabel-3" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -19738,14 +19738,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- openbabel_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "openbabel-2.0 >= 2.3.0" 2>&1`
+ openbabel_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "openbabel-3" 2>&1`
else
- openbabel_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "openbabel-2.0 >= 2.3.0" 2>&1`
+ openbabel_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "openbabel-3" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$openbabel_PKG_ERRORS" >&5
- as_fn_error $? "Package requirements (openbabel-2.0 >= 2.3.0) were not met:
+ as_fn_error $? "Package requirements (openbabel-3) were not met:
$openbabel_PKG_ERRORS
diff -ruN a/configure.ac b/configure.ac
--- a/configure.ac 2017-02-12 11:10:15.000000000 +0200
+++ b/configure.ac 2020-04-08 11:49:42.597997094 +0300
@@ -193,7 +193,7 @@
PKG_CHECK_MODULES(goffice, [$libgoffice >= 0.10.12])
PKG_CHECK_MODULES(chemical_mime_data, [chemical-mime-data >= 0.1.94])
PKG_CHECK_MODULES(bodr, [bodr >= 5])
-PKG_CHECK_MODULES(openbabel, [openbabel-2.0 >= 2.3.0])
+PKG_CHECK_MODULES(openbabel, [openbabel-3])
PKG_CHECK_MODULES(x11, [x11 >= 1.0.0])
dnl Not sure we need to test for glu.h and glx.h
diff -ruN a/libs/gcu/spacegroup.h b/libs/gcu/spacegroup.h
--- a/libs/gcu/spacegroup.h 2017-02-12 11:10:09.000000000 +0200
+++ b/libs/gcu/spacegroup.h 2020-04-08 11:52:00.227382277 +0300
@@ -33,7 +33,7 @@
class Transform3d;
class Vector;
-/*!\class SpaceGroup spacegroup.h <openbabel/math/spacegroup.h>
+/*!\class SpaceGroup spacegroup.h <openbabel3/openbabel/math/spacegroup.h>
@brief Handle crystallographic space group symmetry
@since version 0.12
@sa transform3d
diff -ruN a/openbabel/socket.h b/openbabel/socket.h
--- a/openbabel/socket.h 2017-02-12 11:10:11.000000000 +0200
+++ b/openbabel/socket.h 2020-04-08 11:51:17.037575267 +0300
@@ -26,7 +26,7 @@
#define GCU_BABEL_SOCKET_H
#include <sys/socket.h>
-#include <openbabel/obconversion.h>
+#include <openbabel3/openbabel/obconversion.h>
#include <string>
class BabelSocket
diff -ruN a/plugins/loaders/cdx/cdx.cc b/plugins/loaders/cdx/cdx.cc
--- a/plugins/loaders/cdx/cdx.cc 2017-02-12 11:10:10.000000000 +0200
+++ b/plugins/loaders/cdx/cdx.cc 2020-04-08 11:50:31.441112292 +0300
@@ -45,7 +45,7 @@
#include <goffice/app/module-plugin-defs.h>
#include <gsf/gsf-output-memory.h>
#include <glib/gi18n-lib.h>
-#include <openbabel/chemdrawcdx.h>
+#include <openbabel3/openbabel/chemdrawcdx.h>
#include <map>
#include <string>
#include <vector>
|