./devel/kdiff3, File and directory diff and merge tool

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

Branch: CURRENT, Version: 1.8.5nb2, Package name: kdiff3-1.8.5nb2, Maintainer: pkgsrc-users

KDiff3 is a file and directory diff and merge tool which

* compares and merges two or three text input files or directories,
* shows the differences line by line and character by character(!),
* provides an automatic merge-facility,
* has an editor for comfortable solving of merge-conflicts,
* provides network transparency via KIO,
* has options to highlight or hide changes in white-space or comments,
* supports Unicode, UTF-8 and other file encodings,
* prints differences,
* supports version control keyword and history merging.


Required to run:
[graphics/hicolor-icon-theme] [security/gnupg2] [x11/qt5-qtbase] [x11/kwidgetsaddons] [graphics/kiconthemes] [devel/kio] [devel/kcrash] [devel/ki18n] [devel/kdoctools] [devel/kparts] [devel/kcoreaddons]

Required to build:
[pkgtools/x11-links] [x11/xcb-proto] [x11/fixesproto4] [pkgtools/cwrappers] [devel/extra-cmake-modules] [x11/xorgproto]

Master sites: (Expand)

SHA1: 6c289b406cdc98ad87259a0af5d45744224c8dbb
RMD160: f68b8ad7365b4521dc136333283e313f35c2e427
Filesize: 1021.301 KB

Version history: (Expand)

CVS history: (Expand)


   2021-04-21 13:43:04 by Adam Ciarcinski | Files touched by this commit (1822) 
Log message:
revbump for textproc/icu
   2021-02-07 07:30:42 by Ryo ONODERA | Files touched by this commit (357) 
Log message:
*: Recursive revbump from audio/pulseaudio-14.2.nb1
   2021-01-26 01:03:18 by David H. Gutteridge | Files touched by this commit (3) | Package updated
Log message:
kdiff3: update to 1.8.5

Version 1.8.5 - 2021-01-10
===========================
BUG:417189 Fix url handling for drag and drop.
BUG:426823 Fix regression in handing paste from clipboard to blank diff window.
*Fix link detection via KIO
*Drop custom event filter in OpenDialog. We now use FileNameLineEdit instead as \ 
in the main window.
*Fix url/path handling bugs for remote files
*Don't ignore stat errors unless it tells us the file was not found.

Version 1.8.4 - 2020-08-25
===========================
*Fix typos in man page
*Fix compare over network with KIO
*Restore contextmenu for Windows Explorer
   2021-01-01 10:52:45 by Ryo ONODERA | Files touched by this commit (357) 
Log message:
*: Recursive revbump from audio/pulseaudio-14.0
   2020-12-04 05:56:20 by Taylor R Campbell | Files touched by this commit (391) 
Log message:
Revbump for openpam cppflags change months ago, belatedly.
   2020-11-05 10:09:30 by Ryo ONODERA | Files touched by this commit (1814) 
Log message:
*: Recursive revbump from textproc/icu-68.1
   2020-08-18 19:58:18 by Leonardo Taccari | Files touched by this commit (549) 
Log message:
*: revbump for libsndfile
   2020-08-17 22:20:41 by Leonardo Taccari | Files touched by this commit (2202) 
Log message:
*: revbump after fontconfig bl3 changes (libuuid removal)