<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/b0a87db6772dabb9acc5047edda65ec269219758">https://github.com/macports/macports-ports/commit/b0a87db6772dabb9acc5047edda65ec269219758</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 b0a87db AfterStep: Fix build with libpng 1.5 and later
</span>b0a87db is described below
<span style='display:block; white-space:pre;color:#808000;'>commit b0a87db6772dabb9acc5047edda65ec269219758
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Fri May 22 19:58:14 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> AfterStep: Fix build with libpng 1.5 and later
</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/60538
</span>---
x11/AfterStep/Portfile | 6 +++-
x11/AfterStep/files/libpng.patch | 32 ++++++++++++++++++++++
.../files/{patch-parser.c => parser.c.patch} | 0
3 files changed, 37 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/AfterStep/Portfile b/x11/AfterStep/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 01af128..bc19abd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/AfterStep/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/AfterStep/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,15 +29,19 @@ depends_lib port:giflib \
</span> port:gtk2 \
port:librsvg
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles libpng.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args --mandir=${prefix}/share/man \
--infodir=${prefix}/share/info \
--enable-i18n --with-x \
--with-svg
platform darwin {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ parser.c.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.ldflags-append \
"-bind_at_load"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles patch-parser.c
</span>
pre-configure {
reinplace "s|-rdynamic|-dynamic|g" \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/AfterStep/files/libpng.patch b/x11/AfterStep/files/libpng.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..4197307
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/AfterStep/files/libpng.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,32 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix build with libpng 1.5 and later.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libAfterImage/export.c.orig 2010-09-23 15:52:15.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libAfterImage/export.c 2020-05-22 19:49:52.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -496,7 +496,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ png_ptr = png_create_write_struct( PNG_LIBPNG_VER_STRING, NULL, NULL, NULL );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ( png_ptr != NULL )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if( (info_ptr = png_create_info_struct(png_ptr)) != NULL )
</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;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ png_destroy_info_struct(png_ptr, (png_infopp) &info_ptr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ info_ptr = NULL ;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libAfterImage/import.c.orig 2010-09-23 15:57:57.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libAfterImage/import.c 2020-05-22 19:54:42.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1251,7 +1251,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * the normal method of doing things with libpng). REQUIRED unless you
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * set up your own error handlers in the png_create_read_struct() earlier.
</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;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ASFlagType rgb_flags = ASStorage_RLEDiffCompress|ASStorage_32Bit ;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1468,7 +1468,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void asim_png_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ASImPNGReadBuffer *buf = (ASImPNGReadBuffer *)png_ptr->io_ptr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ASImPNGReadBuffer *buf = (ASImPNGReadBuffer *)png_get_io_ptr(png_ptr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ memcpy(data, buf->buffer, length);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ buf->buffer += length;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/AfterStep/files/patch-parser.c b/x11/AfterStep/files/parser.c.patch
</span>similarity index 100%
rename from x11/AfterStep/files/patch-parser.c
rename to x11/AfterStep/files/parser.c.patch
</pre><pre style='margin:0'>
</pre>