PoetryInCode/void-packages
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

vinagre: use upstream fix instead

Browse Source
This commit is contained in:
Enno Boland 2015-11-03 11:47:09 +01:00
parent 5279228ba7
commit c17ec095e6
2 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
srcpkgs/vinagre/patches/fix-ipv6-interpretation.patch
View File

@ -1,16 +1,16 @@
diff -upr vinagre-3.18.1.orig/vinagre/vinagre-connection.c vinagre-3.18.1/vinagre/vinagre-connection.c diff --git a/vinagre/vinagre-connection.c b/vinagre/vinagre-connection.c
--- vinagre/vinagre-connection.c.orig 2015-09-25 13:35:42.000000000 +0200 index 812ae92..3a3b9ac 100644
+++ vinagre/vinagre-connection.c 2015-11-03 11:26:15.058608241 +0100 --- vinagre/vinagre-connection.c
@@ -582,7 +582,7 @@ vinagre_connection_split_string (const g +++ vinagre/vinagre-connection.c
@@ -582,7 +582,6 @@ vinagre_connection_split_string (const gchar *uri,
gchar **server, **url; gchar **server, **url;
gint lport; gint lport;
gchar *lhost; gchar *lhost;
- gboolean is_ipv6; - gboolean is_ipv6;
+ gchar *tmphost;
gchar ipv6_host[255] = {0,}; gchar ipv6_host[255] = {0,};
VinagreProtocol *ext; 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; 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) - if (is_ipv6)
- lhost = g_strconcat ("[", lhost, "]", NULL); - 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] == '[') if (lhost[0] == '[')
{ {
int i;

2
srcpkgs/vinagre/template
View File

@ -1,7 +1,7 @@
# Template file for 'vinagre' # Template file for 'vinagre'
pkgname=vinagre pkgname=vinagre
version=3.18.1 version=3.18.1
revision=2 revision=3
build_style=gnu-configure build_style=gnu-configure
configure_args="--disable-schemas-compile" configure_args="--disable-schemas-compile"
hostmakedepends="pkg-config intltool itstool gnome-doc-utils" hostmakedepends="pkg-config intltool itstool gnome-doc-utils"