From avleeuwen@t-indiv5-88.athome.tue.nl  Tue Nov 19 06:40:46 2002
Return-Path: <avleeuwen@t-indiv5-88.athome.tue.nl>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id B1E6837B401
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 19 Nov 2002 06:40:46 -0800 (PST)
Received: from t-indiv5-88.athome.tue.nl (t-indiv5-88.athome.tue.nl [131.155.241.88])
	by mx1.FreeBSD.org (Postfix) with SMTP id 6537E43E3B
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 19 Nov 2002 06:40:45 -0800 (PST)
	(envelope-from avleeuwen@t-indiv5-88.athome.tue.nl)
Received: (qmail 67555 invoked by uid 1001); 19 Nov 2002 14:41:15 -0000
Message-Id: <20021119144115.67554.qmail@t-indiv5-88.athome.tue.nl>
Date: 19 Nov 2002 14:41:15 -0000
From: avleeuwen@piwebs.com
Reply-To: avleeuwen@piwebs.com
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: net/kopete: Fix for building with -CURRENT and / or KDE 3.0.5	
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         45481
>Category:       ports
>Synopsis:       net/kopete: Fix for building with -CURRENT and / or KDE 3.0.5
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    arved
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Nov 19 06:50:01 PST 2002
>Closed-Date:    Wed Nov 20 07:13:59 PST 2002
>Last-Modified:  Wed Nov 20 07:13:59 PST 2002
>Originator:     Arjan van Leeuwen
>Release:        FreeBSD 4.6.2-RELEASE-p2 i386
>Organization:
>Environment:
System: FreeBSD thuis.piwebs.com 4.6.2-RELEASE-p2 FreeBSD 4.6.2-RELEASE-p2 #0: Thu Oct 3 22:42:28 CEST 2002 avleeuwen@thuis.piwebs.com:/usr/obj/usr/src/sys/THUIS i386


	
>Description:
At the moment, Kopete doesn't build with the newest KDE ports (3.0.5). These patches fix that. It also doesn't build with -CURRENT - these patches fix that too. Kopete now builds on both -STABLE and -CURRENT, with KDE 3.0.5 or lower and KDE-CVS.
>How-To-Repeat:
Build net/kopete on -CURRENT or with KDE 3.0.5, or both
>Fix:
This shell archive contains patches to be placed in the files/ directory of the Kopete port.

