baserev update by copy to link target

• Files Changed
• Browse Source

- Update to 1.10.7
  * Correctly handle oversized files (kde#475176)

• Files Changed
• Browse Source

baserev update by copy to link target

• Files Changed
• Browse Source

1.10.6

• Files Changed
• Browse Source

baserev update by copy to link target

• Files Changed
• Browse Source

1.10.5

• Files Changed
• Browse Source

baserev update by copy to link target

• Files Changed
• Browse Source

- Update to 1.10.4
  * Fixed no UI shown for failed auto-merge.

- Update to 1.10.3
  * Fix 469817 no text if word wrap is on.

• Files Changed
• Browse Source

baserev update by copy to link target

• Files Changed
• Browse Source

1.10.2

• Files Changed
• Browse Source

baserev update by copy to link target

• Files Changed
• Browse Source

- Update to 1.10.0
  * Make DirectoryMergeWindow and DirectoryMergeInfo QDockWidgets
  * Use Qt native saveState/restoreState
- Build with boost 1.75.0 on Leap as the standard version is too
  old (kdiff3 requires at least 1.71 now)
- Add Fix-linking-with-boost-1.75.0.patch to workaround a bug in
  boost 1.75.0 that breaks the linking stage

• Files Changed
• Browse Source

baserev update by copy to link target

• Files Changed
• Browse Source

- update to 1.9.6:
  * Fix horizontal scroll to be by character not pixels
  * Update window when ending selection mode.

• Files Changed
• Browse Source

baserev update by copy to link target

• Files Changed
• Browse Source

- Update to 1.9.5
  * Attempt encoding detection for non-BOM UTF-8
  * Rewrite EOL detection (kde#448353,kde#450225)
    + fixes speed regression
    + Better EOL detection decoding handled by Qt
- Drop redundant recommendation of the -lang package

• Files Changed
• Browse Source

- Update to 1.9.4
  * Fix windows style cr/lf line ending handling (kde#442199)
  * Fix race on exit if qt sends QApplication::focusChanged during
    teardown (kde#444654)

• Files Changed
• Browse Source

- Update to 1.9.3
  * Fix multiple regressions in file comparison
  * Fix trailing EOL stripped (kde#437570)
  * Fix arbitrary line insertion during merge (kde#437570)
- Drop 0001-Collected-fixes-from-master.patch, the relevant fixes
  are included in this release

• Files Changed
• Browse Source

The latest kdiff3 currently shipped with Tumbleweed is unsuitable for everyday use. I, for example, use it as my go-to `git mergetool` and I need that a lot. And it must be reliable and not messing up merge-output. Since the upgrade from 1.8.4 to 1.9.2, many regressions have to be experienced, please see the list of fixed issues below. 

From a distribution point of view, I see two options: Fix-up 1.9.2 like proposed here, or (really!) downgrade to 1.8.5 until a new reliable 1.9 release comes out. I have contributed many fixes to upstream meanwhile.

- Remove GCC 11 build fix:
  * 0001-Explicitly-include-limits-for-compatibility-with-gcc.patch
    now contained in squashed patch
- Add collected fixes from upstream master:
  * 0001-Collected-fixes-from-master.patch
    contains the original and many more fixes:
    + misalignment and wrong conflict resolutions when using manual
      alignment markers
    + uninitialized variables causing crashes
    + hangs and crashes due to wrong loop conditions
    + wrong handling of new-line at end-of-file
    + spurious insertion of empty lines in merge result
    + access of uninitialized iterators causing crashes
    + wrong buffer length calculations causing out-of-bounds access
    + wrong bit-logic causing comments to always be treated as white-space
    + crashes when hitting a key on empty merge results
    + technical details allowing fixes to be cherry-picked

• Files Changed
• Browse Source

baserev update by copy to link target

• Files Changed
• Browse Source