From c17ec095e65a1def3a2f8dc2395de6b58a529bef Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.eu>
Date: Tue, 3 Nov 2015 11:47:09 +0100
Subject: [PATCH] vinagre: use upstream fix instead

---
 .../patches/fix-ipv6-interpretation.patch     | 21 +++++++------------
 srcpkgs/vinagre/template                      |  2 +-
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/srcpkgs/vinagre/patches/fix-ipv6-interpretation.patch b/srcpkgs/vinagre/patches/fix-ipv6-interpretation.patch
index db930ad347..96acbb4bde 100644
--- a/srcpkgs/vinagre/patches/fix-ipv6-interpretation.patch
+++ b/srcpkgs/vinagre/patches/fix-ipv6-interpretation.patch
@@ -1,16 +1,16 @@
-diff -upr vinagre-3.18.1.orig/vinagre/vinagre-connection.c vinagre-3.18.1/vinagre/vinagre-connection.c
---- vinagre/vinagre-connection.c.orig	2015-09-25 13:35:42.000000000 +0200
-+++ vinagre/vinagre-connection.c	2015-11-03 11:26:15.058608241 +0100
-@@ -582,7 +582,7 @@ vinagre_connection_split_string (const g
+diff --git a/vinagre/vinagre-connection.c b/vinagre/vinagre-connection.c
+index 812ae92..3a3b9ac 100644
+--- vinagre/vinagre-connection.c
++++ vinagre/vinagre-connection.c
+@@ -582,7 +582,6 @@ vinagre_connection_split_string (const gchar *uri,
    gchar **server, **url;
    gint    lport;
    gchar  *lhost;
 -  gboolean is_ipv6;
-+  gchar  *tmphost;
    gchar   ipv6_host[255] = {0,};
    VinagreProtocol *ext;
  
-@@ -619,10 +619,12 @@ vinagre_connection_split_string (const g
+@@ -619,11 +618,6 @@ vinagre_connection_split_string (const gchar *uri,
        return FALSE;
      }
  
@@ -18,12 +18,7 @@ diff -upr vinagre-3.18.1.orig/vinagre/vinagre-connection.c vinagre-3.18.1/vinagr
 -
 -  if (is_ipv6)
 -    lhost = g_strconcat ("[", lhost, "]", NULL);
-+  /* Assume an hostname contains more than 1 colons as an ipv6 address */
-+  if(lhost[0] != '[') {
-+    tmphost = g_strstr_len (lhost, -1, ":");
-+    if(tmphost && g_strstr_len (tmphost+1, -1, ":") != NULL)
-+      lhost = g_strconcat ("[", lhost, "]", NULL);
-+  }
- 
+-
    if (lhost[0] == '[')
      {
+       int i;
diff --git a/srcpkgs/vinagre/template b/srcpkgs/vinagre/template
index 27f44ccdc3..d1bb7888f0 100644
--- a/srcpkgs/vinagre/template
+++ b/srcpkgs/vinagre/template
@@ -1,7 +1,7 @@
 # Template file for 'vinagre'
 pkgname=vinagre
 version=3.18.1
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-schemas-compile"
 hostmakedepends="pkg-config intltool itstool gnome-doc-utils"