pool/kdiff3
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 313387 from home:wolfi323:branches:KDE:Extra

Browse Source 
- update to 0.9.98:
  * Text rendering now with QTextLayout fixes the following issues
    + Correct handling for variable width fonts.
    + Corrected display of highlighted text with Qt4.8.x on Ubuntu and Mac.
    + Improved handling of texts with both right to left and left to right languages (mixed Arabic and western texts).
    + Improved handling of Chinese and Japanese.
    + Whitespace characters are now shown as dots for spaces and arrows for tabs, and not only in differences.
  * Bugfixes.
- removed kdiff3-fix-save-relative-path.patch (included upstream)

OBS-URL: https://build.opensuse.org/request/show/313387
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kdiff3?expand=0&rev=3
This commit is contained in:
Raymond Wooninck 2015-06-24 13:12:54 +00:00 committed by Git OBS Bridge
parent dead9b9fdb
commit 9882aad002
5 changed files with 17 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
kdiff3-0.9.97.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e3b716bb449c814d8c30817ec1ca23fba0ed9eee5a635e766c1f2b90ddb75a2a
size 1803769

3
kdiff3-0.9.98.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:802c1ababa02b403a5dca15955c01592997116a24909745016931537210fd668
size 1762715

78
kdiff3-fix-save-relative-path.patch
View File

@ -1,78 +0,0 @@
From 23ad423e4255c80ee22b269f73e20333f7c06678 Mon Sep 17 00:00:00 2001
From: joachim99 <joachim.eibl@gmx.de>
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 <joachim.eibl@gmx.de>
---
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

13
kdiff3.changes
View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Wed Jun 24 08:08:27 UTC 2015 - wbauer@tmo.at
- update to 0.9.98:
* Text rendering now with QTextLayout fixes the following issues
+ Correct handling for variable width fonts.
+ Corrected display of highlighted text with Qt4.8.x on Ubuntu and Mac.
+ Improved handling of texts with both right to left and left to right languages (mixed Arabic and western texts).
+ Improved handling of Chinese and Japanese.
+ Whitespace characters are now shown as dots for spaces and arrows for tabs, and not only in differences.
* Bugfixes.
- removed kdiff3-fix-save-relative-path.patch (included upstream)
-------------------------------------------------------------------
Fri Jul 26 01:08:57 UTC 2013 - hrvoje.senjan@gmail.com

5
kdiff3.spec
View File

@ -17,15 +17,13 @@
Name: kdiff3
Version: 0.9.97
Version: 0.9.98
Release: 0
Summary: Feature-Rich Code Comparison Utility
License: GPL-2.0+
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: libkde4-devel
BuildRequires: libkonq-devel
@ -50,7 +48,6 @@ KDiff3 is a program that:
%lang_package
%prep
%setup -q
%patch0 -p2
%build
%cmake_kde4 -d build