<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/8b6e6cd11491a01eef16e9eae36be612af695035">https://github.com/macports/macports-ports/commit/8b6e6cd11491a01eef16e9eae36be612af695035</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 8b6e6cd searchfs: fix fspatch workaround for older systems
</span>8b6e6cd is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 8b6e6cd11491a01eef16e9eae36be612af695035
</span>Author: Ken Cunningham <kencu@macports.org>
AuthorDate: Sat Sep 28 16:28:59 2019 -0700
<span style='display:block; white-space:pre;color:#404040;'> searchfs: fix fspatch workaround for older systems
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> include the header only if it exists
</span><span style='display:block; white-space:pre;color:#404040;'> fixes build on older SDKs without the fswatch.h header
</span><span style='display:block; white-space:pre;color:#404040;'> don't warn about the implicit function definition
</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/59124
</span>---
sysutils/searchfs/Portfile | 3 +++
.../patch-searchfs-fsgetpath-availability.diff | 26 ++++++++++++++++++++++
2 files changed, 29 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/searchfs/Portfile b/sysutils/searchfs/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c333bd7..4cd233b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/searchfs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/searchfs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,6 +25,9 @@ variant universal {}
</span>
use_configure no
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# this patch should be upstreamed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-searchfs-fsgetpath-availability.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> build.args CC="${configure.cc} [get_canonical_archflags cc]"
destroot {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/searchfs/files/patch-searchfs-fsgetpath-availability.diff b/sysutils/searchfs/files/patch-searchfs-fsgetpath-availability.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..25e52d0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/searchfs/files/patch-searchfs-fsgetpath-availability.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,26 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- main.m.orig 2019-09-28 16:15:32.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ main.m 2019-09-28 16:16:19.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -43,7 +43,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/param.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/attr.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/vnode.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__has_include)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if __has_include(<sys/fsgetpath.h>)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/fsgetpath.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/mount.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct packed_name_attr {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- main.m.orig 2019-09-28 16:23:18.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ main.m 2019-09-28 16:26:51.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -471,6 +471,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static ssize_t fsgetpath_compat(char *buf, size_t buflen, fsid_t *fsid, uint64_t obj_id) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #pragma clang diagnostic push
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #pragma clang diagnostic ignored "-Wpartial-availability"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#pragma clang diagnostic ignored "-Wimplicit-function-declaration"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (fsgetpathAvailable) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ssize_t size = fsgetpath(buf, buflen, fsid, obj_id);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (size > -1) {
</span></pre><pre style='margin:0'>
</pre>