File fix_gnumeric_1.12.42_GnmFuncDescriptor_ABI_brea... of Package gnome-chemistry-utils

Overview Repositories Revisions Requests Users Attributes Meta

File fix_gnumeric_1.12.42_GnmFuncDescriptor_ABI_break.patch of Package gnome-chemistry-utils

--- a/gnumeric/functions.cc_orig	2019-11-05 21:28:29.435899186 +0100
+++ b/gnumeric/functions.cc	2019-11-05 21:36:37.238307548 +0100
@@ -25,6 +25,7 @@
 #include <gcu/formula.h>
 #include <gcu/value.h>
 #include <gnumeric.h>
+#include <gnumeric-features.h>
 #include <func.h>
 #include <gnm-plugin.h>
 #include <mathfunc.h>
@@ -192,26 +193,33 @@
 	return (symbol)? value_new_string (symbol): value_new_error_std (ei->pos, GNM_ERROR_VALUE);
 }
 
+#if GNM_VERSION_MAJOR > 12 || GNM_VERSION_MINOR >= 42
+/* Gnumeric 1.12.42 broke GnmFuncDescriptor ABI, GnmFuncLink and GnmFuncUsageNotify members were dropped */
+#define GFD_LINK_NOTIFY_INIT(x, y)
+#else
+#define GFD_LINK_NOTIFY_INIT(x, y) x, y,
+#endif
+
 const GnmFuncDescriptor Chemistry_functions[] = {
 
         { N_("molarmass"),       "s",
-			help_molarmass, gnumeric_molarmass, NULL, NULL, NULL,
+			help_molarmass, gnumeric_molarmass, NULL, GFD_LINK_NOTIFY_INIT(NULL, 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, GFD_LINK_NOTIFY_INIT(NULL, 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, GFD_LINK_NOTIFY_INIT(NULL, 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, GFD_LINK_NOTIFY_INIT(NULL, 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, GFD_LINK_NOTIFY_INIT(NULL, 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, GFD_LINK_NOTIFY_INIT(NULL, NULL)
 			GNM_FUNC_IS_PLACEHOLDER,  GNM_FUNC_IMPL_STATUS_UNIMPLEMENTED, GNM_FUNC_TEST_STATUS_NO_TESTSUITE}
 };

Places

File fix_gnumeric_1.12.42_GnmFuncDescriptor_ABI_break.patch of Package gnome-chemistry-utils

Places