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

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


Branch: CURRENT, Version: 1.9.3nb1, Package name: kdiff3-1.9.3nb1, 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)

Filesize: 1032.148 KB

Version history: (Expand)


CVS history: (Expand)


   2021-11-15 23:54:34 by Thomas Klausner | Files touched by this commit (396)
Log message:
*: recursive bump for gstreamer 1.18.5
   2021-11-03 23:00:42 by David H. Gutteridge | Files touched by this commit (3) | Package updated
Log message:
kdiff3: update to 1.9.3

(Upstream change log incomplete in summarized form, highlights for the
1.9 bump follow.)

Version 1.9 - 2021-
===========================
*Rewrite of SourceData::FileData::preprocess now only loops through file \ 
contents once.
*Major rework of event handling
  -Move away from event filters where feasible, drop code for events now handled \ 
by qt.
  -decentralize handlers
*take advantage of Qt and boost signal/slot pattern to avoid needless nullptr checks.
  -decentralize cut/paste handling
*Introduce LineRef wrapper class
*Add enum types and use existing ones.
  -improves readability of code.
*split out doDirectoryCompare from improveFilenames
  -Principle of least surprise
*Stop mis-using c style [] pointer access there is no documented reason to \ 
assume QVector<T> has a
  c-style memory layout. Much less that this will remain so.

Not even going to try to list everything here.

See git history for complete log.
   2021-10-26 12:20:11 by Nia Alarie | Files touched by this commit (3016)
Log message:
archivers: Replace RMD160 checksums with BLAKE2s checksums

All checksums have been double-checked against existing RMD160 and
SHA512 hashes

Could not be committed due to merge conflict:
devel/py-traitlets/distinfo

The following distfiles were unfetchable (note: some may be only fetched
conditionally):

./devel/pvs/distinfo pvs-3.2-solaris.tgz
./devel/eclipse/distinfo eclipse-sourceBuild-srcIncluded-3.0.1.zip
   2021-10-07 15:44:44 by Nia Alarie | Files touched by this commit (3017)
Log message:
devel: Remove SHA1 hashes for distfiles
   2021-07-30 14:27:14 by Ryo ONODERA | Files touched by this commit (366)
Log message:
*: Recursive revbump from audio/pulseaudio-15.0
   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