[gentoo-commits] gentoo-x86 commit in xfce-extra/xfce4-mailwatch-plugin/files: xfce4-mailwatch-plugin-1.1.0-gnutls-3.patch

[gentoo-commits] gentoo-x86 commit in xfce-extra/xfce4-mailwatch-plugin/files: xfce4-mailwatch-plugin-1.1.0-gnutls-3.patch

[Samuli Suominen (ssuominen)]

ssuominen    12/06/16 14:52:16

  Added:                xfce4-mailwatch-plugin-1.1.0-gnutls-3.patch
  Log:
  Fix building with net-libs/gnutls >= 3 wrt #421407 by Diego Elio Pettenò
  
  (Portage version: 2.2.0_alpha110/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  xfce-extra/xfce4-mailwatch-plugin/files/xfce4-mailwatch-plugin-1.1.0-gnutls-3.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/xfce-extra/xfce4-mailwatch-plugin/files/xfce4-mailwatch-plugin-1.1.0-gnutls-3.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/xfce-extra/xfce4-mailwatch-plugin/files/xfce4-mailwatch-plugin-1.1.0-gnutls-3.patch?rev=1.1&content-type=text/plain

Index: xfce4-mailwatch-plugin-1.1.0-gnutls-3.patch
===================================================================
http://bugs.gentoo.org/421407
http://bugzilla.xfce.org/show_bug.cgi?id=7998

--- libmailwatch-core/mailwatch-net-conn.c
+++ libmailwatch-core/mailwatch-net-conn.c
@@ -621,8 +621,10 @@
                            net_conn->gt_creds);
     gnutls_transport_set_ptr(net_conn->gt_session,
                              (gnutls_transport_ptr_t)net_conn->fd);
+#if GNUTLS_VERSION_MAJOR == 2 && GNUTLS_VERSION_MINOR < 12
     if(fcntl(net_conn->fd, F_GETFL) & O_NONBLOCK)
         gnutls_transport_set_lowat(net_conn->gt_session, 0);
+#endif
     
     if(!xfce_mailwatch_net_conn_tls_handshake(net_conn, error)) {
 #if 0