./devel/kdiff3, File and directory diff and merge tool (KDE4)

[ CVSweb ] [ Homepage ] [ RSS ] [ Required by ] [ Add to tracker ]


Branch: CURRENT, Version: 0.9.98nb5, Package name: kdiff3-0.9.98nb5, Maintainer: pkgsrc-users

KDiff3 is a program that

* compares and merges two or three input files or directories,
* shows the differences line by line and character by character (!),
* provides an automatic merge-facility and
* an integrated editor for comfortable solving of merge-conflicts
* has support for KDE-KIO (ftp, sftp, http, fish, smb)
* and has an intuitive graphical user interface.


Required to run:
[sysutils/desktop-file-utils] [graphics/hicolor-icon-theme] [x11/qt4-libs] [x11/qt4-qdbus] [x11/kdelibs4] [x11/kde-baseapps4]

Required to build:
[pkgtools/x11-links] [devel/boost-headers] [x11/glproto] [x11/renderproto] [x11/xproto] [x11/qt4-tools] [x11/xf86vidmodeproto] [x11/recordproto] [x11/xf86driproto] [x11/damageproto] [x11/inputproto] [x11/xextproto] [x11/randrproto] [x11/dri2proto] [devel/automoc4] [x11/fixesproto4] [pkgtools/cwrappers]

Master sites:

SHA1: 1390b4ca9c58316de49cb0aabb433f14ebf2dc3f
RMD160: 17fc05df3fd8f052e2010834ba8efe2481e4f434
Filesize: 1721.401 KB

Version history: (Expand)


CVS history: (Expand)


   2017-01-01 17:06:40 by Adam Ciarcinski | Files touched by this commit (616) | Package updated
Log message:
Revbump after boost update
   2016-10-07 20:26:14 by Adam Ciarcinski | Files touched by this commit (611) | Package updated
Log message:
Revbump post boost update
   2016-03-05 12:29:49 by Jonathan Perkin | Files touched by this commit (1813) | Package updated
Log message:
Bump PKGREVISION for security/openssl ABI bump.
   2015-11-03 04:29:40 by Alistair G. Crooks | Files touched by this commit (1995)
Log message:
Add SHA512 digests for distfiles for devel category

Issues found with existing distfiles:
	distfiles/eclipse-sourceBuild-srcIncluded-3.0.1.zip
	distfiles/fortran-utils-1.1.tar.gz
	distfiles/ivykis-0.39.tar.gz
	distfiles/enum-1.11.tar.gz
	distfiles/pvs-3.2-libraries.tgz
	distfiles/pvs-3.2-linux.tgz
	distfiles/pvs-3.2-solaris.tgz
	distfiles/pvs-3.2-system.tgz
No changes made to these distinfo files.

Otherwise, existing SHA1 digests verified and found to be the same on
the machine holding the existing distfiles (morden).  All existing
SHA1 digests retained for now as an audit trail.
   2015-04-25 16:20:48 by Tobias Nygren | Files touched by this commit (495) | Package updated
Log message:
Recursive revbump following MesaLib update, categories a through f.
   2015-04-17 17:53:16 by Adam Ciarcinski | Files touched by this commit (302)
Log message:
Revbump after updating devel/boost-libs
   2014-11-14 11:08:09 by Mark Davies | Files touched by this commit (2) | Package updated
Log message:
Update kdiff3 to 0.9.98

Version 0.9.98 - 2014-07-04
===========================
- 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.
  - Fixed symlink comparison (Qt4 symLinkTarget returns absolute paths)
- Text analysis for rendering with QTextLayout is interruptable and
  multithreaded.  (See progressbar and abort-button in statusbar)
- Fix for saving to relative path in KDE-environments. (Patch from Harald Sitter)
- Fixed bug in 0.9.97: Directory compare was always case sensitive.
- Fix for saving files on KDE with relative path specified via command
  line option -o.
- Fixed problem with KIO (nonlocal urls).
- Improved Mac support.
- Write --confighelp information to stdout instead of stderr.
- Directory Merge Window: Enabled state of "Delete A And B" now also
  depends on existence of source file A.
- Works now with Qt4 and Qt5
- Progress dialog during printing.
- Workaround for bug in QSplitter::childEvent that broke
  QFileDialog::getSaveFileName
   2014-11-07 20:39:43 by Adam Ciarcinski | Files touched by this commit (264)
Log message:
Revbump after updating boost