diff options
| author |   Michael Palimaka <kensington@gentoo.org> | 2016-07-21 05:58:40 +1000 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2016-07-21 06:03:20 +1000 |
| commit | e5a0398b8ea72f146c06a4b208ceef93587352a5 (patch) | |
| tree | 6b6e54cd2e0499e117e2f6d8a43c0b22a264bbd4 /kde-misc/kdiff3/files | |
| parent | sci-physics/hoomd-blue: drop keywords (diff) | |
| download | gentoo-e5a0398b8ea72f146c06a4b208ceef93587352a5.tar.gz gentoo-e5a0398b8ea72f146c06a4b208ceef93587352a5.tar.bz2 gentoo-e5a0398b8ea72f146c06a4b208ceef93587352a5.zip | |
kde-misc/kdiff3: restore 0.9.97-r2
This reverts commit 047c73f0b2503ad56a6de2ef46ec6b2df727d94b.
Gentoo-bug: 546494
Diffstat (limited to 'kde-misc/kdiff3/files')
| -rw-r--r-- | kde-misc/kdiff3/files/kdiff3-0.9.97-relativepath.patch | 66 |
1 files changed, 66 insertions, 0 deletions
diff --git a/kde-misc/kdiff3/files/kdiff3-0.9.97-relativepath.patch b/kde-misc/kdiff3/files/kdiff3-0.9.97-relativepath.patch new file mode 100644 index 000000000000..f0f43e8a8f1a --- /dev/null +++ b/kde-misc/kdiff3/files/kdiff3-0.9.97-relativepath.patch @@ -0,0 +1,66 @@ + + +--- a/kdiff3/src-QT4/fileaccess.cpp ++++ b/kdiff3/src-QT4/fileaccess.cpp +@@ -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()) ); + +kdiff3/src-QT4/kdiff3.cpp Diff + +--- a/kdiff3/src-QT4/kdiff3.cpp ++++ b/kdiff3/src-QT4/kdiff3.cpp +@@ -211,6 +211,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"); + + |