Import openSUSE:Leap:16.0 modifications

kdiff3.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+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>
 

kdiff3.spec

@@ -31,10 +31,12 @@ 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:  cmake >= 3.22
+# PATCH-FIX-UPSTREAM
+Patch0:         m_bWordWrap-wrong-condition-hang.patch
 BuildRequires:  boost-devel >= 1.82
-BuildRequires:  kf6-extra-cmake-modules >= %{kf6_version}
+BuildRequires:  cmake >= 3.22
 BuildRequires:  fdupes
+BuildRequires:  kf6-extra-cmake-modules >= %{kf6_version}
 BuildRequires:  pkgconfig
 BuildRequires:  cmake(KF6Config) >= %{kf6_version}
 BuildRequires:  cmake(KF6CoreAddons) >= %{kf6_version}

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)