Accepting request 1294194 from KDE:Extra

- Add backported m_bWordWrap-wrong-condition-hang.patch
  * fixes mergetool hang (kde#507065)

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

kdiff3-1.11.2.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:91853775c3faa9522468ec123cd6de74662acb6d5116475996aca4dc2c3befc8
-size 1141676

kdiff3-1.11.2.tar.xz.sig

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEE7lbXEIhdNvseTSHz9EKzbWFLBrwFAmZ/E8QACgkQ9EKzbWFL
-BrwypQ//U2cjRvx1ygtZmRxGYAYz66V9BY+eXkPmonGMCpquIMof6adUXNSimOdv
-DTO+NW3pXc42SDQalXx5u4xweboCRtaIaN/5huqbjXlBFKUDXkgOJoqrTlIYZ0j9
-rj80DphcFuFTlHaaLI/ZC+CKk/SabyATEsf3w/n/sCvzSlTcY2TpLYVrtv6WbTfz
-9y04cRxFcDwEg2dvZ0EAbQAj2fqJaDKR412seM9+O5U6xXD35Z0lNesAzUmh2s3G
-VZ59BKxjL6CNTtv+zWpVrohO3GFm5M2YUMYf0Xq/biVUqBwS2l243dlfJxHf5RDB
-hi0SoURJePjfc9e5BuSWVRVgf5l82XaGIvUmKn82sJ4Xq1eSvUwl7dhsWvGg5tCn
-1CRV7dkjBn/DdDY6vnDvv4PkxKaZuS6B7DzeLilkZfzd3xpDK/GjT+6gsQfZMl1h
-3Q9jUyM3kJM/1/7vTeFOncHhyVq5esoq5DXPJz7/HFewssY9Aje5t9trCVZXySPN
-IziuneKvPr1VTNAOHe9KbBck1NMYvY5oC0cYCjX+RaBThPVsr+rWqCTrH3iDGfl7
-pw3wrbAKd3p3uT0tUzfL96iIyXxJ0FL38js8GM/n6/Ge0ypmUfnRGIwyWABNrfpk
-AIF4RGUuu3nZ2+cRQ5Pj3D+SjdfNoqQudMSBwBRTyM28ZbYxxvk=
-=6RVB
------END PGP SIGNATURE-----

kdiff3-1.12.3.tar.xz

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

kdiff3-1.12.3.tar.xz.sig

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEE7lbXEIhdNvseTSHz9EKzbWFLBrwFAmgiiSgACgkQ9EKzbWFL
+Brzgag/+KQHRkX5o4xBr1k3uLsQRgsrFS7jxSja/S2Bh041JHWVhhGnZK1d45mHo
+q6ruLATuGlE9ZOaWb+D2oNa9U47hDUcbUBJAE5IoNRqLVdqLu+Hzcn+ELNv9YSW1
+DGAP9Y/Zu8ryJil/9YEiToYlWkWdM0CjPy7jNpIoEzqeg6dJ+no2BCHRDGFGQWFn
+PCqu29a1HmHfEzRGa2v4pXebVspfh5PW46oKjAK3wNbIrMGLuqdyIW+wpxUfpxh9
+jdzZ/Mq4mJjjEqT06KPZA3p3Oxj6jzESDqhJbwSGsZItDlok2BZYkNys4gPr1W4A
+XTyPXcjRFPiWFshnt+ICL86myM8oR/pLHLRqMbVs38qxmpAwVgF9i59V7H1rOFmA
+WTCgscIC1oFxhRi9NkJTL3ijpjSW8XA88G9xWMfMhP12BLdi18a1VdDNgNU5UThf
+U9so2qL/egm3KhSPcRfuMM5MvM+JODh0v6p8Ch5JuIhahaCmvOfL5Z1CaXarnBBo
+okxyumkPoiGBMPmpQhNpVHo2ekvdotre9dDe23aTLm7IdyPJKe4eNo0/753/F5EU
+9JRapGVZEuZe2VNsQlAmRA47iaG+wy6IIg7ypczQOhOlCzLwxurjLx6HqMGq3UmT
+y31ng1V/Neqh9bzrczdVPMx9mr7heFxOcQ9dVPOdN0V58qwMKmE=
+=Rdow
+-----END PGP SIGNATURE-----

kdiff3.changes

@@ -1,3 +1,73 @@
+-------------------------------------------------------------------
+Thu Jul 17 11:54:05 UTC 2025 - Bruno Pitrus <brunopitrus@hotmail.com>
+
+- Add backported m_bWordWrap-wrong-condition-hang.patch
+  * fixes mergetool hang (kde#507065)
+
+-------------------------------------------------------------------
+Tue May 20 06:38:21 UTC 2025 - Christophe Marin <christophe@krop.fr>
+
+- Update to 1.12.3
+  * Fix installation bug
+  * Fix crash on directory compare on Windows 11
+
+-------------------------------------------------------------------
+Mon Mar 24 21:44:38 UTC 2025 - Christophe Marin <christophe@krop.fr>
+
+- Update to 1.12.1
+  * Revert to old file load/save code due to missing data issues.
+  * Audit code and remove encoding error fail points - this will
+    not remove the encoding errors themselves.
+
+-------------------------------------------------------------------
+Sat Feb 22 13:16:19 UTC 2025 - Christophe Marin <christophe@krop.fr>
+
+- Update to 1.12.1
+  * fixed horizontal scroll with track pad ignored.
+  * reduce initial file load time
+  * ignore encoding errors during merge this will become a warning.
+  * adjust flatpak default flags.
+  * drop unused Qt6Core5Compat depenancy check.
+
+-------------------------------------------------------------------
+Sun Dec  8 11:05:37 UTC 2024 - Christophe Marin <christophe@krop.fr>
+
+- Update to 1.12.0
+  * Completed port away from Qt5, 6.6 now required version due
+    to delayed ICU support in Qt
+  * Fixed UTF-8-BOM output encoding issues mustly seen on windows.
+  * horizontal scroll correctly comptuted for diff windows
+  * False errors on first launch with files selected should be fixed.
+    (kde#497102, boo#1234260)
+
+-------------------------------------------------------------------
+Wed Nov 20 12:44:08 UTC 2024 - Christophe Marin <christophe@krop.fr>
+
+- Stop using the %suse_update_desktop_file macro
+
+-------------------------------------------------------------------
+Fri Nov  8 12:43:47 UTC 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  1 21:09:52 UTC 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  1 09:25:11 UTC 2024 - Christophe Marin <christophe@krop.fr>
 

kdiff3.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package kdiff3
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -21,7 +21,7 @@
 
 %bcond_without released
 Name:           kdiff3
-Version:        1.11.2
+Version:        1.12.3
 Release:        0
 Summary:        Code Comparison Utility
 License:        GPL-2.0-or-later
@@ -31,10 +31,13 @@ Source0:        https://download.kde.org/stable/%{name}/%{name}-%{version}.tar.x
 Source1:        https://download.kde.org/stable/%{name}/%{name}-%{version}.tar.xz.sig
 Source2:        kdiff3.keyring
 %endif
-BuildRequires:  boost-devel >= 1.71
-BuildRequires:  kf6-extra-cmake-modules >= %{kf6_version}
+# PATCH-FIX-UPSTREAM
+Patch0:         m_bWordWrap-wrong-condition-hang.patch
+BuildRequires:  boost-devel >= 1.82
+BuildRequires:  cmake >= 3.22
 BuildRequires:  fdupes
-BuildRequires:  update-desktop-files
+BuildRequires:  kf6-extra-cmake-modules >= %{kf6_version}
+BuildRequires:  pkgconfig
 BuildRequires:  cmake(KF6Config) >= %{kf6_version}
 BuildRequires:  cmake(KF6CoreAddons) >= %{kf6_version}
 BuildRequires:  cmake(KF6Crash) >= %{kf6_version}
@@ -44,11 +47,12 @@ BuildRequires:  cmake(KF6KIO) >= %{kf6_version}
 BuildRequires:  cmake(KF6WidgetsAddons) >= %{kf6_version}
 BuildRequires:  cmake(KF6XmlGui) >= %{kf6_version}
 BuildRequires:  cmake(Qt6Core) >= %{qt6_version}
-BuildRequires:  cmake(Qt6Core5Compat) >= %{qt6_version}
 BuildRequires:  cmake(Qt6Gui) >= %{qt6_version}
 BuildRequires:  cmake(Qt6PrintSupport) >= %{qt6_version}
 BuildRequires:  cmake(Qt6Test) >= %{qt6_version}
 BuildRequires:  cmake(Qt6Widgets) >= %{qt6_version}
+BuildRequires:  pkgconfig(icu-i18n) >= 70.0
+BuildRequires:  pkgconfig(icu-uc) >= 70.0
 
 %description
 KDiff3 is a program that:
@@ -65,15 +69,13 @@ KDiff3 is a program that:
 %autosetup -p1
 
 %build
-%cmake_kf6 -DBUILD_WITH_QT6:BOOL=TRUE
+%cmake_kf6
 
 %kf6_build
 
 %install
 %kf6_install
 
-%suse_update_desktop_file -r org.kde.kdiff3 Qt KDE Utility TextEditor X-KDE-Utilities-File
-
 %find_lang %{name} --all-name --with-man --with-html
 
 %fdupes %{buildroot}

m_bWordWrap-wrong-condition-hang.patch

@@ -0,0 +1,28 @@
+From b6e97aeb2541f770fe114467259df44e46413862 Mon Sep 17 00:00:00 2001
+From: Michael Reeves <reeves.87@gmail.com>
+Date: Sun, 29 Jun 2025 22:02:14 -0400
+Subject: [PATCH] Revert unitended condition change
+
+---
+ src/difftextwindow.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/difftextwindow.cpp b/src/difftextwindow.cpp
+index 4de52e834..e753125a2 100644
+--- a/src/difftextwindow.cpp
++++ b/src/difftextwindow.cpp
+@@ -557,12 +557,13 @@ qint32 DiffTextWindow::getMaxTextWidth()
+     /*
+         mDiff3LineVector is null when qt sends a resize event before init. Default to fixed size in this case.
+     */
+-    if(d->mDiff3LineVector == nullptr || !d->m_bWordWrap)
++    if(d->mDiff3LineVector == nullptr || d->m_bWordWrap)
+     {
+         return getVisibleTextAreaWidth();
+     }
+     else if(d->m_maxTextWidth.loadRelaxed() < 0)
+     {
++        //TODO: This appears to be broken in someway.
+         d->m_maxTextWidth = 0;
+         QTextLayout textLayout(QString(), font(), this);
+         for(qint32 i = 0; i < d->m_size; ++i)