From brueffer@maquis.hitnet.rwth-aachen.de  Mon Feb  9 04:57:02 2004
Return-Path: <brueffer@maquis.hitnet.rwth-aachen.de>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 6B6E216A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Mon,  9 Feb 2004 04:57:02 -0800 (PST)
Received: from ms-dienst.rz.rwth-aachen.de (ms-2.rz.RWTH-Aachen.DE [134.130.3.131])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 3EE4443D1D
	for <FreeBSD-gnats-submit@freebsd.org>; Mon,  9 Feb 2004 04:57:02 -0800 (PST)
	(envelope-from brueffer@maquis.hitnet.rwth-aachen.de)
Received: from r220-1 (r220-1.rz.RWTH-Aachen.DE [134.130.3.31])
 by ms-dienst.rz.rwth-aachen.de
 (iPlanet Messaging Server 5.2 HotFix 1.12 (built Feb 13 2003))
 with ESMTP id <0HST002M3IGVTD@ms-dienst.rz.rwth-aachen.de> for
 FreeBSD-gnats-submit@freebsd.org; Mon, 09 Feb 2004 13:53:19 +0100 (MET)
Received: from relay.RWTH-Aachen.DE ([134.130.3.1])
	by r220-1 (MailMonitor for SMTP v1.2.2 ) ; Mon,
 09 Feb 2004 13:53:18 +0100 (MET)
Received: from maquis.hitnet.rwth-aachen.de
 (maquis.hitnet.RWTH-Aachen.DE [137.226.181.137])
	by relay.rwth-aachen.de (8.12.10/8.12.7-1) with ESMTP id i19CrIJC023956	for
 <FreeBSD-gnats-submit@freebsd.org>; Mon, 09 Feb 2004 13:53:18 +0100 (MET)
Received: by maquis.hitnet.rwth-aachen.de (Postfix, from userid 1001)
	id 354631FC; Mon, 09 Feb 2004 13:57:16 +0100 (CET)
Message-Id: <20040209125716.354631FC@maquis.hitnet.rwth-aachen.de>
Date: Mon, 09 Feb 2004 13:57:16 +0100 (CET)
From: Markus Brueffer <brueffer@phoenix-systems.de>
Reply-To: Markus Brueffer <brueffer@phoenix-systems.de>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [maintainer] ftp/kbear: fix build for KDE 3.2
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         62584
>Category:       ports
>Synopsis:       [maintainer] ftp/kbear: fix build for KDE 3.2
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Feb 09 05:00:43 PST 2004
>Closed-Date:    Mon Feb 09 07:22:07 PST 2004
>Last-Modified:  Mon Feb 09 07:22:07 PST 2004
>Originator:     Markus Brueffer
>Release:        FreeBSD 5.2.1-RC i386
>Organization:
>Environment:
System: FreeBSD cheops.phoenix 5.2.1-RC FreeBSD 5.2.1-RC #0: Thu Feb 5 13:59:13 CET 2004 root@cheops.phoenix:/usr/obj/usr/src/sys/CHEOPS i386

>Description:
	ftp/kbear: fix build when KDE 3.2 is installed

>How-To-Repeat:
>Fix:

--- kbear.diff begins here ---
diff -ruN kbear.orig/files/patch-kbearcopyjob.cpp kbear/files/patch-kbearcopyjob.cpp
--- kbear.orig/files/patch-kbearcopyjob.cpp	Thu Jan  1 01:00:00 1970
+++ kbear/files/patch-kbearcopyjob.cpp	Mon Feb  9 13:45:41 2004
@@ -0,0 +1,14 @@
+--- kbear/lib/jobclasses/kbearcopyjob.cpp.orig	Mon Feb  9 13:13:28 2004
++++ kbear/lib/jobclasses/kbearcopyjob.cpp	Mon Feb  9 13:13:56 2004
+@@ -1080,11 +1080,7 @@
+         } else if (m_mode == Move) // Moving a file
+         {
+             KBearFileCopyJob * moveJob = KBearFileCopyJob::file_move( m_destID, m_sourceID, (*it).uSource, (*it).uDest, (*it).permissions, bOverwrite, false, false/*no GUI*/ );
+- #if KDE_VERSION_MINOR < 2
+             moveJob->setSourceSize( (*it).size );
+-  #else
+-           moveJob->setSourceSize64( (*it).size );
+- #endif
+             newjob = moveJob;
+             kdDebug(7007) << "KBearCopyJob::copyNextFile : Moving " << (*it).uSource.prettyURL() << " to " << (*it).uDest.prettyURL() << endl;
+             emit moving( this, (*it).uSource, (*it).uDest );
--- kbear.diff ends here ---



>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: krion 
State-Changed-When: Mon Feb 9 07:22:02 PST 2004 
State-Changed-Why:  
Committed, thanks! 

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