kdiff3-1.9.4-bp154.1.36

- 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)

- 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

- 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

- Add GCC 11 build fix:
  * 0001-Explicitly-include-limits-for-compatibility-with-gcc.patch
- Drop the _service file. Upstream release doesn't contain
  precompiled code anymore.

- Update to 1.9.2
  * Remove erroneous #ifdef (kde#436958)

- Update to 1.9.1
  * Hotfix for possible display problems (kde#436958)
  * Add default shortcut for "Go to [Previous/Next] Unsolved
    Conflict" (kde#436003)
  * Port away from KIconThemes

- Update URL.

- Update to 1.9.0
  * Rewrite of SourceData::FileData::preprocess now only loops
    through file contents once.
  * Major rework of event handling
  * Take advantage of Qt and boost signal/slot pattern to avoid
    needless nullptr checks.
  * Introduce LineRef wrapper class
  * Add enum types and use existing ones.
  * Split out doDirectoryCompare from improveFilenames
  * Stop mis-using c style [] pointer access

- Use a _service file to exclude the windows_installer folder.

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

- Update to 1.10.6
  * Fix crash on exit

- Update to 1.10.5:
  * Resolve thread safety issues in word wrap runner

- 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.

- Update to 1.10.2
  * Prevent false error due to faulty check when
    m_pOptions->m_bDiff3AlignBC = true
  * fix crash when word wrap enabled (kde#468492)
  * Rework KDiff3App::completeInit to avoid crash on exit in auto
    mode
  * "Escape" shortcut ignored if merge output in focus (kde#467652)
  * save and restore dock states (kde#466522)
  * Show UI before comparison start (kde#439148)
  * Don't crash on broken links (kde#466241)
  * Fix memory safety issues during reload. (kde#466524)
  * Fix mishandling line count for files containing '0x0b'

- 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

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

- 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

- Update to 1.8.5:
  * Fix url handling for drag and drop (kde#417189)
  * Fix regression in handling paste from clipboard to blank diff
    window (kde#426823)
  * 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

- Update to 1.8.4:
  * Fix typos in man page (kde#424177)
  * Fix compare over network with KIO (kde#408119)
  * Restore contextmenu for Windows Explorer

- Spec cleanup

- Update to 1.8.3:
  * Fixed reload on Windows (kde#423001)
  * Fixed error handling during directory compare
  * Only give one error message per directory compare operation
  * Fix crash when clipboard is not available (kde#419722)
  * Rework initial window display and full screen toggling
  * Treat /dev/null as non-existant as git expects (kde#421048)

- Update to 1.8.2:
  * Allowing editing of blank lines and don't mark newly inserted
    lines as a conflict (kde#411472)
  * Remove broken attempt to optimize drawing on horizontal scroll
  * Fix line numbers not shown. Use QString::number directly not
    through a format string. (kde#418813)
  * Correctly support "Print Current Page"
  * Don't attempt to free nullptr in SourceData::FileData::reset()
  * Make Preference dialog panes scroll-able if too large to fit on
    screen
  * Fix dialog filter on windows
  * Switch to QElapsedTime for timing avoids explicitly undefined
    behavior inside qt if time is changed
  * Fix sync mode
  * Make matching in CvsIngnoreList always honor bCaseSensitive
    setting
  * Don't use temporary with QLatin1String constructor, strange
    things will happen
  * ignore oversized cvsignore files
  * Fix '-L' parameter handling (kde#410962)
  * Restore accidentally deleted --auto option
  * Fixing missing menu items (kde#411602), also resolves a
    potential crash in MergeResultWindow::slotUpdateAvailabilities
    (kde#407745)
  * Prevent intermittent crash during reload/refresh
  * Show diff for empty/missing files (kde#410008)
  * Don't give false error when comparing empty folders
  * Close files when not in use - Fixes "Too many open files" bug
    (kde#408991)
  * Avoid crash when receiving mouse or key events during early
    startup (kde#407829)
  * Don't try to manually build url if parent is not set
  * Fix crash when canceling by using only one event loop in
    ProgressDialog
  * Don't append to already complete url
  * Fix manual url building in FileAccess::setFromUdsEntry -
    scheme should not change now
  * Fix craft install instructions for windows (kde#405918)
  * Fix crash in OptionDialog::slotApply() (kde#411586)
  * Fix crash in MergeResultWindow::slotUpdateAvailabilities
    (kde#407745)
  * Fixed redraw for horizontal scrolling (kde#407894, kde#399070)

- Update to 1.8.1:
  * Fix enabling of delta movement (kde#407562)

- Update to 1.8:
  * Ported to Qt5/KDE Frameworks 5
  * Bugfix: Show Identical 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 memory leak introduced in 0.9.91
  * Implement Cut/Paste
  * Don't enable "Choose C for Everything" on two way merge
  * Cleanup code
- Update package summary and description
- Run spec-cleaner

- Revert kde4_runtime_requires change

- Expand macro kde4_runtime_requires only when its available
  to fix quilt setup

- update to 0.9.98:
  * Text rendering now with QTextLayout fixes the following issues
    + Correct handling for variable width fonts.
    + Corrected display of highlighted text with Qt4.8.x on Ubuntu and Mac.
    + Improved handling of texts with both right to left and left to right languages (mixed Arabic and western texts).
    + Improved handling of Chinese and Japanese.
    + Whitespace characters are now shown as dots for spaces and arrows for tabs, and not only in differences.
  * Bugfixes.
- removed kdiff3-fix-save-relative-path.patch (included upstream)

- BuildRequire only libkde4-devel, instead of kdebase4-workspace-devel

- Add kdiff3-fix-save-relative-path.patch: fix saving merged
  files.  Patch is from: https://bugs.archlinux.org/task/31813
  and is already upstream.

- Fix the SLES build (%make_install is not expanded on SLES)

- update to 0.9.97:
  * Memory usage optimized for comparison of large directories.
  * In overview for two way diff show if only one side contains text.
  * If text is selected in either input or output window use that in Find dialog.
  * Command line option --cs doesn't change the config value permanently anymore.
  * Windows 64 bit specific installer.
  * Bugfixes.
- removed libkdiff3part.so (not build anymore)

- update to 0.9.96:
  * KDiff3FileItemActionPlugin : Context menu that also works in dolphin (for KDE>=4
  * Parser for preprocessor commands. (Allows single apostrophs ')
  * Fix crash on A/B-overview (infinite recursion)
  * Fix clearcase temp files not deleted problem on windows
  * KDiff3 plugin: When launching KDiff3 konqueror isn't blocked anymore
  * String corrections (Frederik Schwarzer)
  * Fixed writing to KIO.
  * Fixed white space merge default options

- Removed checks for obsolete openSUSE versions (fix for RPMLINT warnings)
- Added check for duplicate files (fix for RPMLINT warning)
- Cleaned up spec file formatting

- updated tarball to fix build

- do not package docs in both subpackages

- require kdiff3-lang

- update to 0.9.95:
  * Show line end style for each file
  * Translation update
  * Bugfixes

- update to 0.9.94:
  * ported to KDE4
  * various smaller fixes

- call kde_post_install

- install translations for kdiff3 menu plugin (bnc#442527)

- running fdupes makes kdiff3.rpm 348KB smaller

- update to version 0.9.92:
  * KDE-Konqueror plugin: Launch KDiff3 from Konqueror.
  * Temp file names use process id in file name for several instances.
  * New File comparison mode: Trust the size and date, but use
    binary comparison if date doesn't match (unsafe)
  * Open dialog also shows current dirs in directory comparison mode.
  * New option for history merge: Max number of history entries
  * New option "Auto save and quit on merge without conflicts"
  * Several Bugfixes

- update to version 0.9.91:
  * Unicode autodetection based on byte-order-mark.
  * Fix for crash after double click below last line
  * Saving of maximized window-state (Patch by Robert Vock)
  * Separated Merge-options in own tab
  * When pasting multiple lines into openfile dialog only first
    line is kept
  * Drawing in directory view fixed.
  * When specifying a separate output dir then for equal files a
    copy operation will also be offered.

- fix build for < 10.1

- update to version 0.9.90
  * Fixed KIO-problems of type "File exists" with tempfiles.
  * Fix for manual alignment with 3 files which caused crash.
  * Preserve executable bit when overwriting an existing file.
  * Documentation and translations updated.