From owner-svn-ports-all@FreeBSD.ORG Thu Jun 5 17:50:02 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 33EA25C5; Thu, 5 Jun 2014 17:50:02 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 20B3B27B4; Thu, 5 Jun 2014 17:50:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s55Ho1hx088825; Thu, 5 Jun 2014 17:50:01 GMT (envelope-from bdrewery@svn.freebsd.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s55Ho1QT088821; Thu, 5 Jun 2014 17:50:01 GMT (envelope-from bdrewery@svn.freebsd.org) Message-Id: <201406051750.s55Ho1QT088821@svn.freebsd.org> From: Bryan Drewery Date: Thu, 5 Jun 2014 17:50:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r356654 - in head/textproc/kdiff3: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Jun 2014 17:50:02 -0000 Author: bdrewery Date: Thu Jun 5 17:50:01 2014 New Revision: 356654 URL: http://svnweb.freebsd.org/changeset/ports/356654 QAT: https://qat.redports.org/buildarchive/r356654/ Log: - Fix saving output with -o when using relative paths PR: 190158 Submitted by: emaste Approved by: luca.pizzamiglio@gmail.com (maintainer) Obtained from: http://sourceforge.net/p/kdiff3/code/ci/23ad423e4255c80ee22b269f73e20333f7c06678/ MFH: 2014Q2 Added: head/textproc/kdiff3/files/ head/textproc/kdiff3/files/patch-src-QT4__fileaccess.cpp (contents, props changed) head/textproc/kdiff3/files/patch-src-QT4__kdiff3.cpp (contents, props changed) Modified: head/textproc/kdiff3/Makefile Modified: head/textproc/kdiff3/Makefile ============================================================================== --- head/textproc/kdiff3/Makefile Thu Jun 5 17:14:33 2014 (r356653) +++ head/textproc/kdiff3/Makefile Thu Jun 5 17:50:01 2014 (r356654) @@ -3,8 +3,7 @@ PORTNAME= kdiff3 PORTVERSION= 0.9.97 -#PORTREVISION= 0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc kde MASTER_SITES= SF Added: head/textproc/kdiff3/files/patch-src-QT4__fileaccess.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/kdiff3/files/patch-src-QT4__fileaccess.cpp Thu Jun 5 17:50:01 2014 (r356654) @@ -0,0 +1,48 @@ +--- ./src-QT4/fileaccess.cpp.orig 2012-08-10 16:51:08.000000000 -0500 ++++ ./src-QT4/fileaccess.cpp 2014-06-05 09:45:18.675613156 -0500 +@@ -183,7 +183,8 @@ + + void FileAccess::setFile( const QFileInfo& fi, FileAccess* pParent ) + { +- m_filePath = nicePath( fi.filePath() ); // remove "./" at start ++ m_filePath = pParent == 0 ? fi.absoluteFilePath() : ++ nicePath( fi.filePath() ); // remove "./" at start + + m_bSymLink = fi.isSymLink(); + if ( m_bSymLink || (!m_bExists && m_filePath.contains("@@") ) ) +@@ -566,7 +567,16 @@ + if ( parent() != 0 ) + return parent()->absoluteFilePath() + "/" + m_filePath; + else +- return m_filePath; ++ { ++ if ( m_filePath.isEmpty() ) ++ return QString(); ++ ++ QFileInfo fi( m_filePath ); ++ if ( fi.isAbsolute() ) ++ return m_filePath; ++ else ++ return fi.absoluteFilePath(); // Probably never reached ++ } + } // Full abs path + + // Just the name-part of the path, without parent directories +@@ -1184,7 +1194,7 @@ + m_bSuccess = false; + KIO::FileCopyJob* pJob = KIO::file_move( m_pFileAccess->url(), kurl, permissions, KIO::HideProgressInfo ); + connect( pJob, SIGNAL(result(KJob*)), this, SLOT(slotSimpleJobResult(KJob*))); +- connect( pJob, SIGNAL(percent(KJob*,unsigned long)), this, SLOT(slotPercent(KJob*, unsigned long))); ++ connect( pJob, SIGNAL(percent(KJob*,unsigned long)), &pp, SLOT(slotPercent(KJob*, unsigned long))); + + ProgressProxy::enterEventLoop( pJob, + i18n("Renaming file: %1 -> %2",m_pFileAccess->prettyAbsPath(),dest) ); +@@ -1673,7 +1683,7 @@ + &pp, SLOT( slotListDirInfoMessage(KJob*, const QString&) )); + + // This line makes the transfer via fish unreliable.:-( +- //connect( pListJob, SIGNAL(percent(KJob*,unsigned long)), this, SLOT(slotPercent(KJob*, unsigned long))); ++ //connect( pListJob, SIGNAL(percent(KJob*,unsigned long)), &pp, SLOT(slotPercent(KJob*, unsigned long))); + + ProgressProxy::enterEventLoop( pListJob, + i18n("Listing directory: %1",m_pFileAccess->prettyAbsPath()) ); Added: head/textproc/kdiff3/files/patch-src-QT4__kdiff3.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/kdiff3/files/patch-src-QT4__kdiff3.cpp Thu Jun 5 17:50:01 2014 (r356654) @@ -0,0 +1,11 @@ +--- ./src-QT4/kdiff3.cpp.orig 2012-07-14 05:27:14.000000000 -0500 ++++ ./src-QT4/kdiff3.cpp 2014-06-05 09:45:18.677611475 -0500 +@@ -210,6 +210,8 @@ + m_outputFilename = args->getOption("output"); + if ( m_outputFilename.isEmpty() ) + m_outputFilename = args->getOption("out"); ++ if ( ! m_outputFilename.isEmpty() ) ++ m_outputFilename = FileAccess( m_outputFilename, true ).absoluteFilePath(); + } + + m_bAutoFlag = args!=0 && args->isSet("auto");