<pre style='margin:0'>
Frank Schima (mf2k) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f4c8567d96f0e4678c83b0fd225f90dd80989761">https://github.com/macports/macports-ports/commit/f4c8567d96f0e4678c83b0fd225f90dd80989761</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new f4c8567d96f gcal: Update to 4.1; Fix for Big Sur and Apple Silicon
</span>f4c8567d96f is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f4c8567d96f0e4678c83b0fd225f90dd80989761
</span>Author: Mark Berger <mark.berger@mhb.nz>
AuthorDate: Fri Jan 22 10:21:27 2021 +1300
<span style='display:block; white-space:pre;color:#404040;'> gcal: Update to 4.1; Fix for Big Sur and Apple Silicon
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/62041
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes implicit function definition by ensuring that sys/ioctl is
</span><span style='display:block; white-space:pre;color:#404040;'> included.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes a trap when running Big Sur. Added patch that oleg-derevenetz had
</span><span style='display:block; white-space:pre;color:#404040;'> accepted upstream, but from which we are unlikely to get a release build
</span><span style='display:block; white-space:pre;color:#404040;'> anytime soon.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Upstream patch can be seen at
</span><span style='display:block; white-space:pre;color:#404040;'> https://git.savannah.gnu.org/cgit/gcal.git/commit/?id=a9d49b3e6535ebf2b5a0b4051e95bb5dc0c27fdb
</span>---
science/gcal/Portfile | 10 +++++++---
science/gcal/files/patch-fix-segfault.diff | 11 +++++++++++
science/gcal/files/patch-ioctl-implicit-declaration-fix.diff | 11 +++++++++++
3 files changed, 29 insertions(+), 3 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gcal/Portfile b/science/gcal/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 43f0a2ae6c9..7680d9147a9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gcal/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gcal/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span> PortSystem 1.0
name gcal
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.6.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 4.1
</span> categories science
license GPL-3+
maintainers gmail.com:j.hafey openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,7 +21,11 @@ long_description \
</span> homepage https://www.gnu.org/software/gcal/
master_sites gnu
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 9474081c5c0ce6da55c8540076c39e4107fe8be2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 6742913a1d011ac109ad713ef4a8263eaf4c5cfd315471626a92f094e3e4b31b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 8283119af8e6c6c45ff36500e59a30e141c977a5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 91b56c40b93eee9bda27ec63e95a6316d848e3ee047b5880ed71e5e8e60f61ab \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1658948
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-ioctl-implicit-declaration-fix.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-fix-segfault.diff
</span>
depends_lib port:gettext
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gcal/files/patch-fix-segfault.diff b/science/gcal/files/patch-fix-segfault.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..111197430ca
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gcal/files/patch-fix-segfault.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/utils.c.orig 2020-11-27 23:18:52.000000000 +1300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/utils.c 2020-12-05 00:12:49.000000000 +1300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1354,7 +1354,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ len = (int) strlen (s) - 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- mayname = (char *) my_malloc (len,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mayname = (char *) my_malloc (len + 2,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ERR_NO_MEMORY_AVAILABLE,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ __FILE__, ((long) __LINE__) - 2L,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "mayname", 0);
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gcal/files/patch-ioctl-implicit-declaration-fix.diff b/science/gcal/files/patch-ioctl-implicit-declaration-fix.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..b56949c0286
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gcal/files/patch-ioctl-implicit-declaration-fix.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/tty.c.orig 2020-11-27 23:18:52.000000000 +1300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/tty.c 2021-01-21 23:47:04.000000000 +1300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -39,7 +39,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # if defined(UNIX) && !defined(DJG)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # if HAVE_TERMIOS_H && HAVE_TERMIOS_FUNCS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # include <termios.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# if HAVE_SYS_IOCTL_H && !defined(TIOCGWINSZ)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# if HAVE_SYS_IOCTL_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # include <sys/ioctl.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # else /* !HAVE_TERMIOS_H || !HAVE_TERMIOS_FUNCS */
</span></pre><pre style='margin:0'>
</pre>