<pre style='margin:0'>
Michael Dickens (michaelld) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/53f2f911065344d6dd9383e143b811b3133d8736">https://github.com/macports/macports-ports/commit/53f2f911065344d6dd9383e143b811b3133d8736</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 53f2f911065 thrift: update Upstream-Status in patches
</span>53f2f911065 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 53f2f911065344d6dd9383e143b811b3133d8736
</span>Author: Christopher Chavez <chrischavez@gmx.us>
AuthorDate: Fri Oct 2 09:51:58 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> thrift: update Upstream-Status in patches
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> [ci skip]
</span>---
devel/thrift/Portfile | 2 ++
devel/thrift/files/patch-thrift_protocol_decorator.h.diff | 2 +-
devel/thrift/files/patch-thrift_ssl_socket.h.diff | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/thrift/Portfile b/devel/thrift/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 91c03576316..f12cdd29a8d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/thrift/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/thrift/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,6 +6,7 @@ PortGroup conflicts_build 1.0
</span> name thrift
# NOTE: This port must be kept at the same version as port:py-thrift and port:p5-thrift
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Remove patches below when updating
</span> version 0.13.0
checksums rmd160 04cd735494a9d8558c2d22d1b99315ca859749c8 \
sha256 7ad348b88033af46ce49148097afe354d513c1fca7c607b59c33ebb6064b5179 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,6 +29,7 @@ long_description \
</span> homepage https://thrift.apache.org/
master_sites apache:${name}/${version}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Patches incorporated upstream; remove when updating to thrift > 0.13.0
</span> # https://trac.macports.org/ticket/61252
patchfiles-append patch-thrift_protocol_decorator.h.diff \
patch-thrift_ssl_socket.h.diff \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/thrift/files/patch-thrift_protocol_decorator.h.diff b/devel/thrift/files/patch-thrift_protocol_decorator.h.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 1d6a6fb1007..504dc2080a0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/thrift/files/patch-thrift_protocol_decorator.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/thrift/files/patch-thrift_protocol_decorator.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Upstream-Status: Pending
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Upstream-Status: Accepted (https://github.com/apache/thrift/pull/2249)
</span> --- lib/c_glib/src/thrift/c_glib/protocol/thrift_protocol_decorator.h.orig
+++ lib/c_glib/src/thrift/c_glib/protocol/thrift_protocol_decorator.h
@@ -67,6 +67,12 @@
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/thrift/files/patch-thrift_ssl_socket.h.diff b/devel/thrift/files/patch-thrift_ssl_socket.h.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index c34d219fc0a..3902b370856 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/thrift/files/patch-thrift_ssl_socket.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/thrift/files/patch-thrift_ssl_socket.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Upstream-Status: Pending
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Upstream-Status: Accepted (https://github.com/apache/thrift/pull/2249)
</span> --- lib/c_glib/src/thrift/c_glib/transport/thrift_ssl_socket.h.orig
+++ lib/c_glib/src/thrift/c_glib/transport/thrift_ssl_socket.h
@@ -213,6 +213,9 @@
</pre><pre style='margin:0'>
</pre>