kdiff3-1.11.5-1.1 RPM for armv7hl

From OpenSuSE Ports Tumbleweed for armv7hl

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

• kdiff3
• application()
• application(org.kde.kdiff3.desktop)
• kdiff3(armv7hl-32)
• metainfo()
• metainfo(org.kde.kdiff3.appdata.xml)

Requires

• ld-linux-armhf.so.3
• ld-linux-armhf.so.3(GLIBC_2.4)
• libKF6ConfigCore.so.6
• libKF6ConfigWidgets.so.6
• libKF6CoreAddons.so.6
• libKF6Crash.so.6
• libKF6I18n.so.6
• libKF6KIOCore.so.6
• libKF6KIOWidgets.so.6
• libKF6WidgetsAddons.so.6
• libKF6XmlGui.so.6
• libQt6Core.so.6
• libQt6Core.so.6(Qt_6)
• libQt6Core.so.6(Qt_6.8)
• libQt6Core5Compat.so.6
• libQt6Core5Compat.so.6(Qt_6)
• libQt6Gui.so.6
• libQt6Gui.so.6(Qt_6)
• libQt6PrintSupport.so.6
• libQt6PrintSupport.so.6(Qt_6)
• libQt6Widgets.so.6
• libQt6Widgets.so.6(Qt_6)
• libc.so.6
• libc.so.6(GLIBC_2.32)
• libc.so.6(GLIBC_2.34)
• libc.so.6(GLIBC_2.4)
• libgcc_s.so.1
• libgcc_s.so.1(GCC_3.0)
• libgcc_s.so.1(GCC_3.3.1)
• libgcc_s.so.1(GCC_3.5)
• libm.so.6
• libm.so.6(GLIBC_2.4)
• libstdc++.so.6
• libstdc++.so.6(CXXABI_1.3)
• libstdc++.so.6(CXXABI_1.3.15)
• libstdc++.so.6(CXXABI_1.3.9)
• libstdc++.so.6(CXXABI_ARM_1.3.3)
• libstdc++.so.6(GLIBCXX_3.4)
• libstdc++.so.6(GLIBCXX_3.4.11)
• libstdc++.so.6(GLIBCXX_3.4.15)
• libstdc++.so.6(GLIBCXX_3.4.20)
• libstdc++.so.6(GLIBCXX_3.4.21)
• libstdc++.so.6(GLIBCXX_3.4.29)
• rpmlib(CompressedFileNames) <= 3.0.4-1
• rpmlib(FileDigests) <= 4.6.0-1
• rpmlib(PayloadFilesHavePrefix) <= 4.0-1
• rpmlib(PayloadIsZstd) <= 5.4.18-1

License

GPL-2.0-or-later

Changelog

* Fri Nov 08 2024 Christophe Marin <christophe@krop.fr>
  - Update to 1.11.5
    * 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 regression in diff margin color.
    * fix crash on deleting first line in diff block
    * fix merge encoding detection.
* Tue Oct 01 2024 Christophe Marin <christophe@krop.fr>
  - Update to 1.11.4
    * Adapt Diff3Line::getLineData to handle being called on
      non-existant lines
    * Suppress clang warning for quirky QT "enum" use
    * Pass over diff code completely if no data is loaded
    * Do full clearing of all diff related lists when one is cleared
* Mon Jul 01 2024 Christophe Marin <christophe@krop.fr>
  - Update to 1.11.2
    * Fixed encoding handling for non-UTF encodings
    * Fixed encoding detection for lower case 'HTML' and 'XML' tags
* Tue May 21 2024 Christophe Marin <christophe@krop.fr>
  - Update to 1.11.1.
    * kparts is no longer needed
    * Don't set invalid first line if line < visableLines
    * Actually wait for event loop to exit in
      ProgressDialog::enterEventLoop
    * Don't kill KJob on hide
    * Cleanup resize code
    * Limit new line computation to 0
    * Fix broken getBestFirstLine calcucation
  - Drop obsolete patch:
    * Fix-linking-with-boost-1.75.0.patch
* 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

Files

/usr/bin/kdiff3
/usr/lib/qt6/plugins/kf6/kfileitemaction
/usr/lib/qt6/plugins/kf6/kfileitemaction/kdiff3fileitemaction.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/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, Sat Nov 16 01:07:39 2024