<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/d3ecce66e9ef3705abc4202a2224858311cee3a1">https://github.com/macports/macports-ports/commit/d3ecce66e9ef3705abc4202a2224858311cee3a1</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 d3ecce6 libuv: update release to 1.30.0 and devel to 20190627-f50a746f
</span>d3ecce6 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d3ecce66e9ef3705abc4202a2224858311cee3a1
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Thu Jun 27 14:21:16 2019 -0400
<span style='display:block; white-space:pre;color:#404040;'> libuv: update release to 1.30.0 and devel to 20190627-f50a746f
</span>---
devel/libuv/Portfile | 23 +++++------
.../patch-libuv-unix-core-close-nocancel.diff | 44 ++++++++++------------
2 files changed, 31 insertions(+), 36 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libuv/Portfile b/devel/libuv/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3c6eeee..6ea3887 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libuv/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libuv/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -84,25 +84,23 @@ platform darwin {
</span> # 10.7 Lion and newer use the current, with a devel version also!
if {${subport} eq ${name}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup libuv libuv 1.29.1 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 5f287d080d93fbc98d0cf8657fb25410d2c96403 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 401f991c08df38e4239b08ea762e5de53de738952d44689a7f2c63dc95af3856 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1224239
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup libuv libuv 1.30.0 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 cb73c5f0681bb47606abf8e58f8fad3b75640862 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 97cf47b87f20532e58f4912cfa2f68de1e2fd7c31b35b836e80e1942f2fd76e3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1228472
</span> revision 0
conflicts libuv-devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-libuv-unix-core-close-nocancel.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> }
subport libuv-devel {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup libuv libuv 5fc58eb3d5dd9b683719d2e96c606d4e6e5b555c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20190619-[string range ${github.version} 0 7]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 3a8dcb9da5a0c00163c2d39ef735cb6fed11b170 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 08cdda989ab3d8476c89b8048a9eaf665dc68f7536f98d35ba65f8d53008b8e7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1228083
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup libuv libuv f50a746fa6e420ef5f6a35b27f2319e18d4bfc11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20190627-[string range ${github.version} 0 7]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 56b41c3afaf287abce5dc78c6bad6418889c8f56 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 1abbb84c0b3df090f2a505e0cc0a794c036a74195e8ec0b3532b1a304f38ed8a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1228491
</span> revision 0
long_description ${long_description} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -112,6 +110,9 @@ platform darwin {
</span> github.livecheck.branch v1.x
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-libuv-unix-core-close-nocancel.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> }
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libuv/files/patch-libuv-unix-core-close-nocancel.diff b/devel/libuv/files/patch-libuv-unix-core-close-nocancel.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 24e461f..5f37267 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libuv/files/patch-libuv-unix-core-close-nocancel.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libuv/files/patch-libuv-unix-core-close-nocancel.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,48 +1,42 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/unix/core.c.orig 2019-05-22 12:46:39.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/unix/core.c 2019-05-22 12:50:03.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -522,13 +522,33 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/unix/core.c.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/unix/core.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -522,18 +522,32 @@
</span> * will unwind the thread when it's in the cancel state. Work around that
* by making the system call directly. Musl libc is unaffected.
*/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span> +#if defined(__GNUC__)
+#define GCC_VERSION \
+ (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
+#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(__clang__) || (GCC_VERSION >= 40500)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__clang__) || (defined(GCC_VERSION) && (GCC_VERSION >= 40500))
</span> +/* gcc diagnostic pragmas available */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define GCC_DIAGNOSTIC_AVAILABLE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# define GCC_DIAGNOSTIC_AVAILABLE
</span> +#endif
+
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span> int uv__close_nocancel(int fd) {
-#if defined(__APPLE__)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(__APPLE__) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1050
</span> -#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdollar-in-identifier-extension"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(GCC_DIAGNOSTIC_AVAILABLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined(__LP64__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__APPLE__) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1050
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# if defined(GCC_DIAGNOSTIC_AVAILABLE)
</span> +# pragma GCC diagnostic push
+# pragma GCC diagnostic ignored "-Wdollar-in-identifier-extension"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if __LP64__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# if defined(__LP64__) || __LP64__
</span> extern int close$NOCANCEL(int);
return close$NOCANCEL(fd);
<span style='display:block; white-space:pre;background:#e0ffe0;'>+-#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int close$NOCANCEL$UNIX2003(int);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return close$NOCANCEL$UNIX2003(fd);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span> -#pragma GCC diagnostic pop
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ extern int close$NOCANCEL$UNIX2003(int);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return close$NOCANCEL$UNIX2003(fd);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(GCC_DIAGNOSTIC_AVAILABLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# if defined(GCC_DIAGNOSTIC_AVAILABLE)
</span> +# pragma GCC diagnostic pop
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# endif
</span> #elif defined(__linux__)
return syscall(SYS_close, fd);
#else
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -536,7 +555,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int uv__close_nocheckstdio(int fd) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int saved_errno;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int rc;
</span></pre><pre style='margin:0'>
</pre>