<pre style='margin:0'>
Dan Ports (drkp) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/8a534b7b3e43e85cd89e08eb55976ac7bae8644e">https://github.com/macports/macports-ports/commit/8a534b7b3e43e85cd89e08eb55976ac7bae8644e</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 8a534b7 gwenhywfar4(-devel): update to v4.18.0
</span>8a534b7 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 8a534b7b3e43e85cd89e08eb55976ac7bae8644e
</span>Author: Dan R. K. Ports <drkp@cs.washington.edu>
AuthorDate: Sat Dec 16 20:03:49 2017 -0800
<span style='display:block; white-space:pre;color:#404040;'> gwenhywfar4(-devel): update to v4.18.0
</span>---
devel/gwenhywfar4/Portfile | 33 ++++++-------------
.../gwenhywfar4/files/patch-shlib-extensions.diff | 37 ----------------------
.../files/patch-src-sio-syncio_tls.c.diff | 13 --------
3 files changed, 10 insertions(+), 73 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/gwenhywfar4/Portfile b/devel/gwenhywfar4/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8a53b1e..63c173e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/gwenhywfar4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/gwenhywfar4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,36 +35,23 @@ conflicts-delete $subport
</span>
# Usually the port has a different version than the *-devel subports
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {$subport eq $name || $subport eq "gwenhywfar4-gtk"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 4.14.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# (but right now it doesn't)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if {$subport eq $name || $subport eq "gwenhywfar4-gtk"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 4.18.0
</span> # this is specific to this port and *version* for downloading it
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set release 01
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set release 206
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums md5 b0662b7c1451b6e6fcad41a00c4db713 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 9e00927c1b3a7d02408caf0e3540619d2e75c069 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 c092c53e4137b47d5595eb57be6cb9bbb186314d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 1e0ed3b99e05afe15988987cc165c42edc35b7cf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 6915bba42d8b7f0213cee186a944296e5e5e97cdbde5b539a924261af03086ca
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#}
</span>
subport gwenhywfar4-gtk {}
subport gwenhywfar4-devel {}
subport gwenhywfar4-gtk-devel {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-shlib-extensions.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src-sio-syncio_tls.c.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[string match "*-devel" $subport]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 4.16.0beta
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # this is specific to this port and *version* for downloading it
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set release 204
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles patch-gwenhywfar-config.cmake.in.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-gwengui-qt4-config.cmake.in.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-gwengui-cpp-config.cmake.in.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums md5 ecdcf6add5d352e34b1ff3e620e7fb1e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 d2a42a0ba49de03712c5cd08c704ca22c2ff5cb6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 a7dd956f7744de8bd0649bf564c4f430f3b85474
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-gwenhywfar-config.cmake.in.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-gwengui-qt4-config.cmake.in.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-gwengui-cpp-config.cmake.in.diff
</span>
if {$subport eq $name || $subport eq "gwenhywfar4-devel"} {
# the correct way to depend on Qt4:
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/gwenhywfar4/files/patch-shlib-extensions.diff b/devel/gwenhywfar4/files/patch-shlib-extensions.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index e7173e3..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/gwenhywfar4/files/patch-shlib-extensions.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,37 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git gui/qt4/gwengui-qt4-config.cmake.in gui/qt4/gwengui-qt4-config.cmake.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 8b2b0fb..8225914 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gui/qt4/gwengui-qt4-config.cmake.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gui/qt4/gwengui-qt4-config.cmake.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -22,8 +22,13 @@ if(NOT EXISTS "${_file}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set_and_check(exec_prefix "@exec_prefix@")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set_and_check(includedir "@includedir@")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set_and_check(GWENGUI_QT4_INCLUDE_DIRS "@gwenhywfar_headerdir@")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set_and_check(GWENGUI_QT4_LIBRARIES "@libdir@/libgwengui-qt4.so")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set_and_check(GWENHYWFAR_CPP_LIBRARIES "@libdir@/libgwengui-cpp.so")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set_and_check(GWENGUI_QT4_LIBRARIES "@libdir@/libgwengui-qt4.dylib")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set_and_check(GWENHYWFAR_CPP_LIBRARIES "@libdir@/libgwengui-cpp.dylib")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set_and_check(GWENGUI_QT4_LIBRARIES "@libdir@/libgwengui-qt4.so")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set_and_check(GWENHYWFAR_CPP_LIBRARIES "@libdir@/libgwengui-cpp.so")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ endif(APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(GWENGUI_QT4_LIBRARIES ${GWENGUI_QT4_LIBRARIES} ${GWENHYWFAR_CPP_LIBRARIES})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git gwenhywfar-config.cmake.in gwenhywfar-config.cmake.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 82955da..fabef61 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gwenhywfar-config.cmake.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gwenhywfar-config.cmake.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -23,7 +23,11 @@ set_and_check(prefix "@prefix@")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set_and_check(exec_prefix "@exec_prefix@")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set_and_check(includedir "@includedir@")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set_and_check(GWENHYWFAR_INCLUDE_DIRS "@gwenhywfar_headerdir@")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--set_and_check(GWENHYWFAR_LIBRARIES "@libdir@/libgwenhywfar.so.@GWENHYWFAR_SO_EFFECTIVE@")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if(APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set_and_check(GWENHYWFAR_LIBRARIES "@libdir@/libgwenhywfar.@GWENHYWFAR_SO_EFFECTIVE@.dylib")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+else()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set_and_check(GWENHYWFAR_LIBRARIES "@libdir@/libgwenhywfar.so.@GWENHYWFAR_SO_EFFECTIVE@")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+endif(APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # find components
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/gwenhywfar4/files/patch-src-sio-syncio_tls.c.diff b/devel/gwenhywfar4/files/patch-src-sio-syncio_tls.c.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 91e16ec..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/gwenhywfar4/files/patch-src-sio-syncio_tls.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/sio/syncio_tls.c b/src/sio/syncio_tls.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 43e1d70..dc2d334 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/sio/syncio_tls.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/sio/syncio_tls.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -364,7 +364,7 @@ int GWEN_SyncIo_Tls_Prepare(GWEN_SYNCIO *sio) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const int proto_prio[2] = { GNUTLS_SSL3, 0 };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DBG_INFO(GWEN_LOGDOMAIN, "Forcing SSL v3");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- rv=gnutls_protocol_set_priority(xio->session, proto_prio);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ rv=gnutls_priority_set(xio->session, proto_prio);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (rv) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DBG_ERROR(GWEN_LOGDOMAIN, "gnutls_protocol_set_priority: %d (%s)", rv, gnutls_strerror(rv));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gnutls_deinit(xio->session);
</span></pre><pre style='margin:0'>
</pre>