<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/41a59d8749acc8dbb5f57b69cd58cae57446efb2">https://github.com/macports/macports-ports/commit/41a59d8749acc8dbb5f57b69cd58cae57446efb2</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 41a59d8749acc8dbb5f57b69cd58cae57446efb2
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Sat Jan 8 14:45:45 2022 -0600
<span style='display:block; white-space:pre;color:#404040;'> sunclock: Fix implicit declaration of function
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/64386
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also add size to checksums, move a reinplace to a patchfile, remove
</span><span style='display:block; white-space:pre;color:#404040;'> duplicate optflags from CFLAGS (configure.cflags already contains
</span><span style='display:block; white-space:pre;color:#404040;'> configure.optflags), and disable livecheck since there is no upstream
</span><span style='display:block; white-space:pre;color:#404040;'> anymore.
</span>---
x11/sunclock/Portfile | 18 ++++++++++--------
x11/sunclock/files/implicit.patch | 12 ++++++++++++
x11/sunclock/files/malloc.patch | 13 +++++++++++++
3 files changed, 35 insertions(+), 8 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/sunclock/Portfile b/x11/sunclock/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f92d6cfb241..1432067e187 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/sunclock/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/sunclock/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,6 +5,10 @@ PortSystem 1.0
</span> name sunclock
version 3.57
revision 1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 42ef99381405745bf2be13ad9c05c9f07e5ff1cd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 f3b3499b4a84c7a31411d2a9043e2d9171b745ec29a991ef9930ce582b9d41ab \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1571073
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> categories x11
maintainers nomaintainer
license GPL-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,20 +20,16 @@ long_description \
</span> display with the time updated every second and both the \
local time zone and UTC displayed.
homepage https://web.archive.org/web/20080821132523/http://www.arvernes.com/wiki/index.php/Sunclock
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span>
distname ${name}_${version}.orig
worksrcdir ${name}-${version}
master_sites debian:s/${name}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 42ef99381405745bf2be13ad9c05c9f07e5ff1cd \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 f3b3499b4a84c7a31411d2a9043e2d9171b745ec29a991ef9930ce582b9d41ab
</span>
depends_lib path:include/turbojpeg.h:libjpeg-turbo port:xpm port:zlib port:libpng port:xorg-libX11
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles gzFile.patch
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "/#include <malloc.h>/d" ${worksrcpath}/tildepath.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles gzFile.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ implicit.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ malloc.patch
</span>
use_configure no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,7 +52,7 @@ build.args \
</span> XAPPLOADDIR=/share/X11/app-defaults \
XBINDIR=/bin \
CC=${configure.cc} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS="[join ${configure.cflags}] [get_canonical_archflags] ${configure.optflags}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS="[join ${configure.cflags}] [get_canonical_archflags]" \
</span> LFLAGS="${configure.ldflags} [get_canonical_archflags]"
destroot {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -71,3 +71,5 @@ destroot {
</span> xinstall -d -m 755 ${destroot}${docdir}
xinstall -m 644 -W ${worksrcpath}/editkit MANUAL.emacs README ${destroot}${docdir}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.type none
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/sunclock/files/implicit.patch b/x11/sunclock/files/implicit.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..8d403da1e02
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/sunclock/files/implicit.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+error: implicitly declaring library function 'memcpy' with type 'void *(void *, const void *, unsigned long)' [-Werror,-Wimplicit-function-declaration]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- readpng.c.orig 2005-10-23 14:36:29.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ readpng.c 2022-01-08 14:14:46.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -16,6 +16,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <string.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <png.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <X11/Xlib.h>
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/sunclock/files/malloc.patch b/x11/sunclock/files/malloc.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..3020e46ddab
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/sunclock/files/malloc.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Don't include malloc.h which is nonstandard and doesn't exist on macOS.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+This source file doesn't use malloc but if it did, stdlib.h would be the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+header to include for that.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tildepath.c.orig 2000-09-01 10:34:51.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tildepath.c 2022-01-08 14:16:44.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -38,7 +38,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <pwd.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <malloc.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <string.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span></pre><pre style='margin:0'>
</pre>