Accepting request 889927 from KDE:Extra

OBS-URL: https://build.opensuse.org/request/show/889927
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kdiff3?expand=0&rev=35

_service

@@ -1,8 +1,8 @@
 <services>
   <service name="tar_scm" mode="disabled">
-   <param name="version">1.8.5</param>
+   <param name="version">1.9.0</param>
    <param name="url">https://invent.kde.org/sdk/kdiff3</param>
-   <param name="revision">refs/tags/1.8.5</param>
+   <param name="revision">refs/tags/1.9.0</param>
    <param name="scm">git</param>
    <param name="filename">kdiff3</param>
    <!-- This folder will be dropped in the next release -->

kdiff3-1.8.5.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:858387c68e022a724c5fb2415579f3d05dba749a286197de0f9790e9ed2144a8
-size 424356

kdiff3-1.9.0.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8edc549cbbe42fab85cbea682701aebe141a400f7240fd5ff13e2d3f12eec9a4
+size 422752

kdiff3-lang.tar.xz

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6d38ce966e2658ede79fd6e69b10f107693883ac3ca25063fa9d45f8a0e09d47
+oid sha256:2a43b5b429f95e74eb1da80a398414d9f6e85e8891b25605e693d2471aab0779
-size 626552
+size 631052

kdiff3.changes

@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Mon May  3 06:37:18 UTC 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  5 09:03:31 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
 

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_kf5 -d build
-  %cmake_build
+%cmake_build
 
 %install
-  %kf5_makeinstall -C build
+%kf5_makeinstall -C build
-  %suse_update_desktop_file -r org.kde.kdiff3 Qt KDE Utility TextEditor X-KDE-Utilities-File
+%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
+%license LICENSES/*
-%dir %{_kf5_iconsdir}/hicolor/256x256
-%dir %{_kf5_iconsdir}/hicolor/256x256/apps
 %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/kfileitemaction/kdiff3fileitemaction.so
-%{_kf5_plugindir}/kf5/parts/
+%{_kf5_plugindir}/kf5/parts/kdiff3part.so
-%{_kf5_servicesdir}/kdiff3part.desktop
 
 %if %{with lang}
 %files lang -f %{name}.lang