From f2c76185f96d0a0fb66d22358be3d2e5959c801e Mon Sep 17 00:00:00 2001 From: belegdol Date: Tue, 14 Aug 2018 05:52:50 +0000 Subject: [PATCH] 2018-08-14 Julian Sikorski * configure.ac: bump libspreadsheet requirement to 1.12.42. * gnumeric/functions.cc: fix building with libspreadsheet-1.12.42. [#54500] git-svn-id: svn://svn.savannah.nongnu.org/gchemutils/trunk@2072 3bee7d65-92bb-4e32-a543-2903a55c889b --- gchemutils/ChangeLog | 4 ++++ gchemutils/configure.ac | 2 +- gchemutils/gnumeric/functions.cc | 12 ++++++------ 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/gchemutils/ChangeLog b/gchemutils/ChangeLog index be65dbdc..2b9acbab 100644 --- a/gchemutils/ChangeLog +++ b/gchemutils/ChangeLog @@ -1,5 +1,9 @@ ##Text encoding: utf-8 +2018-08-14 Julian Sikorski + * configure.ac: bump libspreadsheet requirement to 1.12.42. + * gnumeric/functions.cc: fix building with libspreadsheet-1.12.42. [#54500] + 2018-01-24 Jean Breéfort * docs/help/3d/gchem3d.omf.in: fix licenses versions. [#52882] * docs/help/calc/gchemcalc.omf.in: ditto. diff --git a/gchemutils/configure.ac b/gchemutils/configure.ac index e265fc51..5e8c8e74 100644 --- a/gchemutils/configure.ac +++ b/gchemutils/configure.ac @@ -319,7 +319,7 @@ if test "x$libspreadsheet" = x; then libspreadsheet=libspreadsheet-1.12 fi -PKG_CHECK_MODULES(gnumeric, [$libspreadsheet >= 1.11.6], [build_gnumeric_plugin=yes], +PKG_CHECK_MODULES(gnumeric, [$libspreadsheet >= 1.12.42], [build_gnumeric_plugin=yes], [build_gnumeric_plugin=no]) dnl --without is not handled diff --git a/gchemutils/gnumeric/functions.cc b/gchemutils/gnumeric/functions.cc index cba465b3..f171f9b5 100644 --- a/gchemutils/gnumeric/functions.cc +++ b/gchemutils/gnumeric/functions.cc @@ -195,23 +195,23 @@ gnumeric_elementsymbol (GnmFuncEvalInfo *ei, GnmValue const * const *argv) const GnmFuncDescriptor Chemistry_functions[] = { { N_("molarmass"), "s", - help_molarmass, gnumeric_molarmass, NULL, NULL, NULL, + help_molarmass, gnumeric_molarmass, NULL, GNM_FUNC_SIMPLE, GNM_FUNC_IMPL_STATUS_COMPLETE, GNM_FUNC_TEST_STATUS_NO_TESTSUITE}, { N_("monoisotopicmass"), "s", - help_monoisotopicmass, gnumeric_monoisotopicmass, NULL, NULL, NULL, + help_monoisotopicmass, gnumeric_monoisotopicmass, NULL, GNM_FUNC_SIMPLE, GNM_FUNC_IMPL_STATUS_COMPLETE, GNM_FUNC_TEST_STATUS_NO_TESTSUITE}, { N_("chemcomposition"), "ss", - help_chemcomposition, gnumeric_chemcomposition, NULL, NULL, NULL, + help_chemcomposition, gnumeric_chemcomposition, NULL, GNM_FUNC_SIMPLE, GNM_FUNC_IMPL_STATUS_COMPLETE, GNM_FUNC_TEST_STATUS_NO_TESTSUITE}, { N_("elementnumber"), "s", - help_elementnumber, gnumeric_elementnumber, NULL, NULL, NULL, + help_elementnumber, gnumeric_elementnumber, NULL, GNM_FUNC_SIMPLE, GNM_FUNC_IMPL_STATUS_COMPLETE, GNM_FUNC_TEST_STATUS_NO_TESTSUITE}, { N_("elementsymbol"), "f", - help_elementsymbol, gnumeric_elementsymbol, NULL, NULL, NULL, + help_elementsymbol, gnumeric_elementsymbol, NULL, GNM_FUNC_SIMPLE, GNM_FUNC_IMPL_STATUS_COMPLETE, GNM_FUNC_TEST_STATUS_NO_TESTSUITE}, - {NULL, NULL, NULL, NULL, NULL, NULL, NULL, + {NULL, NULL, NULL, NULL, NULL, GNM_FUNC_IS_PLACEHOLDER, GNM_FUNC_IMPL_STATUS_UNIMPLEMENTED, GNM_FUNC_TEST_STATUS_NO_TESTSUITE} }; -- 2.11.4.GIT