Update to calc 2.12.7.1 and 2.12.7.2

Calc 2.12.6.10 changed arguments of qprintnum().

Author: timocp

.travis.yml

@@ -10,8 +10,8 @@ rvm:
   - 2.6.0
   - 2.7.0
 env:
-  - CALC_VERSION=2.12.5.6
-  - CALC_VERSION=2.12.6.3
+  - CALC_VERSION=2.12.7.1
+  - CALC_VERSION=2.12.7.2
 before_install:
   - gem install bundler     # travis ruby 2.0.0 installs bundler 1.7, update it
   - bin/install_calc.sh

bin/install_calc.sh

@@ -1,16 +1,17 @@
 #! /bin/sh
 # installs calc into /usr/local
 
+set -e
 set -x
 
-version=calc-${CALC_VERSION-2.12.6.0}
+version=calc-${CALC_VERSION-2.12.7.1}
 patch=$PWD/$(dirname $0)/makefile.patch
 
 cd /tmp
 wget -nv http://www.isthe.com/chongo/src/calc/${version}.tar.bz2
 tar xjf ${version}.tar.bz2
 cd $version
-patch -p0 < $patch
+patch -t -p0 < $patch
 if [ "$CI" = "true" ]; then
     make && sudo make install
 else

bin/makefile.patch

@@ -1,28 +1,39 @@
---- Makefile.orig	2015-11-06 17:52:22.984273873 +1030
-+++ Makefile	2015-11-06 18:00:02.632273873 +1030
-@@ -610,25 +610,25 @@
- #	LIBDIR= /usr/lib
- #	CALC_SHAREDIR= /usr/share/calc
- #
+--- Makefile.orig	2018-11-06 02:05:46.000000000 +1030
++++ Makefile	2020-05-04 21:06:06.000000000 +0930
+@@ -644,8 +644,8 @@
+ #endif	/* end of skip for non-Gnu makefiles */
+ 
+ # default BINDIR for non-macOS
+-BINDIR= /usr/bin
 -#BINDIR= /usr/local/bin
++#BINDIR= /usr/bin
 +BINDIR= /usr/local/bin
  #BINDIR= /dev/env/DJDIR/bin
--BINDIR= /usr/bin
-+#BINDIR= /usr/bin
 
+ #if 0	/* start of skip for non-Gnu makefiles */
+@@ -660,8 +660,8 @@
+ #endif	/* end of skip for non-Gnu makefiles */
+ 
+ # default LIBDIR for non-macOS
+-LIBDIR= /usr/lib
 -#LIBDIR= /usr/local/lib
++#LIBDIR= /usr/lib
 +LIBDIR= /usr/local/lib
  #LIBDIR= /dev/env/DJDIR/lib
--LIBDIR= /usr/lib
-+#LIBDIR= /usr/lib
 
+ #if 0	/* start of skip for non-Gnu makefiles */
+@@ -676,8 +676,8 @@
+ #endif	/* end of skip for non-Gnu makefiles */
+ 
+ # default CALC_SHAREDIR for non-macOS
+-CALC_SHAREDIR= /usr/share/calc
 -#CALC_SHAREDIR= /usr/local/lib/calc
++#CALC_SHAREDIR= /usr/share/calc
 +CALC_SHAREDIR= /usr/local/lib/calc
  #CALC_SHAREDIR= /dev/env/DJDIR/share/calc
--CALC_SHAREDIR= /usr/share/calc
-+#CALC_SHAREDIR= /usr/share/calc
 
- # NOTE: Do not set CALC_INCDIR to /usr/include or /usr/local/include!!!
+ #if 0	/* start of skip for non-Gnu makefiles */
+@@ -688,9 +688,9 @@
  #	Always be sure that the CALC_INCDIR path ends in /calc to avoid
  #	conflicts with system or other application include files!!!
  #
@@ -34,7 +45,7 @@
 
  # By default, these values are based CALC_SHAREDIR, INCDIR, BINDIR
  # ---------------------------------------------------------------
-@@ -696,9 +696,9 @@
+@@ -758,9 +758,9 @@
  # Use MANDIR= to disable installation of the calc man (source) page.
  #
  #MANDIR=

ext/calc/q.c

@@ -2592,10 +2592,10 @@ cq_to_s(int argc, VALUE * argv, VALUE self)
     else {
         math_divertio();
         if (args == 0) {
-            qprintnum(qself, MODE_DEFAULT);
+            qprintnum(qself, MODE_DEFAULT, conf->outdigits);
         }
         else {
-            qprintnum(qself, (int) value_to_mode(mode));
+            qprintnum(qself, (int) value_to_mode(mode), conf->outdigits);
         }
         s = math_getdivertedio();
         rs = rb_str_new2(s);