--begin patches--
# This is a shell archive.  Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file".  Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
#	patch-kopete-dcchandler.cpp
#	patch-kopete-icqchangestatus.cpp
#	patch-kopete-ircmessage.cpp
#	patch-kopete-kopetechatwindow.cpp
#	patch-kopete-kopetemetacontactlvi.cpp
#	patch-kopete-service.cpp
#
echo x - patch-kopete-dcchandler.cpp
sed 's/^X//' >patch-kopete-dcchandler.cpp << 'END-of-patch-kopete-dcchandler.cpp'
X*** kopete/protocols/irc/libkirc/dcchandler.cpp.orig	Tue Nov 19 14:09:30 2002
X--- kopete/protocols/irc/libkirc/dcchandler.cpp	Tue Nov 19 15:08:59 2002
X***************
X*** 33,39 ****
X  #include <sys/types.h>
X  #endif
X  #include <inttypes.h>
X! #ifndef __FreeBSD__
X  #  include <netinet/in.h>
X  #endif
X  #include <unistd.h>
X--- 33,43 ----
X  #include <sys/types.h>
X  #endif
X  #include <inttypes.h>
X! #ifdef __FreeBSD__
X! #  if __FreeBSD__ >= 5
X! #    include <netinet/in.h>
X! #  endif
X! #else
X  #  include <netinet/in.h>
X  #endif
X  #include <unistd.h>
END-of-patch-kopete-dcchandler.cpp
echo x - patch-kopete-icqchangestatus.cpp
sed 's/^X//' >patch-kopete-icqchangestatus.cpp << 'END-of-patch-kopete-icqchangestatus.cpp'
X*** kopete/protocols/icq_new/icqchangestatus.cpp.orig	Tue Nov 19 13:55:39 2002
X--- kopete/protocols/icq_new/icqchangestatus.cpp	Tue Nov 19 13:56:06 2002
X***************
X*** 23,29 ****
X  
X  #include <klocale.h>
X  #include <kdeversion.h>
X! #if KDE_VERSION < 305
X  #include <qtextedit.h>
X  #else
X  #include <ktextedit.h>
X--- 23,29 ----
X  
X  #include <klocale.h>
X  #include <kdeversion.h>
X! #if KDE_VERSION < 306
X  #include <qtextedit.h>
X  #else
X  #include <ktextedit.h>
X***************
X*** 45,51 ****
X  		box );
X  	lb->setAlignment( WordBreak );
X  
X! #if KDE_VERSION < 305
X  	m_edit = new QTextEdit( box );
X  #else
X  	m_edit = new KTextEdit( box );
X--- 45,51 ----
X  		box );
X  	lb->setAlignment( WordBreak );
X  
X! #if KDE_VERSION < 306
X  	m_edit = new QTextEdit( box );
X  #else
X  	m_edit = new KTextEdit( box );
END-of-patch-kopete-icqchangestatus.cpp
echo x - patch-kopete-ircmessage.cpp
sed 's/^X//' >patch-kopete-ircmessage.cpp << 'END-of-patch-kopete-ircmessage.cpp'
X*** kopete/protocols/irc/ircmessage.cpp.orig	Tue Nov 19 14:22:08 2002
X--- kopete/protocols/irc/ircmessage.cpp	Tue Nov 19 14:22:31 2002
X***************
X*** 52,58 ****
X  	KGlobal::config()->setGroup("IRC");
X  	
X  	// Add markup to URLs, only works with KDE > 3.0.x
X! #if KDE_VERSION >= 305
X  	message = KStringHandler::tagURLs(message);
X  #endif
X  
X--- 52,58 ----
X  	KGlobal::config()->setGroup("IRC");
X  	
X  	// Add markup to URLs, only works with KDE > 3.0.x
X! #if KDE_VERSION >= 306
X  	message = KStringHandler::tagURLs(message);
X  #endif
X  
END-of-patch-kopete-ircmessage.cpp
echo x - patch-kopete-kopetechatwindow.cpp
sed 's/^X//' >patch-kopete-kopetechatwindow.cpp << 'END-of-patch-kopete-kopetechatwindow.cpp'
X*** kopete/libkopete/ui/kopetechatwindow.cpp.orig	Tue Nov 19 13:09:14 2002
X--- kopete/libkopete/ui/kopetechatwindow.cpp	Tue Nov 19 13:11:16 2002
X***************
X*** 39,45 ****
X  #include "emoticonbutton.h"
X  
X  #include <kdeversion.h>
X! #if KDE_VERSION < 305
X  #include <qtextedit.h>
X  #else
X  #include <ktextedit.h>
X--- 39,45 ----
X  #include "emoticonbutton.h"
X  
X  #include <kdeversion.h>
X! #if KDE_VERSION < 306
X  #include <qtextedit.h>
X  #else
X  #include <ktextedit.h>
X***************
X*** 322,328 ****
X  
X  		case KopeteChatWindow::Multi:
X  		{
X! #if KDE_VERSION < 305
X  			m_multiLineEdit = new QTextEdit( this, "multilineedit" );
X  #else
X  			m_multiLineEdit = new KTextEdit( this, "multilineedit" );
X--- 322,328 ----
X  
X  		case KopeteChatWindow::Multi:
X  		{
X! #if KDE_VERSION < 306
X  			m_multiLineEdit = new QTextEdit( this, "multilineedit" );
X  #else
X  			m_multiLineEdit = new KTextEdit( this, "multilineedit" );
END-of-patch-kopete-kopetechatwindow.cpp
echo x - patch-kopete-kopetemetacontactlvi.cpp
sed 's/^X//' >patch-kopete-kopetemetacontactlvi.cpp << 'END-of-patch-kopete-kopetemetacontactlvi.cpp'
X*** kopete/libkopete/ui/kopetemetacontactlvi.cpp.orig	Tue Nov 19 13:28:33 2002
X--- kopete/libkopete/ui/kopetemetacontactlvi.cpp	Tue Nov 19 13:28:50 2002
X***************
X*** 49,55 ****
X  #include "systemtray.h"
X  
X  
X! #if KDE_VERSION >= 305
X  #include <kpassivepopup.h>
X  #endif
X  
X--- 49,55 ----
X  #include "systemtray.h"
X  
X  
X! #if KDE_VERSION >= 306
X  #include <kpassivepopup.h>
X  #endif
X  
X***************
X*** 315,321 ****
X  	if ( m_metaContact->status() == KopeteMetaContact::Online )
X  	{
X  		KNotifyClient::event("kopete_online");
X! 		#if KDE_VERSION >= 305
X  		if ( KopetePrefs::prefs()->notifyOnline() )
X  			KPassivePopup::message(i18n("%1 is now %2!").arg(m_metaContact->displayName()).arg(m_metaContact->statusString()), kopeteapp->systemTray());
X  		#endif
X--- 315,321 ----
X  	if ( m_metaContact->status() == KopeteMetaContact::Online )
X  	{
X  		KNotifyClient::event("kopete_online");
X! 		#if KDE_VERSION >= 306
X  		if ( KopetePrefs::prefs()->notifyOnline() )
X  			KPassivePopup::message(i18n("%1 is now %2!").arg(m_metaContact->displayName()).arg(m_metaContact->statusString()), kopeteapp->systemTray());
X  		#endif
END-of-patch-kopete-kopetemetacontactlvi.cpp
echo x - patch-kopete-service.cpp
sed 's/^X//' >patch-kopete-service.cpp << 'END-of-patch-kopete-service.cpp'
X*** kopete/protocols/icq_new/libicq/service.cpp.orig	Tue Nov 19 13:42:26 2002
X--- kopete/protocols/icq_new/libicq/service.cpp	Tue Nov 19 13:41:52 2002
X***************
X*** 301,314 ****
X      time(&now);
X      Buffer b;
X      b << (char)3;
X!     b.pack(now);
X      b.pack((unsigned short)0);
X      b.pack((unsigned short)1);
X      b.pack((unsigned short)1);
X      b.pack((char*)SHARED_FILES_SIGN, 16);
X      b << (char)4 << (unsigned short)1;
X      b.pack((unsigned long)(bState ? 1 : 0));
X!     b.pack(now);
X      b.pack((unsigned long)0);
X      b.pack((unsigned short)1);
X      sendUpdate(b);
X--- 301,314 ----
X      time(&now);
X      Buffer b;
X      b << (char)3;
X!     b.pack((unsigned long)now);
X      b.pack((unsigned short)0);
X      b.pack((unsigned short)1);
X      b.pack((unsigned short)1);
X      b.pack((char*)SHARED_FILES_SIGN, 16);
X      b << (char)4 << (unsigned short)1;
X      b.pack((unsigned long)(bState ? 1 : 0));
X!     b.pack((unsigned long)now);
X      b.pack((unsigned long)0);
X      b.pack((unsigned short)1);
X      sendUpdate(b);
END-of-patch-kopete-service.cpp
exit
--this is the end--

>Release-Note:
>Audit-Trail:

From: Adam Weinberger <adamw@FreeBSD.ORG>
To: avleeuwen@piwebs.com
Cc: FreeBSD-gnats-submit@FreeBSD.ORG
Subject: Re: ports/45481: net/kopete: Fix for building with -CURRENT and / or KDE 3.0.5
Date: Tue, 19 Nov 2002 07:24:19 -0800

 This is applicable to -STABLE too. Well, at least the
 k vs. q widget changes.
 
 # Adam

From: Arjan van Leeuwen <avleeuwen@piwebs.com>
To: Adam Weinberger <adamw@FreeBSD.ORG>
Cc: FreeBSD-gnats-submit@FreeBSD.ORG
Subject: Re: ports/45481: net/kopete: Fix for building with -CURRENT and / or KDE 3.0.5
Date: Tue, 19 Nov 2002 16:33:11 +0100

 I noticed. That's why I named it 'building with -CURRENT and / _or_ KDE 3=
 =2E0.5'=20
 :).
 
 On Tuesday 19 November 2002 16:24, Adam Weinberger wrote:
 > This is applicable to -STABLE too. Well, at least the
 > k vs. q widget changes.
 >
 > # Adam
 
Responsible-Changed-From-To: freebsd-ports->arved 
Responsible-Changed-By: arved 
Responsible-Changed-When: Wed Nov 20 01:52:04 PST 2002 
Responsible-Changed-Why:  
I'll handle this 

http://www.freebsd.org/cgi/query-pr.cgi?pr=45481 
State-Changed-From-To: open->closed 
State-Changed-By: arved 
State-Changed-When: Wed Nov 20 07:13:46 PST 2002 
State-Changed-Why:  
Committed, thanks 

http://www.freebsd.org/cgi/query-pr.cgi?pr=45481 
>Unformatted:
