<pre style='margin:0'>
Rainer Müller (raimue) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d53ad74a8a92a5c11dc72487c009d0129df4e18d">https://github.com/macports/macports-ports/commit/d53ad74a8a92a5c11dc72487c009d0129df4e18d</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 d53ad74 gindent: Fix build failure due to type mismatch vs. gperf 3.1
</span>d53ad74 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d53ad74a8a92a5c11dc72487c009d0129df4e18d
</span>Author: Friedrich Beckmann <friedrich.beckmann@gmx.de>
AuthorDate: Sun Aug 27 22:19:16 2017 +0200
<span style='display:block; white-space:pre;color:#404040;'> gindent: Fix build failure due to type mismatch vs. gperf 3.1
</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/54466
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> gindent failed to build with new type definitions in gperf 3.1.
</span><span style='display:block; white-space:pre;color:#404040;'> This patch changes the type information in gindent such that
</span><span style='display:block; white-space:pre;color:#404040;'> it compiles also versus gperf 3.1.
</span>---
devel/gindent/Portfile | 3 ++-
devel/gindent/files/gperf.patch | 32 ++++++++++++++++++++++++++++++++
2 files changed, 34 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/gindent/Portfile b/devel/gindent/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 440212c..a2ccbd7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/gindent/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/gindent/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,7 +37,8 @@ post-extract {
</span> }
patchfiles no-html.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- respect-docdir.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ respect-docdir.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gperf.patch
</span>
configure.args --docdir=${prefix}/share/doc/${name} \
--program-prefix=g
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/gindent/files/gperf.patch b/devel/gindent/files/gperf.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..4561d4c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/gindent/files/gperf.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;'>+gindent: Fix type incompatibility introduced with gperf 3.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+The patch is based on the idea proposed by gnw3. I tried this on a clean
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build with macports 2.4.1 on El Capitan 10.11.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+The problem was introduced with gperf 3.1 resulting in a build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+failure for gindent.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+see: https://trac.macports.org/ticket/54466
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fixes bug #54466
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Index: src/lexi.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+===============================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/lexi.c.orig 2017-08-27 18:33:16.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/lexi.c 2017-08-27 18:35:22.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -201,7 +201,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef __GNUC__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ __inline
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-templ_ty *is_reserved (const char *str, unsigned int len);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++templ_ty *is_reserved (const char *str, size_t len);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "gperf.c"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -215,7 +215,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef __GNUC__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ __inline
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-templ_ty *is_reserved_cc (register const char *str, register unsigned int len);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++templ_ty *is_reserved_cc (register const char *str, register size_t len);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "gperf-cc.c"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>