<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/008b8d1628de609fb645cafbee9f39f530dc2469">https://github.com/macports/macports-ports/commit/008b8d1628de609fb645cafbee9f39f530dc2469</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 008b8d1628de609fb645cafbee9f39f530dc2469
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Tue Apr 5 07:40:23 2022 -0500
<span style='display:block; white-space:pre;color:#404040;'> Io: Fix version and build failure
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fix program version, implicit declaration of functions, and some clang
</span><span style='display:block; white-space:pre;color:#404040;'> warnings, using upstream commits.
</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/64917
</span>---
lang/Io/Portfile | 8 ++++-
lang/Io/files/Cairo-clang-warnings.patch | 15 ++++++++
lang/Io/files/EditLine-clang-warnings.patch | 25 +++++++++++++
lang/Io/files/IoImage-clang-warnings.patch | 56 +++++++++++++++++++++++++++++
lang/Io/files/SHA1-clang-warnings.patch | 13 +++++++
lang/Io/files/version.patch | 10 ++++++
6 files changed, 126 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/Io/Portfile b/lang/Io/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 45cc879e7dc..394b5f43634 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/Io/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/Io/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup github 1.0
</span> PortGroup cmake 1.0
github.setup IoLanguage io 2017.09.06
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 7
</span> name Io
categories lang
# mostly BSD, but some LGPL and GPL files
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -59,6 +59,12 @@ depends_lib path:lib/pkgconfig/cairo.pc:cairo \
</span> port:yajl \
port:zlib
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles Cairo-clang-warnings.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EditLine-clang-warnings.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IoImage-clang-warnings.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SHA1-clang-warnings.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.python ${prefix}/bin/python3.7
# ../../_build/binaries/io_static: No such file or directory
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/Io/files/Cairo-clang-warnings.patch b/lang/Io/files/Cairo-clang-warnings.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..3e80d3da71f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/Io/files/Cairo-clang-warnings.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fixed a typo where cairo_ps_surface_set_size was called instead of
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+cairo_pdf_surface_set_size.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/IoLanguage/io/pull/359
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/IoLanguage/io/commit/8cd5b5ad09a7707c859a7bdea342ae7ff2466e3c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- addons/Cairo/source/_IoCairoPDFSurface.c.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ addons/Cairo/source/_IoCairoPDFSurface.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -64,7 +64,7 @@ IoObject *IoCairoPDFSurface_setSize(IoCairoPDFSurface *self, IoObject *locals, I
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ double w = IoMessage_locals_doubleArgAt_(m, locals, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ double h = IoMessage_locals_doubleArgAt_(m, locals, 1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cairo_ps_surface_set_size(SURFACE(self), w, h);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cairo_pdf_surface_set_size(SURFACE(self), w, h);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CHECK_STATUS(self);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return self;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/Io/files/EditLine-clang-warnings.patch b/lang/Io/files/EditLine-clang-warnings.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..911b1b68755
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/Io/files/EditLine-clang-warnings.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,25 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix implicit declaration of function 'IoState_registerProtoWithFunc_'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+and incompatible pointer types.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/IoLanguage/io/pull/387
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/IoLanguage/io/commit/ad58e1c661874e779f3638bb19090d633badb715
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- addons/EditLine/source/IoEditLine.c.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ addons/EditLine/source/IoEditLine.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -56,7 +56,7 @@ IoEditLine *IoEditLine_proto(void *state)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ el_source(DATA(self)->editline, NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- IoState_registerProtoWithFunc_((IoState *)state, self, IoEditLine_proto);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ IoState_registerProtoWithFunc_((IoState *)state, self, (char *) IoEditLine_proto);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IoObject_addMethodTable_(self, methodTable);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libs/iovm/source/IoState.h.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libs/iovm/source/IoState.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -175,6 +175,7 @@ IOVM_API void IoState_init(IoState *self);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void IoState_setupQuickAccessSymbols(IoState *self);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void IoState_setupCachedMessages(IoState *self);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void IoState_setupSingletons(IoState *self);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void IoState_registerProtoWithFunc_(IoState *self, IoObject *proto, const char *v);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // setup tags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/Io/files/IoImage-clang-warnings.patch b/lang/Io/files/IoImage-clang-warnings.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..b8c25b8217b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/Io/files/IoImage-clang-warnings.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,56 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix implicit declaration of functions 'Image_isL8' and 'Image_bitMask'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+and conversion between pointers to integer types with different sign.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/IoLanguage/io/pull/388
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/IoLanguage/io/commit/3e115fabfd25cd14bb323dfcd1d83a02866dab7c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- addons/Image/source/Image.h.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ addons/Image/source/Image.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -145,6 +145,11 @@ IOIMAGE_API Image* Image_applyMinFilter(Image* self, int filterWidth, int filter
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IOIMAGE_API Image* Image_applyWeightedMedianFilter(Image* self, int filterWidth, int filterHeight, UArray* filter);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IOIMAGE_API Image* Image_applyNonlinearGradientsFilter(Image* self);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++IOIMAGE_API void Image_bitMask(Image *self, int component, int bitMask);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// internals
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++int Image_isL8(Image *self);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- addons/Image/source/IoImage.c.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ addons/Image/source/IoImage.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -687,7 +687,7 @@ IOIMAGE_API IoObject *IoImage_filterGauss(IoImage *self, IoObject *locals, IoMes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ UArray_setItemType_(filter, CTYPE_int8_t);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ UArray_setEncoding_(filter, CENCODING_NUMBER);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ UArray_setSize_(filter, filterSize * filterSize);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int8_t *filterBytes = UArray_mutableBytes(filter);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int8_t *filterBytes = (int8_t *) UArray_mutableBytes(filter);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int x, y, x1, y1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for(y = 0; y < filterSize; y++)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -715,7 +715,7 @@ IOIMAGE_API IoObject *IoImage_filterUnsharpMask(IoImage *self, IoObject *locals,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ UArray_setItemType_(filter, CTYPE_int8_t);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ UArray_setEncoding_(filter, CENCODING_NUMBER);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ UArray_setSize_(filter, 9);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int8_t *filterBytes = UArray_mutableBytes(filter);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int8_t *filterBytes = (int8_t *) UArray_mutableBytes(filter);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ filterBytes[0] = -1; filterBytes[1] = -1; filterBytes[2] = -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ filterBytes[3] = -1; filterBytes[4] = a + 8; filterBytes[5] = -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -739,7 +739,7 @@ IOIMAGE_API IoObject *IoImage_filterSobel(IoImage *self, IoObject *locals, IoMes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ UArray_setItemType_(filter, CTYPE_int8_t);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ UArray_setEncoding_(filter, CENCODING_NUMBER);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ UArray_setSize_(filter, 9);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int8_t *filterBytes = UArray_mutableBytes(filter);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int8_t *filterBytes = (int8_t *) UArray_mutableBytes(filter);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int i;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for(i = 0; i < 8; i++)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -764,7 +764,7 @@ IOIMAGE_API IoObject *IoImage_filterKirsch(IoImage *self, IoObject *locals, IoMe
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ UArray_setItemType_(filter, CTYPE_int8_t);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ UArray_setEncoding_(filter, CENCODING_NUMBER);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ UArray_setSize_(filter, 9);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int8_t *filterBytes = UArray_mutableBytes(filter);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int8_t *filterBytes = (int8_t *) UArray_mutableBytes(filter);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int i;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for(i = 0; i < 8; i++)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/Io/files/SHA1-clang-warnings.patch b/lang/Io/files/SHA1-clang-warnings.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..62da442672e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/Io/files/SHA1-clang-warnings.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;'>+Added hmac.h to Io header in addon SHA1 to fix implicit decleration.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/IoLanguage/io/pull/359
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/IoLanguage/io/commit/e707943b623c9bf680ac6a5bd54646ce1b5a61bd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- addons/SHA1/source/IoSHA1.h.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ addons/SHA1/source/IoSHA1.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8,6 +8,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "IoObject.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "IoNumber.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "sha1.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include "hmac.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define ISSHA1(self) IoObject_hasCloneFunc_(self, (IoTagCloneFunc *)IoSHA1_rawClone)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/Io/files/version.patch b/lang/Io/files/version.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..db8fecfc325
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/Io/files/version.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix version.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/IoLanguage/io/pull/358
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/IoLanguage/io/commit/f828fee7fef0db8479f66896cbaf08ee390952f0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libs/iovm/source/IoVersion.h.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libs/iovm/source/IoVersion.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,3 +1,3 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef IO_VERSION_STRING
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define IO_VERSION_STRING "20151111"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define IO_VERSION_STRING "20170906"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span></pre><pre style='margin:0'>
</pre>