Path to this page:
./
devel/kdiff3,
File and directory diff and merge tool
Branch: CURRENT,
Version: 1.12.1,
Package name: kdiff3-1.12.1,
Maintainer: pkgsrc-usersKDiff3 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: 1176.676 KB
Version history: (Expand)
- (2025-02-19) Updated to version: kdiff3-1.12.1
- (2025-02-12) Updated to version: kdiff3-1.12.0nb1
- (2025-02-07) Updated to version: kdiff3-1.12.0
- (2024-11-15) Updated to version: kdiff3-1.10.7nb7
- (2024-11-01) Updated to version: kdiff3-1.10.7nb6
- (2024-11-01) Updated to version: kdiff3-1.10.7nb5
CVS history: (Expand)
2025-02-19 18:28:11 by David H. Gutteridge | Files touched by this commit (1) |
Log message:
kdiff3: remove patch missed in previous commit
|
2025-02-19 18:27:03 by David H. Gutteridge | Files touched by this commit (2) |  |
Log message:
kdiff3: update to 1.12.1
Version 1.12.1 - 2024
=========================
*fixed horizontal scroll with track pad ignored.
*reduce initial file load time
*ignore encoding errors during merge this will become a warning.
*adjust flatpak default flags.
*drop unused Qt6Core5Compat depenancy check.
|
2025-02-12 07:45:45 by Ryo ONODERA | Files touched by this commit (850) |
Log message:
*: Recursive revbump from audio/flac-1.5.0
|
2025-02-07 15:24:42 by Thomas Klausner | Files touched by this commit (2) |
Log message:
kdiff3: rework patch and add upstream bug report URL
|
2025-02-07 15:01:12 by Thomas Klausner | Files touched by this commit (2) |
Log message:
kdiff3: fix build
|
2025-02-07 10:24:31 by Thomas Klausner | Files touched by this commit (3) |  |
Log message:
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.
|
2025-01-24 00:27:30 by Taylor R Campbell | Files touched by this commit (41) |
Log message:
devel/extra-cmake-modules: Use buildlink3.mk, not TOOL_DEPENDS.
This one is borderline: should it be BUILD_DEPENDS or TOOL_DEPENDS?
It doesn't appear to vary depending on the build environment, so it
doesn't meaningfully describe the cross-builder vs the target system.
It is used only at build-time, but it doesn't have any native
executables -- they're just source code cmake scripts.
For now, it is convenient to use a buildlink3.mk file because this
enables us to explicitly expose only files under share/ECM/ -- and
not other random files installed in the prefix -- via buildlink3 to
keep dependent package builds clean. Eventually we should have the
same mechanism for TOOL_DEPENDS but that day has not yet come.
This change creates a new use of BUILDLINK_DEPMETHOD build for
extra-cmake-modules, which is a priori risky. Fortunately,
extra-cmake-modules has no libraries, so this is unlikely to cause
trouble.
|
2024-11-14 23:22:33 by Thomas Klausner | Files touched by this commit (2429) |
Log message:
*: recursive bump for icu 76 shlib major version bump
|