Fix warnings, bug #336878 by Alexandre Ferreira.

Package-Manager: portage-2.2_rc86/cvs/Linux x86_64

7 files changed, 88 insertions, 23 deletions

diff --git a/x11-misc/x11vnc/ChangeLog b/x11-misc/x11vnc/ChangeLog
index c77bb5e3d76f..f77987313db9 100644
--- a/x11-misc/x11vnc/ChangeLog
+++ b/x11-misc/x11vnc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/x11vnc
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/ChangeLog,v 1.91 2010/09/11 16:13:17 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/ChangeLog,v 1.92 2010/09/25 20:18:14 swegener Exp $
+
+  25 Sep 2010; Sven Wegener <swegener@gentoo.org> x11vnc-0.9.9.ebuild,
+  x11vnc-0.9.10.ebuild, x11vnc-0.9.11.ebuild, x11vnc-0.9.12.ebuild,
+  +files/x11vnc-0.9.12-warnings.patch:
+  Fix warnings, bug #336878 by Alexandre Ferreira.
 
 *x11vnc-0.9.12 (11 Sep 2010)
 
diff --git a/x11-misc/x11vnc/Manifest b/x11-misc/x11vnc/Manifest
index d025ac44597c..36accbb5f4d0 100644
--- a/x11-misc/x11vnc/Manifest
+++ b/x11-misc/x11vnc/Manifest
@@ -1,21 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX x11vnc-0.9.11-rename-pointer.patch 9787 RMD160 4f029f172fe45b39d82aebdc50aaa49a797ffedc SHA1 139645d33fb7a926380a05e927ac390134c9a381 SHA256 061878de912b01c73dc597a5985b70cf95acdecfe679b0015f87f7e4d0f00f38
+AUX x11vnc-0.9.12-warnings.patch 2374 RMD160 affc1645f76ebbe696a40583111b710af9d7dc22 SHA1 45e2ea68cd51fc5225f832632a7cccbd65a73d63 SHA256 470901cfa68bb85f911959eb99c24f20e20872ea214a963251304f88ce054b43
 DIST x11vnc-0.9.10.tar.gz 2739576 RMD160 4c8864701703b04c4710100e95372786c414f9ed SHA1 ec7082ee48f1aca0597208bc29197d56a2ff3bff SHA256 935158155828b6a5990a8407ca73ea9cd428e0466a10bb39063c9247806ae011
 DIST x11vnc-0.9.11.tar.gz 2754816 RMD160 92a00aa0a4a529a42ba33f34db84ba05454e3d39 SHA1 f24d747f3fbffc9740cfedbab0b39ea6da0c817d SHA256 fbc7a9e6d38afcfbb832d48ea4084823fa6bb9c0e37a925898229ca73639e7f5
 DIST x11vnc-0.9.12.tar.gz 2757806 RMD160 4df835e53a6b3dccd47d49109a712c0405a798d7 SHA1 cf4e24bee5962b52d8f2a5442a7c44943a9cc0bb SHA256 60a7cceee2c9a5f1c854340b2bae13f975ac55906237042f81f795b28a154a79
 DIST x11vnc-0.9.9.tar.gz 2671958 RMD160 1b1335253c1f40f69ffbfdff5c4c5f28ed6315c3 SHA1 deb0c71cc0f7d6b99fb4b1484232aa935fe62c90 SHA256 6b960267b1f842efe5fb76b5d36fbee79ca8ea31528ee83877623e1cca0fbbe9
