Index index by Group index by Distribution index by Vendor index by creation date index by Name Mirrors Help Search

kdiff3-1.10.7-bp156.1.2 RPM for x86_64

From OpenSuSE Leap 15.6 for x86_64

Name: kdiff3 Distribution: SUSE Linux Enterprise 15 SP6
Version: 1.10.7 Vendor: openSUSE
Release: bp156.1.2 Build date: Mon May 13 19:09:58 2024
Group: Unspecified Build host: i02-ch2a
Size: 3454698 Source RPM: kdiff3-1.10.7-bp156.1.2.src.rpm
Packager: https://bugs.opensuse.org
Url: https://apps.kde.org/kdiff3
Summary: Code Comparison Utility
 
KDiff3 is a program that:

* Compares or merges two or three text input files or directories
* Shows the differences line-by-line and character-by-character
* Provides an automatic merge facility and an integrated editor for
  solving merge conflicts
* Supports KDE's KIO framework (allows accessing ftp, sftp, fish, smb, etc.)

Provides

Requires

License

GPL-2.0-or-later

Changelog

* Thu Jan 25 2024 Wolfgang Bauer <wbauer1@a1.net>
  - Update to 1.10.7
    * Correctly handle oversized files (kde#475176)
* Thu Oct 05 2023 Christophe Marin <christophe@krop.fr>
  - Update to 1.10.6
    * Fix crash on exit
* Wed Jul 12 2023 Christophe Marin <christophe@krop.fr>
  - Update to 1.10.5:
    * Resolve thread safety issues in word wrap runner
* Fri Jun 09 2023 Adam Spiers <suse@adamspiers.org>
  - 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.
* Wed May 03 2023 Christophe Marin <christophe@krop.fr>
  - 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'
* Tue Jan 17 2023 Wolfgang Bauer <wbauer@tmo.at>
  - 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
* Wed Dec 07 2022 Dirk Müller <dmueller@suse.com>
  - update to 1.9.6:
    * Fix horizontal scroll to be by character not pixels
    * Update window when ending selection mode.
* Fri Mar 04 2022 Wolfgang Bauer <wbauer@tmo.at>
  - 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
* Tue Nov 23 2021 Wolfgang Bauer <wbauer@tmo.at>
  - 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)
* Fri Aug 20 2021 Wolfgang Bauer <wbauer@tmo.at>
  - 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
* Mon Jun 28 2021 Tilman Vogel <tilman.vogel@web.de>
  - 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
* Fri May 28 2021 Christophe Giboudeaux <christophe@krop.fr>
  - 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.
* Mon May 17 2021 Wolfgang Bauer <wbauer@tmo.at>
  - Update to 1.9.2
    * Remove erroneous #ifdef (kde#436958)
* Sat May 15 2021 Wolfgang Bauer <wbauer@tmo.at>
  - 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
* Wed May 05 2021 Christophe Giboudeaux <christophe@krop.fr>
  - Update URL.
* Mon May 03 2021 Christophe Giboudeaux <christophe@krop.fr>
  - 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
* Fri Mar 05 2021 Christophe Giboudeaux <christophe@krop.fr>
  - Use a _service file to exclude the windows_installer folder.
* Fri Jan 22 2021 wbauer@tmo.at
  - 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
* Thu Sep 03 2020 wbauer@tmo.at
  - 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
* Thu Aug 27 2020 Christophe Giboudeaux <christophe@krop.fr>
  - Spec cleanup
* Thu Jun 25 2020 wbauer@tmo.at
  - 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)
* Mon Mar 30 2020 wbauer@tmo.at
  - 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)
* Sun May 19 2019 wbauer@tmo.at
  - Update to 1.8.1:
    * Fix enabling of delta movement (kde#407562)
* Tue May 14 2019 wbauer@tmo.at
  - 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
* Thu Dec 08 2016 fabian@ritter-vogt.de
  - Revert kde4_runtime_requires change
* Tue Nov 29 2016 olaf@aepfle.de
  - Expand macro kde4_runtime_requires only when its available
    to fix quilt setup
* Wed Jun 24 2015 wbauer@tmo.at
  - 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)

Files

/usr/bin/kdiff3
/usr/lib64/qt5/plugins/kf5/kfileitemaction
/usr/lib64/qt5/plugins/kf5/kfileitemaction/kdiff3fileitemaction.so
/usr/lib64/qt5/plugins/kf5/parts
/usr/lib64/qt5/plugins/kf5/parts/kdiff3part.so
/usr/share/applications/org.kde.kdiff3.desktop
/usr/share/doc/HTML/en/kdiff3
/usr/share/doc/HTML/en/kdiff3/dirbrowser.png
/usr/share/doc/HTML/en/kdiff3/dirmergebig.png
/usr/share/doc/HTML/en/kdiff3/index.cache.bz2
/usr/share/doc/HTML/en/kdiff3/index.docbook
/usr/share/doc/HTML/en/kdiff3/iteminfo.png
/usr/share/doc/HTML/en/kdiff3/letter_by_letter.png
/usr/share/doc/HTML/en/kdiff3/merge_current.png
/usr/share/doc/HTML/en/kdiff3/new.png
/usr/share/doc/HTML/en/kdiff3/open_dialog.png
/usr/share/doc/HTML/en/kdiff3/screenshot_diff.png
/usr/share/doc/HTML/en/kdiff3/screenshot_merge.png
/usr/share/doc/HTML/en/kdiff3/triple_diff.png
/usr/share/doc/HTML/en/kdiff3/white_space.png
/usr/share/icons/hicolor/128x128/apps/kdiff3.png
/usr/share/icons/hicolor/16x16/apps/kdiff3.png
/usr/share/icons/hicolor/22x22/apps/kdiff3.png
/usr/share/icons/hicolor/256x256/apps/kdiff3.png
/usr/share/icons/hicolor/32x32/apps/kdiff3.png
/usr/share/icons/hicolor/48x48/apps/kdiff3.png
/usr/share/icons/hicolor/64x64/apps/kdiff3.png
/usr/share/icons/hicolor/scalable/apps/kdiff3.svgz
/usr/share/kservices5/kdiff3part.desktop
/usr/share/kxmlgui5/kdiff3
/usr/share/kxmlgui5/kdiff3/kdiff3_shell.rc
/usr/share/kxmlgui5/kdiff3part
/usr/share/kxmlgui5/kdiff3part/kdiff3_part.rc
/usr/share/licenses/kdiff3
/usr/share/licenses/kdiff3/BSD-2-Clause.txt
/usr/share/licenses/kdiff3/CC0-1.0.txt
/usr/share/licenses/kdiff3/GPL-2.0-or-later.txt
/usr/share/licenses/kdiff3/MIT.txt
/usr/share/man/man1/kdiff3.1.gz
/usr/share/metainfo/org.kde.kdiff3.appdata.xml

Generated by rpm2html 1.8.1

Fabrice Bellet, Tue Jul 9 20:06:21 2024