Hello community, here is the log from the commit of package kdiff3 for openSUSE:Factory checked in at 2013-05-16 16:50:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdiff3 (Old) and /work/SRC/openSUSE:Factory/.kdiff3.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdiff3" Changes: -------- --- /work/SRC/openSUSE:Factory/kdiff3/kdiff3.changes 2012-12-03 09:42:38.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdiff3.new/kdiff3.changes 2013-05-16 16:50:15.000000000 +0200 @@ -1,0 +2,7 @@ +Thu May 2 12:47:34 BST 2013 - [email protected] + +- Add kdiff3-fix-save-relative-path.patch: fix saving merged + files. Patch is from: https://bugs.archlinux.org/task/31813 + and is already upstream. + +------------------------------------------------------------------- New: ---- kdiff3-fix-save-relative-path.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdiff3.spec ++++++ --- /var/tmp/diff_new_pack.yPJEeo/_old 2013-05-16 16:50:15.000000000 +0200 +++ /var/tmp/diff_new_pack.yPJEeo/_new 2013-05-16 16:50:15.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package kdiff3 # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,6 +24,8 @@ Group: Development/Tools/Version Control Url: http://kdiff3.sourceforge.net/ Source0: %{name}-%{version}.tar.gz +# PATCH-FIX-UPSTREAM kdiff3-fix-save-relative-path.patch +Patch0: kdiff3-fix-save-relative-path.patch BuildRequires: fdupes BuildRequires: kdebase4-workspace-devel BuildRequires: libkonq-devel @@ -48,6 +50,7 @@ %lang_package %prep %setup -q +%patch0 -p2 %build %cmake_kde4 -d build ++++++ kdiff3-fix-save-relative-path.patch ++++++ >From 23ad423e4255c80ee22b269f73e20333f7c06678 Mon Sep 17 00:00:00 2001 From: joachim99 <[email protected]> Date: Sat, 22 Sep 2012 23:02:12 +0200 Subject: [PATCH] - Fix for saving files on KDE with relative path specified via command line option -o. Signed-off-by: joachim99 <[email protected]> --- kdiff3/src-QT4/fileaccess.cpp | 18 ++++++++++++++---- kdiff3/src-QT4/kdiff3.cpp | 2 ++ 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/kdiff3/src-QT4/fileaccess.cpp b/kdiff3/src-QT4/fileaccess.cpp index 134fc26..b6e01f0 100644 --- a/kdiff3/src-QT4/fileaccess.cpp +++ b/kdiff3/src-QT4/fileaccess.cpp @@ -183,7 +183,8 @@ static QString nicePath( const QFileInfo& fi ) 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 @@ QString FileAccess::absoluteFilePath() const 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 @@ bool FileAccessJobHandler::rename( const QString& dest ) 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 @@ bool FileAccessJobHandler::listDir( t_DirectoryList* pDirList, bool bRecursive, &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()) ); diff --git a/kdiff3/src-QT4/kdiff3.cpp b/kdiff3/src-QT4/kdiff3.cpp index 165602f..de7cc9c 100644 --- a/kdiff3/src-QT4/kdiff3.cpp +++ b/kdiff3/src-QT4/kdiff3.cpp @@ -211,6 +211,8 @@ KDiff3App::KDiff3App(QWidget* pParent, const char* /*name*/, KDiff3Part* pKDiff3 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"); -- 1.7.12.2 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
