From cb31a7c6403b1e388cca3f8c4887d16efe0b4fcb9353802bea103a275e41f6e4 Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Mon, 3 May 2021 07:39:18 +0000 Subject: [PATCH] Accepting request 889922 from home:cgiboudeaux:branches:KDE:Extra - 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 OBS-URL: https://build.opensuse.org/request/show/889922 OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kdiff3?expand=0&rev=22 --- _service | 4 ++-- kdiff3-1.8.5.tar.xz | 3 --- kdiff3-1.9.0.tar.xz | 3 +++ kdiff3-lang.tar.xz | 4 ++-- kdiff3.changes | 14 ++++++++++++++ kdiff3.spec | 33 +++++++++++++++------------------ 6 files changed, 36 insertions(+), 25 deletions(-) delete mode 100644 kdiff3-1.8.5.tar.xz create mode 100644 kdiff3-1.9.0.tar.xz diff --git a/_service b/_service index 8468680..e6ea661 100644 --- a/_service +++ b/_service @@ -1,8 +1,8 @@ - 1.8.5 + 1.9.0 https://invent.kde.org/sdk/kdiff3 - refs/tags/1.8.5 + refs/tags/1.9.0 git kdiff3 diff --git a/kdiff3-1.8.5.tar.xz b/kdiff3-1.8.5.tar.xz deleted file mode 100644 index eaa0a90..0000000 --- a/kdiff3-1.8.5.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:858387c68e022a724c5fb2415579f3d05dba749a286197de0f9790e9ed2144a8 -size 424356 diff --git a/kdiff3-1.9.0.tar.xz b/kdiff3-1.9.0.tar.xz new file mode 100644 index 0000000..140aa3f --- /dev/null +++ b/kdiff3-1.9.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8edc549cbbe42fab85cbea682701aebe141a400f7240fd5ff13e2d3f12eec9a4 +size 422752 diff --git a/kdiff3-lang.tar.xz b/kdiff3-lang.tar.xz index 0b0d95e..b3cfaff 100644 --- a/kdiff3-lang.tar.xz +++ b/kdiff3-lang.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6d38ce966e2658ede79fd6e69b10f107693883ac3ca25063fa9d45f8a0e09d47 -size 626552 +oid sha256:2a43b5b429f95e74eb1da80a398414d9f6e85e8891b25605e693d2471aab0779 +size 631052 diff --git a/kdiff3.changes b/kdiff3.changes index c9c4625..738a215 100644 --- a/kdiff3.changes +++ b/kdiff3.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Mon May 3 06:37:18 UTC 2021 - Christophe Giboudeaux + +- 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 5 09:03:31 UTC 2021 - Christophe Giboudeaux diff --git a/kdiff3.spec b/kdiff3.spec index eb73770..2496018 100644 --- a/kdiff3.spec +++ b/kdiff3.spec @@ -18,18 +18,18 @@ %bcond_without lang Name: kdiff3 -Version: 1.8.5 +Version: 1.9.0 Release: 0 Summary: Code Comparison Utility License: GPL-2.0-or-later Group: Development/Tools/Version Control URL: http://kdiff3.sourceforge.net/ -# Drop the _service file and restore the line below for the next release -# Source0: https://download.kde.org/stable/%%{name}/%%{name}-%%{version}.tar.xz Source0: %{name}-%{version}.tar.xz Source1: kdiff3-lang.tar.xz +BuildRequires: boost-devel BuildRequires: extra-cmake-modules BuildRequires: fdupes +BuildRequires: hicolor-icon-theme BuildRequires: kf5-filesystem BuildRequires: update-desktop-files BuildRequires: cmake(KF5CoreAddons) @@ -40,7 +40,7 @@ BuildRequires: cmake(KF5IconThemes) BuildRequires: cmake(KF5KIO) BuildRequires: cmake(KF5Parts) BuildRequires: cmake(KF5WidgetsAddons) -BuildRequires: cmake(Qt5Core) >= 5.7.0 +BuildRequires: cmake(Qt5Core) BuildRequires: cmake(Qt5Gui) BuildRequires: cmake(Qt5PrintSupport) BuildRequires: cmake(Qt5Widgets) @@ -50,12 +50,9 @@ Recommends: %{name}-lang = %{version} 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 @@ -64,26 +61,27 @@ KDiff3 is a program that: %autosetup -p1 -a1 %build - %cmake_kf5 -d build - %cmake_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 +%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} +%fdupes %{buildroot} %files -%license COPYING -%dir %{_kf5_iconsdir}/hicolor/256x256 -%dir %{_kf5_iconsdir}/hicolor/256x256/apps +%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 @@ -91,9 +89,8 @@ KDiff3 is a program that: %{_kf5_iconsdir}/hicolor/scalable/apps/kdiff3.svgz %{_kf5_kxmlguidir}/kdiff3/ %{_kf5_kxmlguidir}/kdiff3part/ -%{_kf5_plugindir}/kf5/kfileitemaction/ -%{_kf5_plugindir}/kf5/parts/ -%{_kf5_servicesdir}/kdiff3part.desktop +%{_kf5_plugindir}/kf5/kfileitemaction/kdiff3fileitemaction.so +%{_kf5_plugindir}/kf5/parts/kdiff3part.so %if %{with lang} %files lang -f %{name}.lang