www-client/httrack: Fix "severe warnings"

(Portage version: 2.1.11.62/cvs/Linux x86_64, signed Manifest commit with key 0x401A1600)

3 files changed, 48 insertions, 2 deletions

diff --git a/www-client/httrack/ChangeLog b/www-client/httrack/ChangeLog
index 3455e2bdab1a..9a5031832c60 100644
--- a/www-client/httrack/ChangeLog
+++ b/www-client/httrack/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/httrack
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/httrack/ChangeLog,v 1.48 2013/05/02 23:59:34 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/httrack/ChangeLog,v 1.49 2013/05/03 22:29:11 sping Exp $
+
+  03 May 2013; Sebastian Pipping <sping@gentoo.org> httrack-3.47.7.ebuild,
+  +files/httrack-3.47.7-warnings.patch:
+  Fix "severe warnings" QA complaint
 
 *httrack-3.47.7 (02 May 2013)
 
diff --git a/www-client/httrack/files/httrack-3.47.7-warnings.patch b/www-client/httrack/files/httrack-3.47.7-warnings.patch
new file mode 100644
index 000000000000..9f6ba964800b
--- /dev/null
+++ b/www-client/httrack/files/httrack-3.47.7-warnings.patch
@@ -0,0 +1,41 @@
+From 80d9d1b3003ff79ddee26e9fd09eb1b746b6bf5c Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sat, 4 May 2013 00:14:32 +0200
+Subject: [PATCH] Fix GCC warnings
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+httrack.c: In function ‘htsshow_loop’:
+httrack.c:446:21: warning: the address of ‘tempo’ will always evaluate as ‘true’
+httrack.c:480:19: warning: the address of ‘s’ will always evaluate as ‘true’
+httrack.c:484:19: warning: the address of ‘s’ will always evaluate as ‘true’
+---
+ src/httrack.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/httrack.h b/src/httrack.h
+index 8b049a1..90ca9d5 100644
+--- a/src/httrack.h
++++ b/src/httrack.h
+@@ -129,7 +129,7 @@ extern FILE* ioinfo;
+ } while(0)
+ #define strncatbuff(A, B, N) do { \
+   assertf( (A) != NULL ); \
+-  if ( ! (B) ) { assertf( 0 ); } \
++  if ( (B) == NULL ) { assertf( 0 ); } \
+   if (htsMemoryFastXfr) { \
+     if (sizeof(A) != sizeof(char*)) { \
+       (A)[sizeof(A) - 1] = '\0'; \
+@@ -158,7 +158,7 @@ extern FILE* ioinfo;
+ } while(0)
+ #define strcpybuff(A, B) do { \
+   assertf( (A) != NULL ); \
+-  if ( ! (B) ) { assertf( 0 ); } \
++  if ( (B) == NULL ) { assertf( 0 ); } \
+   if (htsMemoryFastXfr) { \
+     if (sizeof(A) != sizeof(char*)) { \
+       (A)[sizeof(A) - 1] = '\0'; \
+-- 
+1.8.1.5
+
diff --git a/www-client/httrack/httrack-3.47.7.ebuild b/www-client/httrack/httrack-3.47.7.ebuild
index c4154ad05219..6acee0d6a94b 100644
--- a/www-client/httrack/httrack-3.47.7.ebuild
+++ b/www-client/httrack/httrack-3.47.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/httrack/httrack-3.47.7.ebuild,v 1.1 2013/05/02 23:59:34 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/httrack/httrack-3.47.7.ebuild,v 1.2 2013/05/03 22:29:11 sping Exp $
 
 EAPI="4"
 
@@ -25,6 +25,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-3.44.1+zlib-1.2.5.1.patch
 	epatch "${FILESDIR}"/${PN}-3.45.4-htmldir.patch
 	epatch "${FILESDIR}"/${PN}-3.47.7-cflags.patch
+	epatch "${FILESDIR}"/${PN}-3.47.7-warnings.patch
 	eautoreconf
 }