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

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


Branch: CURRENT, Version: 1.8.3nb5, Package name: kdiff3-1.8.3nb5, 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: ee8af1d5bd357aecbe32952856b4e31db2cb355a
RMD160: c89350259e3fbc62006ed8bfa205945730b12e82
Filesize: 1014.555 KB

Version history: (Expand)


CVS history: (Expand)


   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)
   2020-07-06 12:53:14 by David H. Gutteridge | Files touched by this commit (3) | Package updated
Log message:
kdiff3: update to version 1.8.3

Version 1.8.3 - 2020-06-24
===========================
Bug 423001 fixed reload on Windows.
15f1cc4e - Fixed error handling during directory compare.
065a3997, 2d56cd94, 42b3b5e4 - Only give one error message per directory compare \ 
opperation.
Bug 419722 - Fix crash when clipboard is available. Mainly affects some network \ 
setups.
f2d89bbc - Rework intial window display and full screen toggling.
BUG:421048 - Treat /dev/null as non-existant as git expects.
   2020-06-19 19:39:54 by David H. Gutteridge | Files touched by this commit (10) | Package removed
Log message:
kdiff3: update to 1.8.2

Change log (which may be incomplete):
Version 1.8.2 - 2020-03-29
===========================
Bug 411472 Allowing editing of blank lines and don't mark newly intserted lines \ 
as a confilict
2ba20222 - Remove broken attempt to optimize drawing on horizonal scroll.
Bug 418813 - Fix line numbers not shown. Use QString::number directly not \ 
through a format string.
11e93232 - Correcly support "Print Current Page"
64804a64 - Don't attempt to free nullptr in SourceData::FileData::reset()
f4c66ace - Make Preferance dialog panes scrollable if too large to fit on screen.
de06e561 - Fix dialog filter on windows.
e8d06774 - Switch to QElapsedTime for timing avoids explictly undefined behavior \ 
inside qt if time is changed.
05e2d6fb - Fix sync mode.
f9bd88a1 - Make matching in CvsIngnoreList always honor bCaseSensitive setting.
418ea78c - Don't use temporary with QLatin1String constructor strange things \ 
will happen.
b058c060 - ignore over size cvsignore files
Bug 410962 - Fix '-L' parameter handling
b4b2c970 - Restore acciedently deleted --auto option
Bug 411602 - Fixing missing menu items also resolves a potiential crash in \ 
MergeResultWindow::slotUpdateAvailabilities (Bug 407745).
d4239b92 - Prevent intermient crash during reload/refresh
Bug 410008 - Show diff for empty/missing files.
3bb755c5 - Don't give false error when comparing empty folders
Bug 408991 - 4ad69790,0737cc3e,0402f84a - Close files when not in use - Fixes \ 
"Too many open files" bug.
Bug 407829 - Avoid crash when recieving mouse or key events during earily startup.
cc6d76e3 - Don't try to manually build url if parent is not set.
85052379 - Fix crash when canceling by using only one event loop in ProgressDialog.
d151f151 - Don't append to already complete url.
d3cb2def - Fix manual url building in FileAccess::setFromUdsEntry  - scheme \ 
should not change now.
Bug 405918 - Fix craft install instructions for windows
Bug 411586 - Fix crash in OptionDialog::slotApply()
Bug 407745 - Fix crash in MergeResultWindow::slotUpdateAvailabilities
Bug 407894,399070 - Fixed redraw for horizonal scrolling.
   2020-06-02 10:25:05 by Adam Ciarcinski | Files touched by this commit (1689)
Log message:
Revbump for icu