-EBUILD x11vnc-0.9.10.ebuild 1942 RMD160 193d622befc4a0c1d99474d19e5c0e4c621c7551 SHA1 4e14e75d3f778478f78d5cc7962619db2282e802 SHA256 f32fd76623075c02ec6b54bd2c24868be77d1b0d8387356cf2245a12e788bebb
-EBUILD x11vnc-0.9.11.ebuild 2002 RMD160 4378f0f71ab2058ad05a013dfc0c01123d30bb23 SHA1 3cd8bb96649e1998d14d6d83ee782ae9020c3dfe SHA256 64ced436d8b563a309e5dd4d5a079e0b20105a27b2524a03290a29793862eb39
-EBUILD x11vnc-0.9.12.ebuild 1919 RMD160 5d4e3822918e43052ee1d79949bc471707579968 SHA1 be374918123cae33c26c6b57e82640555c7f1a5e SHA256 b7199788f8e76408bff4d713c8677fdb35fd4b435901070e7fa0b007abd3394f
-EBUILD x11vnc-0.9.9.ebuild 1932 RMD160 670e4da8da85d3d4d8ef5fd8d4e4d6108c54fb92 SHA1 7dd52bd9c8c0ad417deaabeb55300aadb3baf4ee SHA256 8520d921e535d8dd0ca5250903cc9a1656d49a03300a95efe9d1ccd8401862e2
-MISC ChangeLog 12125 RMD160 c24ebaacfd96d155258f0d1798a0fcfd5284cdc9 SHA1 09031a0f75ed4d2da04c5b04e2e400f98a769aed SHA256 ed0a8e501a006f05d8a28b4fe897847cb853c8c9ce3bd75dbf0cf6ccfed3dfe9
+EBUILD x11vnc-0.9.10.ebuild 1992 RMD160 4a8e89a6098ca636e8c7b231fb61392d85e3077f SHA1 6e47243d407af5b1ea424babcd1daf74ec488bbc SHA256 ae1fb3cbbb8063491c79a72f7100cb8c5e6788b7980a4c315f08451a207b1fd1
+EBUILD x11vnc-0.9.11.ebuild 2052 RMD160 231fe2d516a452f064fcdb69993aa82593813741 SHA1 93d12ee49fdd20ac72f136fa5dbcb9ab7b8c291d SHA256 79e13c522c7790b4dd7654211a6af86e485dc0014e814eef663b0125ca12c1a7
+EBUILD x11vnc-0.9.12.ebuild 1996 RMD160 1beae64a09fec7be455699249401050222419912 SHA1 4bfd00b76e0e48bad0aa8fae2fcc081d6da0e829 SHA256 c19c1920f6377b9f923f449e59e411cfd4b9f91b984fe47a6939ff66ece38350
+EBUILD x11vnc-0.9.9.ebuild 1982 RMD160 ed9e3d9823a21ca309b3e414bd948e270188cb2a SHA1 dd4e422ff1c6a6c9b6f184689cfb7c45222dc530 SHA256 ccd3f3a6cb51a209d9923413fd0f22cf96e68b5e8226395a40fc9b7bc47a591f
+MISC ChangeLog 12355 RMD160 11f1cc8f44c62c379b49378b9b413d5695c8d720 SHA1 cf232fec03abcbf2df5723fe36106db650aed631 SHA256 4999e11e0f64b406e01f61f30d42df6c4aefafd5a9e365c565b7d7bddcb68431
 MISC metadata.xml 599 RMD160 42954f89865c12c5fd4707bc784037f2231c6db6 SHA1 4ce649d4717b45387cdfd9b82984194deb8fcfad SHA256 ba34dcd7e24d8434345f6657e4c2d6b14b4e935590de308f23375e436c94556d
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAkyLqqMACgkQI1lqEGTUzyTN5QCeN6X4jlvAiqOXaGsnn4WGHLc1
-ae8AoLQLKbcziznjjSTadT7KH1SOdizJ
-=PuP8
------END PGP SIGNATURE-----
diff --git a/x11-misc/x11vnc/files/x11vnc-0.9.12-warnings.patch b/x11-misc/x11vnc/files/x11vnc-0.9.12-warnings.patch
new file mode 100644
index 000000000000..cc3ac32c97d0
--- /dev/null
+++ b/x11-misc/x11vnc/files/x11vnc-0.9.12-warnings.patch
@@ -0,0 +1,57 @@
+diff -ru a/x11vnc/libvncserver/tightvnc-filetransfer/filetransfermsg.c b/x11vnc/libvncserver/tightvnc-filetransfer/filetransfermsg.c
+--- a/x11vnc/libvncserver/tightvnc-filetransfer/filetransfermsg.c	2009-10-07 15:21:23.000000000 -0500
++++ b/x11vnc/libvncserver/tightvnc-filetransfer/filetransfermsg.c	2010-09-11 18:49:58.100074877 -0500
+@@ -393,7 +393,7 @@
+ CreateFileDownloadZeroSizeDataMsg(unsigned long mTime)
+ {
+ 	FileTransferMsg fileDownloadZeroSizeDataMsg;
+-	int length = sz_rfbFileDownloadDataMsg + sizeof(int);
++	int length = sz_rfbFileDownloadDataMsg + sizeof(unsigned long);
+ 	rfbFileDownloadDataMsg *pFDD = NULL;
+ 	char *pFollow = NULL;
+ 	
+diff -ru a/x11vnc/x11vnc/remote.c b/x11vnc/x11vnc/remote.c
+--- a/x11vnc/x11vnc/remote.c	2010-09-09 22:46:48.000000000 -0500
++++ b/x11vnc/x11vnc/remote.c	2010-09-11 18:18:37.948074878 -0500
+@@ -5825,7 +5825,7 @@
+ 		}
+ 		if (!strcmp(p, "vncdisplay")) {
+ 			snprintf(buf, bufn, "aro=%s:%s", p,
+-			    NONUL(vnc_desktop_name));
++			    vnc_desktop_name);
+ 			goto qry;
+ 		}
+ 		if (!strcmp(p, "icon_mode")) {
+@@ -6027,7 +6027,7 @@
+ 		if (!strcmp(p, "h") || !strcmp(p, "help") ||
+ 		    !strcmp(p, "V") || !strcmp(p, "version") ||
+ 		    !strcmp(p, "lastmod")) {
+-			snprintf(buf, bufn, "aro=%s:%s", p, NONUL(lastmod));
++			snprintf(buf, bufn, "aro=%s:%s", p, lastmod);
+ 			goto qry;
+ 		}
+ 		if (!strcmp(p, "bg")) {
+diff -ru a/x11vnc/x11vnc/sslhelper.c b/x11vnc/x11vnc/sslhelper.c
+--- a/x11vnc/x11vnc/sslhelper.c	2010-09-09 22:46:48.000000000 -0500
++++ b/x11vnc/x11vnc/sslhelper.c	2010-09-11 18:19:42.436074878 -0500
+@@ -4004,7 +4004,7 @@
+ 				strncpy(last_get, rcookie, 100);
+ 				if (db) fprintf(stderr, "last_get: '%s'\n", last_get);
+ 			}
+-			if (rcookie && strstr(rcookie, "VncViewer.class")) {
++			if (strstr(rcookie, "VncViewer.class")) {
+ 				rfbLog("\n");
+ 				rfbLog("helper[%d]:\n", pid);
+ 				rfbLog("***********************************************************\n");
+diff -ru a/x11vnc/x11vnc/userinput.c b/x11vnc/x11vnc/userinput.c
+--- a/x11vnc/x11vnc/userinput.c	2010-09-09 22:46:48.000000000 -0500
++++ b/x11vnc/x11vnc/userinput.c	2010-09-11 18:20:29.692074878 -0500
+@@ -1305,7 +1305,7 @@
+ 	int font_size = 15;
+ 	int win_y, scr_y, loc_cut = 4*font_size, y_cut = 10*font_size;
+ 	
+-	if (!xrecord_set_by_keys || !xrecord_name_info) {
++	if (!xrecord_set_by_keys) {
+ 		return 0;
+ 	}
+ 	if (xrecord_name_info[0] == '\0') {
diff --git a/x11-misc/x11vnc/x11vnc-0.9.10.ebuild b/x11-misc/x11vnc/x11vnc-0.9.10.ebuild
index c1138a840d47..4116649f5c08 100644
--- a/x11-misc/x11vnc/x11vnc-0.9.10.ebuild
+++ b/x11-misc/x11vnc/x11vnc-0.9.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/x11vnc-0.9.10.ebuild,v 1.3 2010/08/28 10:38:02 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/x11vnc-0.9.10.ebuild,v 1.4 2010/09/25 20:18:14 swegener Exp $
 
 EAPI="2"
 
@@ -48,7 +48,9 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.9.11-rename-pointer.patch
+	epatch \
+		"${FILESDIR}"/${PN}-0.9.11-rename-pointer.patch \
+		"${FILESDIR}"/${PN}-0.9.12-warnings.patch
 }
 
 src_configure() {
diff --git a/x11-misc/x11vnc/x11vnc-0.9.11.ebuild b/x11-misc/x11vnc/x11vnc-0.9.11.ebuild
index 6c00ece42b8b..e48bafd3f321 100644
--- a/x11-misc/x11vnc/x11vnc-0.9.11.ebuild
+++ b/x11-misc/x11vnc/x11vnc-0.9.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/x11vnc-0.9.11.ebuild,v 1.2 2010/08/28 11:40:05 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/x11vnc-0.9.11.ebuild,v 1.3 2010/09/25 20:18:14 swegener Exp $
 
 EAPI="2"
 
@@ -48,7 +48,9 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-rename-pointer.patch
+	epatch \
+		"${FILESDIR}"/${P}-rename-pointer.patch \
+		"${FILESDIR}"/${PN}-0.9.12-warnings.patch
 }
 
 src_configure() {
diff --git a/x11-misc/x11vnc/x11vnc-0.9.12.ebuild b/x11-misc/x11vnc/x11vnc-0.9.12.ebuild
index 916959d53767..4e3edec40b33 100644
--- a/x11-misc/x11vnc/x11vnc-0.9.12.ebuild
+++ b/x11-misc/x11vnc/x11vnc-0.9.12.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/x11vnc-0.9.12.ebuild,v 1.1 2010/09/11 16:13:17 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/x11vnc-0.9.12.ebuild,v 1.2 2010/09/25 20:18:14 swegener Exp $
 
 EAPI="2"
 
+inherit eutils
+
 DESCRIPTION="A VNC server for real X displays"
 HOMEPAGE="http://www.karlrunge.com/x11vnc/"
 SRC_URI="mirror://sourceforge/libvncserver/${P}.tar.gz"
@@ -45,6 +47,10 @@ pkg_setup() {
 	fi
 }
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-warnings.patch
+}
+
 src_configure() {
 	econf \
 		$(use_with system-libvncserver) \
diff --git a/x11-misc/x11vnc/x11vnc-0.9.9.ebuild b/x11-misc/x11vnc/x11vnc-0.9.9.ebuild
index f839504705ad..2e26c78ad817 100644
--- a/x11-misc/x11vnc/x11vnc-0.9.9.ebuild
+++ b/x11-misc/x11vnc/x11vnc-0.9.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/x11vnc-0.9.9.ebuild,v 1.11 2010/08/28 10:38:02 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/x11vnc-0.9.9.ebuild,v 1.12 2010/09/25 20:18:14 swegener Exp $
 
 EAPI="2"
 
@@ -48,7 +48,9 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.9.11-rename-pointer.patch
+	epatch \
+		"${FILESDIR}"/${PN}-0.9.11-rename-pointer.patch \
+		"${FILESDIR}"/${PN}-0.9.12-warnings.patch
 }
 
 src_configure() {