Ticket #17618: libqalculate-0.9.6_macports.patch

libqalculate-0.9.

@@ -91 +91 @@
 
 AC_LANG([C++])
 
-AC_PATH_CLN(1.1.0, [
-        LIBS="$LIBS $CLN_LIBS"
-        CPPFLAGS="$CPPFLAGS $CLN_CPPFLAGS"
-        AC_DEFINE(HAVE_LIBCLN,1,[If CLN can be used])
-], AC_MSG_ERROR([No suitable installed version of CLN could be found.]))
-
-
 PKG_CHECK_MODULES(GLIB, [
         glib-2.0
         libxml-2.0 >= 2.3.8
@@ -105 +98 @@
 AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)
 
+PKG_CHECK_MODULES(CLN, [ cln >= 1.2 ],
+                  [have_recent_cln=yes], [have_recent_cln=no])
+AC_SUBST(CLN_CPPFLAGS)
+AC_SUBST(CLN_LIBS)
+
+if test "$have_recent_cln" = "yes" ; then
+   AC_DEFINE(HAVE_RECENT_CLN, 1, [Define if CLN can be used])
+   LIBS="$LIBS $CLN_LIBS"
+   CPPFLAGS="$CPPFLAGS $CLN_CPPFLAGS"
+fi
+
 dnl  --------------------------------
 dnl | check for readline            |-----------------------------------------
 dnl  --------------------------------

libqalculate/Calculator.cc

@@ -33 +33 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <dirent.h>
-#include <wait.h>
+#include <sys/wait.h>
 #include <queue>
 #include <glib.h>
 //#include <dlfcn.h>

libqalculate/Number.cc

@@ -28 +28 @@
 
 using namespace cln;
 
+/*
 void cln::cl_abort() {
         CALCULATOR->error(true, "CLN Error: see terminal output (probably too large or small floating point number)", NULL);
         if(CALCULATOR->busy()) {
@@ -36 +37 @@
                 exit(0);
         }
 }
-
+*/
 string printCL_I(cl_I integ, int base = 10, bool display_sign = true, BaseDisplay base_display = BASE_DISPLAY_NORMAL, bool lower_case = false) {
         if(base == BASE_ROMAN_NUMERALS) {
                 if(!zerop(integ) && integ < 10000 && integ > -10000) {

libqalculate-0.9.

@@ -16 +16 @@
 #include <time.h>
 #include <pthread.h>
 #include <dirent.h>
-#include <malloc.h>
+#include <malloc/malloc.h>
 #include <stdio.h>
 #include <vector>
 #include <glib.h>