df2e03d319
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
OBS-URL: https://build.opensuse.org/request/show/902836
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kdiff3?expand=0&rev=31
102 lines
3.1 KiB
RPMSpec
102 lines
3.1 KiB
RPMSpec
#
|
|
# spec file for package kdiff3
|
|
#
|
|
# Copyright (c) 2021 SUSE LLC
|
|
#
|
|
# All modifications and additions to the file contributed by third parties
|
|
# remain the property of their copyright owners, unless otherwise agreed
|
|
# upon. The license for this file, and modifications and additions to the
|
|
# file, is the same license as for the pristine package itself (unless the
|
|
# license for the pristine package is not an Open Source License, in which
|
|
# case the license is the MIT License). An "Open Source License" is a
|
|
# license that conforms to the Open Source Definition (Version 1.9)
|
|
# published by the Open Source Initiative.
|
|
|
|
# Please submit bugfixes or comments via https://bugs.opensuse.org/
|
|
#
|
|
|
|
|
|
%bcond_without lang
|
|
Name: kdiff3
|
|
Version: 1.9.2
|
|
Release: 0
|
|
Summary: Code Comparison Utility
|
|
License: GPL-2.0-or-later
|
|
Group: Development/Tools/Version Control
|
|
URL: https://apps.kde.org/kdiff3
|
|
Source0: https://download.kde.org/stable/%{name}/%{name}-%{version}.tar.xz
|
|
Source1: https://download.kde.org/stable/%{name}/%{name}-%{version}.tar.xz.sig
|
|
Source2: kdiff3.keyring
|
|
# PATCH-FIX-UPSTREAM
|
|
Patch0: 0001-Collected-fixes-from-master.patch
|
|
BuildRequires: boost-devel
|
|
BuildRequires: extra-cmake-modules
|
|
BuildRequires: fdupes
|
|
BuildRequires: hicolor-icon-theme
|
|
BuildRequires: kf5-filesystem
|
|
BuildRequires: update-desktop-files
|
|
BuildRequires: cmake(KF5CoreAddons)
|
|
BuildRequires: cmake(KF5Crash)
|
|
BuildRequires: cmake(KF5DocTools)
|
|
BuildRequires: cmake(KF5I18n)
|
|
BuildRequires: cmake(KF5KIO)
|
|
BuildRequires: cmake(KF5Parts)
|
|
BuildRequires: cmake(KF5WidgetsAddons)
|
|
BuildRequires: cmake(Qt5Core)
|
|
BuildRequires: cmake(Qt5Gui)
|
|
BuildRequires: cmake(Qt5PrintSupport)
|
|
BuildRequires: cmake(Qt5Widgets)
|
|
Recommends: %{name}-lang = %{version}
|
|
|
|
%description
|
|
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.)
|
|
|
|
%lang_package
|
|
|
|
%prep
|
|
%autosetup -p1
|
|
|
|
%build
|
|
%cmake_kf5 -d build
|
|
%cmake_build
|
|
|
|
%install
|
|
%kf5_makeinstall -C build
|
|
%suse_update_desktop_file -r org.kde.kdiff3 Qt KDE Utility TextEditor X-KDE-Utilities-File
|
|
|
|
%if %{with lang}
|
|
%find_lang %{name} %{name}.lang --with-man
|
|
%find_lang diff_ext %{name}.lang
|
|
%find_lang kdiff3fileitemactionplugin %{name}.lang
|
|
%{kf5_find_htmldocs}
|
|
%endif
|
|
%fdupes %{buildroot}
|
|
|
|
%files
|
|
%license LICENSES/*
|
|
%doc %lang(en) %{_kf5_htmldir}/en/kdiff3
|
|
%doc %lang(en) %{_kf5_mandir}/man1/kdiff3.1%{?ext_man}
|
|
%dir %{_kf5_plugindir}/kf5/kfileitemaction
|
|
%dir %{_kf5_plugindir}/kf5/parts
|
|
%{_kf5_applicationsdir}/org.kde.kdiff3.desktop
|
|
%{_kf5_appstreamdir}/org.kde.kdiff3.appdata.xml
|
|
%{_kf5_bindir}/kdiff3
|
|
%{_kf5_iconsdir}/hicolor/*/apps/kdiff3.png
|
|
%{_kf5_iconsdir}/hicolor/scalable/apps/kdiff3.svgz
|
|
%{_kf5_kxmlguidir}/kdiff3/
|
|
%{_kf5_kxmlguidir}/kdiff3part/
|
|
%{_kf5_plugindir}/kf5/kfileitemaction/kdiff3fileitemaction.so
|
|
%{_kf5_plugindir}/kf5/parts/kdiff3part.so
|
|
|
|
%if %{with lang}
|
|
%files lang -f %{name}.lang
|
|
%endif
|
|
|
|
%changelog
|