calcurse: update to 4.7.0

packages/calcurse/build.sh

@@ -1,10 +1,9 @@
 TERMUX_PKG_HOMEPAGE=https://calcurse.org/
 TERMUX_PKG_DESCRIPTION="calcurse is a calendar and scheduling application for the command line"
 TERMUX_PKG_LICENSE="BSD 2-Clause"
-TERMUX_PKG_VERSION=4.6.0
-TERMUX_PKG_REVISION=2
+TERMUX_PKG_VERSION=4.7.0
 TERMUX_PKG_SRCURL=https://calcurse.org/files/calcurse-$TERMUX_PKG_VERSION.tar.gz
-TERMUX_PKG_SHA256=fa090307a157e24e790819b20c93e037b89c6132f473abaaa7b21c3be76df043
+TERMUX_PKG_SHA256=ef6675966a53f41196006ce624ece222fe400da0563f4fed1ae0272ad45c8435
 TERMUX_PKG_DEPENDS="libandroid-support, ncurses"
 
 termux_step_pre_configure() {

packages/calcurse/threading.patch

@@ -1,6 +1,5 @@
-diff -uNr calcurse-4.6.0/src/io.c calcurse-4.6.0.mod/src/io.c
---- calcurse-4.6.0/src/io.c	2020-03-27 15:14:07.000000000 +0200
-+++ calcurse-4.6.0.mod/src/io.c	2020-10-01 20:39:41.632326755 +0300
+--- ./src/io.c.orig	2020-10-12 17:18:02.000000000 +0200
++++ ./src/io.c	2020-10-18 10:34:54.061491515 +0200
 @@ -44,6 +44,7 @@
  #include <math.h>
  #include <unistd.h>
@@ -18,7 +17,7 @@ diff -uNr calcurse-4.6.0/src/io.c calcurse-4.6.0.mod/src/io.c
  /* Ask user for a file name to export data to. */
  static FILE *get_export_stream(enum export_type type)
  {
-@@ -1455,12 +1458,15 @@
+@@ -1453,13 +1456,16 @@
  /* Thread used to periodically save data. */
  static void *io_psave_thread(void *arg)
  {
@@ -26,7 +25,8 @@ diff -uNr calcurse-4.6.0/src/io.c calcurse-4.6.0.mod/src/io.c
 +
  	int delay = conf.periodic_save;
  	EXIT_IF(delay < 0, _("Invalid delay"));
- 	char *mesg = _("Periodic save: data files have changed. Save cancelled.");
+ 	char *mesg = _("Periodic save cancelled. Data files have changed. "
+ 		     "Save and merge interactively");
  
 -	pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL);
  	for (;;) {
@@ -35,7 +35,7 @@ diff -uNr calcurse-4.6.0/src/io.c calcurse-4.6.0.mod/src/io.c
  		sleep(delay * MININSEC);
  		pthread_mutex_lock(&io_periodic_save_mutex);
  		if (io_save_cal(periodic) == IO_SAVE_CANCEL)
-@@ -1484,8 +1490,7 @@
+@@ -1483,8 +1489,7 @@
  
  	/* Lock the mutex to avoid cancelling the thread during saving. */
  	pthread_mutex_lock(&io_periodic_save_mutex);