diff options
| author | Markus Brueffer <markus@FreeBSD.org> | 2004-06-07 14:28:45 +0000 |
|---|---|---|
| committer | Markus Brueffer <markus@FreeBSD.org> | 2004-06-07 14:28:45 +0000 |
| commit | 55f0138e434a296d630f669f3b786f4e18d6347b (patch) | |
| tree | e5f6658fb006ccf00a24d30430b110c96fbd7d29 /textproc/kdiff3/files | |
| parent | Remove mkisofs and cdrtools, superseeded by sysutils/cdrtools-cjk. (diff) | |
- Update to version 0.9.84
- Don't use Makefile.kde anymore
- Respect CFLAGS
PR: ports/67581
Submitted by: Heiner Eichmann <h.eichmann@gmx.de>
Diffstat (limited to 'textproc/kdiff3/files')
| -rw-r--r-- | textproc/kdiff3/files/patch-src-pdiff.cpp | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/textproc/kdiff3/files/patch-src-pdiff.cpp b/textproc/kdiff3/files/patch-src-pdiff.cpp new file mode 100644 index 000000000000..c8f2c7d41e99 --- /dev/null +++ b/textproc/kdiff3/files/patch-src-pdiff.cpp @@ -0,0 +1,19 @@ +--- src/pdiff.cpp.orig Sat May 29 22:22:15 2004 ++++ src/pdiff.cpp Mon May 31 10:59:57 2004 +@@ -462,12 +462,12 @@ + // 2. If the files don't have the same name then show all names + if ( caption.isEmpty() && (!f1.isEmpty() || !f2.isEmpty() || !f3.isEmpty()) ) + { +- caption = ( f1.isEmpty()? "" : ".../"+f1 ); +- caption += QString(caption.isEmpty() || f2.isEmpty() ? "" : " <-> ") + ( f2.isEmpty()? "" : ".../"+f2 ); +- caption += QString(caption.isEmpty() || f3.isEmpty() ? "" : " <-> ") + ( f3.isEmpty()? "" : ".../"+f3 ) ; ++ caption = ( f1.isEmpty()? QString("") : ".../"+f1 ); ++ caption += QString(caption.isEmpty() || f2.isEmpty() ? "" : " <-> ") + ( f2.isEmpty()? QString("") : ".../"+f2 ); ++ caption += QString(caption.isEmpty() || f3.isEmpty() ? "" : " <-> ") + ( f3.isEmpty()? QString("") : ".../"+f3 ) ; + } + +- m_pKDiff3Shell->setCaption( caption.isEmpty() ? "KDiff3" : caption+" - KDiff3"); ++ m_pKDiff3Shell->setCaption( caption.isEmpty() ? QString("KDiff3") : caption+" - KDiff3"); + } + + |