2c072357eb
- 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)
OBS-URL: https://build.opensuse.org/request/show/789696
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kdiff3?expand=0&rev=11
100 lines
2.9 KiB
RPMSpec
100 lines
2.9 KiB
RPMSpec
#
|
|
# spec file for package kdiff3
|
|
#
|
|
# Copyright (c) 2020 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.8.2
|
|
Release: 0
|
|
Summary: Code Comparison Utility
|
|
License: GPL-2.0-or-later
|
|
Group: Development/Tools/Version Control
|
|
URL: http://kdiff3.sourceforge.net/
|
|
Source0: https://download.kde.org/stable/%{name}/%{name}-%{version}.tar.xz
|
|
BuildRequires: extra-cmake-modules
|
|
BuildRequires: fdupes
|
|
BuildRequires: kf5-filesystem
|
|
BuildRequires: update-desktop-files
|
|
BuildRequires: cmake(KF5CoreAddons)
|
|
BuildRequires: cmake(KF5Crash)
|
|
BuildRequires: cmake(KF5DocTools)
|
|
BuildRequires: cmake(KF5I18n)
|
|
BuildRequires: cmake(KF5IconThemes)
|
|
BuildRequires: cmake(KF5KIO)
|
|
BuildRequires: cmake(KF5Parts)
|
|
BuildRequires: cmake(KF5WidgetsAddons)
|
|
BuildRequires: cmake(Qt5Core) >= 5.7.0
|
|
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
|
|
%setup -q
|
|
|
|
%build
|
|
%cmake_kf5 -d build
|
|
%make_jobs
|
|
|
|
%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 COPYING
|
|
%{_kf5_applicationsdir}/org.kde.kdiff3.desktop
|
|
%{_kf5_appstreamdir}/org.kde.kdiff3.appdata.xml
|
|
%{_kf5_bindir}/kdiff3
|
|
%dir %{_kf5_iconsdir}/hicolor/256x256
|
|
%dir %{_kf5_iconsdir}/hicolor/256x256/apps
|
|
%{_kf5_iconsdir}/hicolor/*/apps/kdiff3.png
|
|
%{_kf5_iconsdir}/hicolor/scalable/apps/kdiff3.svgz
|
|
%{_kf5_kxmlguidir}/kdiff3/
|
|
%{_kf5_kxmlguidir}/kdiff3part/
|
|
%{_kf5_plugindir}/kf5/parts/
|
|
%{_kf5_plugindir}/kf5/kfileitemaction/
|
|
%{_kf5_servicesdir}/kdiff3part.desktop
|
|
%doc %lang(en) %{_kf5_mandir}/man1/kdiff3.1%{?ext_man}
|
|
%doc %lang(en) %{_kf5_htmldir}/en/kdiff3
|
|
|
|
%if %{with lang}
|
|
%files lang -f %{name}.lang
|
|
%endif
|
|
|
|
%changelog
|