<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/342191aff1f3316a1ed028d5204f7407ed3b7568">https://github.com/macports/macports-ports/commit/342191aff1f3316a1ed028d5204f7407ed3b7568</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 342191aff1f3316a1ed028d5204f7407ed3b7568
</span>Author: Dennis Camera <dennis.camera@riiengineering.ch>
AuthorDate: Sat Mar 25 19:09:50 2023 +0100
<span style='display:block; white-space:pre;color:#404040;'> devel/libfilezilla: fix build using GCC 7
</span>---
devel/libfilezilla/Portfile | 3 +++
devel/libfilezilla/files/patch-gcc7.diff | 24 ++++++++++++++++++++++++
2 files changed, 27 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libfilezilla/Portfile b/devel/libfilezilla/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2be8dd04895..457bb07afda 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libfilezilla/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libfilezilla/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -68,6 +68,9 @@ if {[string match *gcc* ${configure.compiler}]} {
</span> configure.ldflags-append \
-latomic
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[string match *gcc-7* ${configure.compiler}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-gcc7.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
test.run yes
test.dir ${worksrcpath}/tests
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libfilezilla/files/patch-gcc7.diff b/devel/libfilezilla/files/patch-gcc7.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..461bee88452
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libfilezilla/files/patch-gcc7.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,24 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Patch to make libfilezilla compile with MacPorts' gcc7.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./lib/invoker.cpp.orig 2020-10-13 14:16:48.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./lib/invoker.cpp 2023-03-25 18:38:23.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -25,7 +25,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ invoker_factory get_invoker_factory(event_loop& loop)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return [handler = std::optional<thread_invoker>(), &loop](std::function<void()> const& cb) mutable {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return [handler = std::optional<thread_invoker>(), &loop=loop](std::function<void()> const& cb) mutable {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!handler) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ handler.emplace(loop);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./lib/libfilezilla/uri.hpp.orig 2022-04-01 14:35:07.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./lib/libfilezilla/uri.hpp 2023-03-25 19:00:19.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -21,7 +21,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ class FZ_PUBLIC_SYMBOL uri final
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uri() noexcept = default;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ uri() = default;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ explicit uri(std::string_view const& in);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void clear();
</span></pre><pre style='margin:0'>
</pre>