<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/83d43386d08576fa0f71e655cbcd96086c3353fa">https://github.com/macports/macports-ports/commit/83d43386d08576fa0f71e655cbcd96086c3353fa</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 83d43386d08 fnc: close tickets #64175 and #67290
</span>83d43386d08 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 83d43386d08576fa0f71e655cbcd96086c3353fa
</span>Author: Mark Jamsek <mark@jamsek.dev>
AuthorDate: Wed Nov 29 12:49:19 2023 +0000
<span style='display:block; white-space:pre;color:#404040;'> fnc: close tickets #64175 and #67290
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> (#64175) changes the Portfile to add a missing depends (ncurses), and patches
</span><span style='display:block; white-space:pre;color:#404040;'> out an unwanted include (i.e,-I/usr/include/ncursesw) from upstream's makefile.
</span><span style='display:block; white-space:pre;color:#404040;'> (#67290) patches out -Werror from the upstream's libfossil build to silence
</span><span style='display:block; white-space:pre;color:#404040;'> warnings due to missing fallthrough attribute on older compilers.
</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/64175
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/67290
</span>---
devel/fnc/Portfile | 7 +++++--
devel/fnc/files/libf-Werror-include-ncursesw.diff | 22 ++++++++++++++++++++++
2 files changed, 27 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/fnc/Portfile b/devel/fnc/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ef0e1e3feae..3d6e197947b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/fnc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/fnc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup makefile 1.0
</span>
name fnc
version 0.15
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories devel
license ISC
maintainers {bsdbox.org:mark @mcjsk} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,7 +27,10 @@ checksums rmd160 ecf53aed0c22284710c5bcd2cbcb58641f804295 \
</span>
build.type bsd
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append port:zlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles libf-Werror-include-ncursesw.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:zlib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:ncurses
</span>
destroot {
xinstall -m 755 ${worksrcpath}/src/${name} ${destroot}${prefix}/bin/${name}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/fnc/files/libf-Werror-include-ncursesw.diff b/devel/fnc/files/libf-Werror-include-ncursesw.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..eb286e439f9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/fnc/files/libf-Werror-include-ncursesw.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Index: fnc.bld.mk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+=======================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+hash - d5125d91b651e4115400e52857e80fd35cd8fb25ccf50e3828db32c27f119b63
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+hash + 0461726b7bef3caa495e6e17283581bc33b1f0d439da29c2ef477439a27d6d45
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- fnc.bld.mk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ fnc.bld.mk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -37,13 +37,13 @@ FOSSIL_CFLAGS = ${CFLAGS} -Wall -Werror -Wsign-compare
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DSQLITE_TRUSTED_SCHEMA=0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # FLAGS NEEDED TO BUILD LIBFOSSIL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-FOSSIL_CFLAGS = ${CFLAGS} -Wall -Werror -Wsign-compare -pedantic -std=c99
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++FOSSIL_CFLAGS = ${CFLAGS} -Wall -Wsign-compare -pedantic -std=c99
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # On SOME Linux (e.g., Ubuntu 18.04.6), we have to include wchar curses from
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # I/.../ncursesw, but linking to -lncursesw (w/ no special -L path) works fine.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # FLAGS NEEDED TO BUILD FNC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FNC_CFLAGS = ${CFLAGS} -Wall -Werror -Wsign-compare -pedantic -std=c99 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- -I./lib -I./include -I/usr/include/ncursesw \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ -I./lib -I./include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -D_XOPEN_SOURCE_EXTENDED -DVERSION=${VERSION} -DHASH=${HASH} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DDATE="${DATE}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>