ports/114024: news/klibido: fix build breakage under gcc 4.2

[Conrad J. Sabatier]

>Number:         114024
>Category:       ports
>Synopsis:       news/klibido: fix build breakage under gcc 4.2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jun 26 04:30:01 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Conrad J. Sabatier
>Release:        FreeBSD 7.0-CURRENT amd64
>Organization:
none
>Environment:
System: FreeBSD serene.no-ip.org 7.0-CURRENT FreeBSD 7.0-CURRENT #0: Sun Jun 24 13:05:58 CDT 2007 root at serene.no-ip.org:/usr/obj/usr/src/sys/CUSTOM amd64


>Description:
	Fix news/klibido to build under gcc 4.2, create new set of patch 
	files using "make makepatch" to conform to the new way of naming 
	patches (deleting the old patch file in the process)
>How-To-Repeat:
	Building under gcc 4.2 with old version would cause several 
	C++ -related build errors due to unnecessary over-qualification 
	of some variables
>Fix:
	patch included below

--- klibido.diff begins here ---
diff -urN --exclude=CVS klibido.orig/Makefile klibido/Makefile
--- klibido.orig/Makefile	2007-05-19 15:20:19.000000000 -0500
+++ klibido/Makefile	2007-06-25 23:16:05.000000000 -0500
@@ -7,7 +7,7 @@
 
 PORTNAME=		klibido
 PORTVERSION=		0.2.5
-PORTREVISION=		2
+PORTREVISION=		3
 CATEGORIES=		news
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff -urN --exclude=CVS klibido.orig/files/patch-src__addserver.cpp klibido/files/patch-src__addserver.cpp
--- klibido.orig/files/patch-src__addserver.cpp	1969-12-31 18:00:00.000000000 -0600
+++ klibido/files/patch-src__addserver.cpp	2007-06-25 23:07:26.000000000 -0500
@@ -0,0 +1,20 @@
+--- ./src/addserver.cpp.orig	2006-01-06 09:44:19.000000000 -0600
++++ ./src/addserver.cpp	2007-06-25 23:04:41.000000000 -0500
+@@ -27,7 +27,7 @@
+ 	buttonOk->setIconSet(KGlobal::iconLoader()->loadIcon("button_ok", KIcon::Small, 0, false));
+ 	buttonCancel->setIconSet(KGlobal::iconLoader()->loadIcon("button_cancel", KIcon::Small, 0, false));
+ 	m_priorityInput->setRange(1,10,1,false);
+-	m_threadInput->setRange(1,10,1,false);
++	m_threadInput->setRange(1,20,1,false);
+ 	m_timeoutInput->setRange(60,600,5,false);
+ 	m_threadTimeoutInput->setRange(1,30,1,false);
+ 	validator=new QIntValidator(1,65535,this);
+@@ -90,7 +90,7 @@
+ 	buttonOk->setIconSet(KGlobal::iconLoader()->loadIcon("button_ok", KIcon::Small, 0, false));
+ 	buttonCancel->setIconSet(KGlobal::iconLoader()->loadIcon("button_cancel", KIcon::Small, 0, false));
+ 	m_priorityInput->setRange(1,10,1,false);
+-	m_threadInput->setRange(1,10,1,false);
++	m_threadInput->setRange(1,20,1,false);
+ 	m_timeoutInput->setRange(60,600,5,false);
+ 	m_threadTimeoutInput->setRange(1,30,1,false);
+ 	validator=new QIntValidator(1,65535,this);
diff -urN --exclude=CVS klibido.orig/files/patch-src__nntpthreadsocket.h klibido/files/patch-src__nntpthreadsocket.h
--- klibido.orig/files/patch-src__nntpthreadsocket.h	1969-12-31 18:00:00.000000000 -0600
+++ klibido/files/patch-src__nntpthreadsocket.h	2007-06-25 23:07:26.000000000 -0500
@@ -0,0 +1,11 @@
+--- ./src/nntpthreadsocket.h.orig	2007-06-25 23:05:29.000000000 -0500
++++ ./src/nntpthreadsocket.h	2007-06-25 23:06:23.000000000 -0500
+@@ -234,7 +234,7 @@
+ 		bool getHead(QString group, int artnum); //Unimplemented
+ 		int m_getError() {return error;}
+     	const char *m_getErrorDesc() {return (const char *) errorString;}
+-		char * NntpThreadSocket::m_findEndLine( char * start, char * end );
++		char * m_findEndLine( char * start, char * end );
+ 		void setHost(NntpHost *nh);
+ 		bool m_sendCmd( QString& cmd, int response );
+ 		QTime prevTime, currentTime;
diff -urN --exclude=CVS klibido.orig/files/patch-src__yydecoder.h klibido/files/patch-src__yydecoder.h
--- klibido.orig/files/patch-src__yydecoder.h	1969-12-31 18:00:00.000000000 -0600
+++ klibido/files/patch-src__yydecoder.h	2007-06-25 23:07:26.000000000 -0500
@@ -0,0 +1,11 @@
+--- ./src/yydecoder.h.orig	2007-06-25 23:05:38.000000000 -0500
++++ ./src/yydecoder.h	2007-06-25 23:06:50.000000000 -0500
+@@ -87,7 +87,7 @@
+ 	
+ private:
+ 	
+-	inline void yyDecoder::charCRC(const unsigned char *c);
++	inline void charCRC(const unsigned char *c);
+ 	
+ 	QStringList m_fileParts;
+ 	QStringList::Iterator fileIterator;
diff -urN --exclude=CVS klibido.orig/files/patch-src_addserver.cpp klibido/files/patch-src_addserver.cpp
--- klibido.orig/files/patch-src_addserver.cpp	2007-01-13 09:28:12.000000000 -0600
+++ klibido/files/patch-src_addserver.cpp	1969-12-31 18:00:00.000000000 -0600
@@ -1,20 +0,0 @@
---- src/addserver.cpp.orig	Tue Dec 12 20:12:32 2006
-+++ src/addserver.cpp	Tue Dec 12 20:13:17 2006
-@@ -27,7 +27,7 @@
- 	buttonOk->setIconSet(KGlobal::iconLoader()->loadIcon("button_ok", KIcon::Small, 0, false));
- 	buttonCancel->setIconSet(KGlobal::iconLoader()->loadIcon("button_cancel", KIcon::Small, 0, false));
- 	m_priorityInput->setRange(1,10,1,false);
--	m_threadInput->setRange(1,10,1,false);
-+	m_threadInput->setRange(1,20,1,false);
- 	m_timeoutInput->setRange(60,600,5,false);
- 	m_threadTimeoutInput->setRange(1,30,1,false);
- 	validator=new QIntValidator(1,65535,this);
-@@ -90,7 +90,7 @@
- 	buttonOk->setIconSet(KGlobal::iconLoader()->loadIcon("button_ok", KIcon::Small, 0, false));
- 	buttonCancel->setIconSet(KGlobal::iconLoader()->loadIcon("button_cancel", KIcon::Small, 0, false));
- 	m_priorityInput->setRange(1,10,1,false);
--	m_threadInput->setRange(1,10,1,false);
-+	m_threadInput->setRange(1,20,1,false);
- 	m_timeoutInput->setRange(60,600,5,false);
- 	m_threadTimeoutInput->setRange(1,30,1,false);
- 	validator=new QIntValidator(1,65535,this);
--- klibido.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: