<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/e8c2fe6ce2001f6b6f0bd7f57232ca86c17cb859">https://github.com/macports/macports-ports/commit/e8c2fe6ce2001f6b6f0bd7f57232ca86c17cb859</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 e8c2fe6ce20 rbmake: Fix build failures
</span>e8c2fe6ce20 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit e8c2fe6ce2001f6b6f0bd7f57232ca86c17cb859
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Sat Jan 23 02:35:22 2021 -0600
<span style='display:block; white-space:pre;color:#404040;'> rbmake: Fix build failures
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fix incompatibility with libpng 1.5 and later (use of the now-private
</span><span style='display:block; white-space:pre;color:#404040;'> jmpbuf field).
</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/59554
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fix incompatibility with Xcode 12 and later (implicit declaration of
</span><span style='display:block; white-space:pre;color:#404040;'> functions).
</span>---
textproc/rbmake/Portfile | 11 +++++++----
textproc/rbmake/files/implicit.patch | 30 ++++++++++++++++++++++++++++++
textproc/rbmake/files/libpng-1.5.patch | 23 +++++++++++++++++++++++
3 files changed, 60 insertions(+), 4 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/rbmake/Portfile b/textproc/rbmake/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1ce517a992d..2823661f599 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/rbmake/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/rbmake/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,6 +5,10 @@ PortSystem 1.0
</span> name rbmake
version 1.2
revision 8
<span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 a9731ac79a7f25c7f8e887f656845beb6ba859bb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 6c8ced3d9e98e742de5d2e881b28f42e81aa5cf0183253df1ea2d9b09dc86956 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 294130
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> categories textproc
license Artistic-1 Permissive
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,10 +17,6 @@ description "Book maker" for the Rocket eBook.
</span> homepage http://rbmake.sourceforge.net/
master_sites sourceforge
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 0d9a3769b878c9db630a6d890020ff38 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 5737af7a419e579160bc09544a7944e340a07582 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 a9731ac79a7f25c7f8e887f656845beb6ba859bb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> long_description \
Rbmake is a "book maker" for the Rocket eBook. It consists of a set of \
commandline tools that assemble or disassemble .rb files -- the book \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,4 +29,7 @@ depends_lib port:libxml2 \
</span> port:libpng \
port:zlib
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles implicit.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libpng-1.5.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args --mandir=${prefix}/share/man
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/rbmake/files/implicit.patch b/textproc/rbmake/files/implicit.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..90df1ee76be
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/rbmake/files/implicit.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,30 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+error: implicitly declaring library function 'exit' with type 'void (int) __attribute__((noreturn))' [-Werror,-Wimplicit-function-declaration]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+error: implicitly declaring library function 'memset' with type 'void *(void *, int, unsigned long)' [-Werror,-Wimplicit-function-declaration]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+error: implicitly declaring library function 'strcat' with type 'char *(char *, const char *)' [-Werror,-Wimplicit-function-declaration]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+error: implicitly declaring library function 'strcmp' with type 'int (const char *, const char *)' [-Werror,-Wimplicit-function-declaration]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+error: implicitly declaring library function 'strcpy' with type 'char *(char *, const char *)' [-Werror,-Wimplicit-function-declaration]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+error: implicitly declaring library function 'strlen' with type 'unsigned long (const char *)' [-Werror,-Wimplicit-function-declaration]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+error: implicitly declaring library function 'strncmp' with type 'int (const char *, const char *, unsigned long)' [-Werror,-Wimplicit-function-declaration]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+error: implicitly declaring library function 'strncpy' with type 'char *(char *, const char *, unsigned long)' [-Werror,-Wimplicit-function-declaration]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2006-04-27 13:27:08.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2021-01-23 02:17:32.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3069,6 +3069,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cat >>conftest.$ac_ext <<_ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* end confdefs.h. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <ctype.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if ((' ' & 0x0FF) == 0x020)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/rbmake/rbmake.h.orig 2006-04-23 17:49:47.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/rbmake/rbmake.h 2021-01-23 02:26:00.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -9,6 +9,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define _RBMAKE_H
</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 <string.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <rbmake/rbfile.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define RB_TEXTCONV_NONE 0
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/rbmake/files/libpng-1.5.patch b/textproc/rbmake/files/libpng-1.5.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..e5a5d94b664
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/rbmake/files/libpng-1.5.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,23 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+error: incomplete definition of type 'struct png_struct_def'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/pngimage.c.orig 2006-04-21 00:48:54.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/pngimage.c 2021-01-23 02:31:47.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -35,7 +35,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return NULL;
</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;'>+- if (setjmp(png_ptr->jmpbuf)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (setjmp(png_jmpbuf(png_ptr))) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RbImage_setError("setjmp returns error condition");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -101,7 +101,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return NULL;
</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;'>+- if (setjmp(png_ptr->jmpbuf)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (setjmp(png_jmpbuf(png_ptr))) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ png_destroy_write_struct(&png_ptr, &info_ptr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RbImage_setError("setjmp returns error condition");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return NULL;
</span></pre><pre style='margin:0'>
</pre>