The NetBSD Project

CVS log for pkgsrc/devel/kdiff3/PLIST

[BACK] Up to [cvs.NetBSD.org] / pkgsrc / devel / kdiff3

Request diff between arbitrary revisions


Keyword substitution: kv
Default branch: MAIN


Revision 1.15: download - view: text, markup, annotated - select for diffs
Thu Mar 26 20:11:59 2026 UTC (7 months, 3 weeks ago) by gutteridge
Branches: MAIN
CVS tags: pkgsrc-2026Q3-base, pkgsrc-2026Q3, pkgsrc-2026Q2-base, pkgsrc-2026Q2, HEAD
Diff to: previous 1.14: preferred, colored
Changes since revision 1.14: +6 -0 lines
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.)

Revision 1.14: download - view: text, markup, annotated - select for diffs
Fri Feb 7 09:24:31 2025 UTC (21 months, 1 week ago) by wiz
Branches: MAIN
CVS tags: pkgsrc-2026Q1-base, pkgsrc-2026Q1, pkgsrc-2025Q4-base, pkgsrc-2025Q4, pkgsrc-2025Q3-base, pkgsrc-2025Q3, pkgsrc-2025Q2-base, pkgsrc-2025Q2, pkgsrc-2025Q1-base, pkgsrc-2025Q1
Diff to: previous 1.13: preferred, colored
Changes since revision 1.13: +14 -6 lines
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.

Revision 1.13: download - view: text, markup, annotated - select for diffs
Thu Dec 14 22:47:05 2023 UTC (2 years, 11 months ago) by gutteridge
Branches: MAIN
CVS tags: pkgsrc-2024Q4-base, pkgsrc-2024Q4, pkgsrc-2024Q3-base, pkgsrc-2024Q3, pkgsrc-2024Q2-base, pkgsrc-2024Q2, pkgsrc-2024Q1-base, pkgsrc-2024Q1, pkgsrc-2023Q4-base, pkgsrc-2023Q4
Diff to: previous 1.12: preferred, colored
Changes since revision 1.12: +3 -1 lines
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.)

Revision 1.12: download - view: text, markup, annotated - select for diffs
Fri Oct 6 03:23:17 2023 UTC (3 years, 1 month ago) by gutteridge
Branches: MAIN
Diff to: previous 1.11: preferred, colored
Changes since revision 1.11: +3 -1 lines
kdiff3: update to 1.10.6

Version 1.10.6 - 2023
====================
Fix crash on exit.

Revision 1.11: download - view: text, markup, annotated - select for diffs
Tue Jul 11 00:13:07 2023 UTC (3 years, 4 months ago) by gutteridge
Branches: MAIN
CVS tags: pkgsrc-2023Q3-base, pkgsrc-2023Q3
Diff to: previous 1.10: preferred, colored
Changes since revision 1.10: +4 -1 lines
kdiff3: update to 1.10.5

Version 1.10.5 - 2023
=====================
*Resolve thread safety issues in word wrap runner

Revision 1.10: download - view: text, markup, annotated - select for diffs
Thu Feb 16 03:29:33 2023 UTC (3 years, 9 months ago) by gutteridge
Branches: MAIN
CVS tags: pkgsrc-2023Q2-base, pkgsrc-2023Q2, pkgsrc-2023Q1-base, pkgsrc-2023Q1
Diff to: previous 1.9: preferred, colored
Changes since revision 1.9: +8 -2 lines
kdiff3: update to 1.10.0

Version 1.10 - 2023-
===========================
*Make DirectoryMergeWindow and DirecoryMergeInfo QDockWidgets.
*Use Qt native saveState/restoreState

Revision 1.9: download - view: text, markup, annotated - select for diffs
Wed Nov 3 22:00:42 2021 UTC (5 years ago) by gutteridge
Branches: MAIN
CVS tags: pkgsrc-2022Q4-base, pkgsrc-2022Q4, pkgsrc-2022Q3-base, pkgsrc-2022Q3, pkgsrc-2022Q2-base, pkgsrc-2022Q2, pkgsrc-2022Q1-base, pkgsrc-2022Q1, pkgsrc-2021Q4-base, pkgsrc-2021Q4
Diff to: previous 1.8: preferred, colored
Changes since revision 1.8: +2 -2 lines
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.

Revision 1.8: download - view: text, markup, annotated - select for diffs
Tue Jan 26 00:03:17 2021 UTC (5 years, 9 months ago) by gutteridge
Branches: MAIN
CVS tags: pkgsrc-2021Q3-base, pkgsrc-2021Q3, pkgsrc-2021Q2-base, pkgsrc-2021Q2, pkgsrc-2021Q1-base, pkgsrc-2021Q1
Diff to: previous 1.7: preferred, colored
Changes since revision 1.7: +2 -1 lines
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

Revision 1.7: download - view: text, markup, annotated - select for diffs
Mon Jul 6 10:53:14 2020 UTC (6 years, 4 months ago) by gutteridge
Branches: MAIN
CVS tags: pkgsrc-2020Q4-base, pkgsrc-2020Q4, pkgsrc-2020Q3-base, pkgsrc-2020Q3
Diff to: previous 1.6: preferred, colored
Changes since revision 1.6: +4 -1 lines
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.

Revision 1.6: download - view: text, markup, annotated - select for diffs
Fri Jun 19 17:39:54 2020 UTC (6 years, 4 months ago) by gutteridge
Branches: MAIN
CVS tags: pkgsrc-2020Q2-base, pkgsrc-2020Q2
Diff to: previous 1.5: preferred, colored
Changes since revision 1.5: +17 -1 lines
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.

