Up to [cvs.NetBSD.org] / pkgsrc / devel / kdiff3
Request diff between arbitrary revisions
Keyword substitution: kv
Default branch: MAIN
kdiff3: update to 1.12.4 Version 1.12.4 - 2025 ========================= - Fix handling of non-BMP UTF-16 characters - Commit: `10451d18` (2025-09-23) - Michael Reeves - Revert unintended condition change (regression fix) - Commit: `1f86fde4` (2025-06-30) - Michael Reeves (Also some translation additions not noted in the change log.)
kdiff3: update to 1.12.0. Version 1.12.0 - 2024 ========================= *Completed port away from Qt5, 6.6 now required version due to delayed ICU support in Qt *Fixed UTF-8-BOM output encoding issues mustly seen on windows. *horizontal scroll correctly comptuted for diff windows --Note due to changes in windows/Qt the scrollbars may be vary small or hidden on Windows 11. This cann't be controlled from kdiff3. *False errors on first launch with files selected should be fixed. Version 1.11.x - 2024 =========================== *Fix false memory error when using "admin://" protocol *Cleanup BOM handling lock detection to only known UTF-* encodings that use it. *Fix bugged connection to non-existent signal (This is why we now use new style connections only.) *fix crash in Diff3Line::getLineData when doing history check for nonexistent lines. *fix crash on some setups that create 0 height widgets when no data is loaded. *Fixed encoding handling for non-UTF encodings *Fixed encoding detection for lower case 'HTML' and 'XML' tags *Fix handling of KIO jobs for non-file urls. -Actually wait for secondary event loop to end (Not sure if this is documention bug in qt or behavior bug.) -Don't arbitrarily kill jobs when progress dialog is hidden. *Fix possible invalid line given by mousedown in Overview pane. (Caught by SafeInt range checking) *Fix bad algorithm in getBestFirstLine. -Related regression also fixed (BUG:486909) *craft based builds are now Qt6/kf6.
kdiff3: update to 1.10.7 No change log provided by upstream. (In fact, they also forgot to bump the internal versioning, which still reports 1.10.6.)
kdiff3: update to 1.10.6 Version 1.10.6 - 2023 ==================== Fix crash on exit.
kdiff3: update to 1.10.5 Version 1.10.5 - 2023 ===================== *Resolve thread safety issues in word wrap runner
kdiff3: update to 1.10.0 Version 1.10 - 2023- =========================== *Make DirectoryMergeWindow and DirecoryMergeInfo QDockWidgets. *Use Qt native saveState/restoreState
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.
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
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.
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.
kdiff3: update to 1.8.1 (Qt5 port) Change log: [No change log entries for 1.8.1 available.] Version 1.8 - 2019-03-22 =========================== -Don't enable "Choose C for Everthing" on two way merge. -cleanup code. Version 1.7.90 - 2017-01-23 ============================ -ported to QT5/KDEFramework5 -require cmake 3.1 -abandonded Konqueror specific plugin no longer applicable. -kde4 support dropped due to extensive changes needed for QT5/KDEFramework5 -QT5 now required because of above changes. -bugfix: Show Indentical files setting not applied after rescan. -Change parameter errors to use dialog on Linux as well as console output. -Don't sort twice when sorting in reverse order. -fix memmory leak introduced in 0.9.91. -change version numbering. -scrap ClearCase support -implement Cut/Paste.
Update to 0.9.97 Version 0.9.97 - 2012-08-10 =========================== - Memory usage optimized for comparison of large directories. (ca. 1/5 needed) - In overwiev for two way diff show if only one side contains text. - Fix for Fedora by Neal Becker in src-QT4/kdiff3part.desktop. - When word wrap is active toggling line numbers now recalculates the word wrap. - Removed confusing "For compatibility ..." hint from option -qall - Fixed mouse wheel problem. - Change an encoding in diff text window via click on encoding label. - Fix for tab-key moving focus instead of adding a tab character in MergeResultWindow. - Workaround for git on Cygwin that allows KDiff3 to find files in a Cygwin "/tmp" directory when environment variable "CYGWIN_BIN" is set. - Removed iostream dependency - Regression test framework - Documentation patch - Select text in Find dialog - If text is selected in either input or output window use that in Find dialog. - Added default directory anti patterns ".hg" and ".git" and file anti patterns ".rej" and ".bak" for better mercurial and git integration. - Command line option --cs doesn't change the config value permanently anymore. - On KDE: Not creating a KDiff3Part anymore.
Update to 0.9.96 KDE4 version.
Remove @dirrm entries from PLISTs
Initial import of kdiff3 0.9.91.
From Kimura Fuyuki in PR pkg/35914
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.
Initial revision