<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/93d474bf92301b1d33e9de47f97c8a37bb8dee21">https://github.com/macports/macports-ports/commit/93d474bf92301b1d33e9de47f97c8a37bb8dee21</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 93d474bf92301b1d33e9de47f97c8a37bb8dee21
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Wed Mar 23 20:09:26 2022 -0500

<span style='display:block; white-space:pre;color:#404040;'>    qof: Fix build failures
</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/64877
</span>---
 databases/qof/Portfile                             | 23 +++++++++++++---------
 databases/qof/files/implicit.patch                 | 13 ++++++++++++
 .../qof/files/patch-lib-libsql-Makefile.am.patch   | 13 ++++++++++++
 3 files changed, 40 insertions(+), 9 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/qof/Portfile b/databases/qof/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2a24c02ed54..1b9239aea0c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/qof/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/qof/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,37 +4,42 @@ PortSystem          1.0
</span> 
 name                qof
 version             0.8.8
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums           rmd160  e020e9843ae59cf3d8a9946ea9241921d852234f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  2cecb942bb42fc77c42417cf9118512c73911c16ccea6e72ab28b8bdf60a4e2e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    962548
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> description         Query Object Framework (QOF)
 long_description    {*}${description} is a framework to allow the execution of SQL-type \
                     queries using collections of in-memory objects as 'tables'.
 maintainers         nomaintainer
 categories          databases
 license             GPL-2+
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms           darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage            http://sourceforge.net/projects/qof/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage            https://web.archive.org/web/20180413005909/https://alioth.debian.org/projects/qof/
</span> master_sites        http://ftp.debian.org/debian/pool/main/q/${name}
 
 distname            ${name}_${version}.orig
 worksrcdir          ${name}-${version}
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums           rmd160  e020e9843ae59cf3d8a9946ea9241921d852234f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  2cecb942bb42fc77c42417cf9118512c73911c16ccea6e72ab28b8bdf60a4e2e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_build       port:pkgconfig
 
 depends_lib         path:lib/pkgconfig/glib-2.0.pc:glib2 \
                     port:libxml2
 
 patchfiles          patch-configure.ac.diff \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+                    patch-lib-libsql-Makefile.am.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    implicit.patch \
</span>                     patch-qof-qofdate.c.diff
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_parallel_build  no
</span> use_autoreconf      yes
 autoreconf.args     -fvi
<span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.checks.implicit_function_declaration.whitelist-append strchr
</span> 
 configure.args      --disable-doxygen \
                     --disable-gdasql
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.type      regex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.url       ${master_sites}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex     "${name}_(\\d+(?:\\.\\d+)*)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.run            yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.target         check
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.type      none
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/qof/files/implicit.patch b/databases/qof/files/implicit.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..856d83ca5b7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/qof/files/implicit.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;'>+Fix:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+lexer.c:1955:40: error: implicit declaration of function 'isatty' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/codehelp/qof/issues/4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/libsql/lexer.c.orig        2014-09-23 02:40:17.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/libsql/lexer.c     2022-03-23 17:58:48.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -40,6 +40,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <string.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <errno.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <unistd.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* end standard C headers. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/qof/files/patch-lib-libsql-Makefile.am.patch b/databases/qof/files/patch-lib-libsql-Makefile.am.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..69f42fb789f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/qof/files/patch-lib-libsql-Makefile.am.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;'>+Fix dependency of sql test program
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/codehelp/qof/commit/27ffca90e50d68d97042b1f38c2ac2d6939f2c11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/libsql/Makefile.am.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/libsql/Makefile.am
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -43,7 +43,7 @@ lexer.c: lexer.l parser.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sql_parse_test_SOURCES=sql_parse_test.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # sql_parse_test_LDFLAGS = $(LIBGDA_LIBS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-sql_parse_test_DEPENDENCIES =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++sql_parse_test_DEPENDENCIES = ./libqofsql.la
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sql_parse_test_LDADD = ./libqofsql.la ${GLIB_LIBS}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tests: sql_parse_test
</span></pre><pre style='margin:0'>

</pre>