Revision 1.5: download - view: text, markup, annotated - select for diffs
Sun Nov 3 02:19:16 2019 UTC (7 years ago) by gutteridge
Branches: MAIN
CVS tags: pkgsrc-2020Q1-base, pkgsrc-2020Q1, pkgsrc-2019Q4-base, pkgsrc-2019Q4
Diff to: previous 1.4: preferred, colored
Changes since revision 1.4: +85 -84 lines
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.

Revision 1.4: download - view: text, markup, annotated - select for diffs
Sat Apr 6 10:20:43 2013 UTC (13 years, 7 months ago) by markd
Branches: MAIN
CVS tags: pkgsrc-2019Q3-base, pkgsrc-2019Q3, pkgsrc-2019Q2-base, pkgsrc-2019Q2, pkgsrc-2019Q1-base, pkgsrc-2019Q1, pkgsrc-2018Q4-base, pkgsrc-2018Q4, pkgsrc-2018Q3-base, pkgsrc-2018Q3, pkgsrc-2018Q2-base, pkgsrc-2018Q2, pkgsrc-2018Q1-base, pkgsrc-2018Q1, pkgsrc-2017Q4-base, pkgsrc-2017Q4, pkgsrc-2017Q3-base, pkgsrc-2017Q3, pkgsrc-2017Q2-base, pkgsrc-2017Q2, pkgsrc-2017Q1-base, pkgsrc-2017Q1, pkgsrc-2016Q4-base, pkgsrc-2016Q4, pkgsrc-2016Q3-base, pkgsrc-2016Q3, pkgsrc-2016Q2-base, pkgsrc-2016Q2, pkgsrc-2016Q1-base, pkgsrc-2016Q1, pkgsrc-2015Q4-base, pkgsrc-2015Q4, pkgsrc-2015Q3-base, pkgsrc-2015Q3, pkgsrc-2015Q2-base, pkgsrc-2015Q2, pkgsrc-2015Q1-base, pkgsrc-2015Q1, pkgsrc-2014Q4-base, pkgsrc-2014Q4, pkgsrc-2014Q3-base, pkgsrc-2014Q3, pkgsrc-2014Q2-base, pkgsrc-2014Q2, pkgsrc-2014Q1-base, pkgsrc-2014Q1, pkgsrc-2013Q4-base, pkgsrc-2013Q4, pkgsrc-2013Q3-base, pkgsrc-2013Q3, pkgsrc-2013Q2-base, pkgsrc-2013Q2
Diff to: previous 1.3: preferred, colored
Changes since revision 1.3: +0 -1 lines
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.

Revision 1.3: download - view: text, markup, annotated - select for diffs
Wed Mar 21 23:10:54 2012 UTC (14 years, 7 months ago) by markd
Branches: MAIN
CVS tags: pkgsrc-2013Q1-base, pkgsrc-2013Q1, pkgsrc-2012Q4-base, pkgsrc-2012Q4, pkgsrc-2012Q3-base, pkgsrc-2012Q3, pkgsrc-2012Q2-base, pkgsrc-2012Q2, pkgsrc-2012Q1-base, pkgsrc-2012Q1
Diff to: previous 1.2: preferred, colored
Changes since revision 1.2: +80 -140 lines
Update to 0.9.96

KDE4 version.

Revision 1.2: download - view: text, markup, annotated - select for diffs
Sun Jun 14 17:48:50 2009 UTC (17 years, 5 months ago) by joerg
Branches: MAIN
CVS tags: pkgsrc-2011Q4-base, pkgsrc-2011Q4, pkgsrc-2011Q3-base, pkgsrc-2011Q3, pkgsrc-2011Q2-base, pkgsrc-2011Q2, pkgsrc-2011Q1-base, pkgsrc-2011Q1, pkgsrc-2010Q4-base, pkgsrc-2010Q4, pkgsrc-2010Q3-base, pkgsrc-2010Q3, pkgsrc-2010Q2-base, pkgsrc-2010Q2, pkgsrc-2010Q1-base, pkgsrc-2010Q1, pkgsrc-2009Q4-base, pkgsrc-2009Q4, pkgsrc-2009Q3-base, pkgsrc-2009Q3, pkgsrc-2009Q2-base, pkgsrc-2009Q2
Diff to: previous 1.1: preferred, colored
Changes since revision 1.1: +1 -32 lines
Remove @dirrm entries from PLISTs

Revision 1.1.1.1 (vendor branch): download - view: text, markup, annotated - select for diffs
Sat Mar 24 14:22:24 2007 UTC (19 years, 7 months ago) by markd
Branches: TNF
CVS tags: pkgsrc-base, pkgsrc-2009Q1-base, pkgsrc-2009Q1, pkgsrc-2008Q4-base, pkgsrc-2008Q4, pkgsrc-2008Q3-base, pkgsrc-2008Q3, pkgsrc-2008Q2-base, pkgsrc-2008Q2, pkgsrc-2008Q1-base, pkgsrc-2008Q1, pkgsrc-2007Q4-base, pkgsrc-2007Q4, pkgsrc-2007Q3-base, pkgsrc-2007Q3, pkgsrc-2007Q2-base, pkgsrc-2007Q2, pkgsrc-2007Q1-base, pkgsrc-2007Q1, cwrapper, cube-native-xorg-base, cube-native-xorg
Diff to: previous 1.1: preferred, colored
Changes since revision 1.1: +0 -0 lines
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.

Revision 1.1: download - view: text, markup, annotated - select for diffs
Sat Mar 24 14:22:24 2007 UTC (19 years, 7 months ago) by markd
Branches: MAIN
Initial revision

Diff request

This form allows you to request diffs between any two revisions of a file. You may select a symbolic revision name using the selection box or you may type in a numeric name using the type-in text box.

Log view options

CVSweb <webmaster@jp.NetBSD.org>