Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kdiff3 for openSUSE:Factory checked in at 2025-07-18 15:58:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdiff3 (Old) and /work/SRC/openSUSE:Factory/.kdiff3.new.8875 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdiff3" Fri Jul 18 15:58:52 2025 rev:59 rq:1294194 version:1.12.3 Changes: -------- --- /work/SRC/openSUSE:Factory/kdiff3/kdiff3.changes 2025-06-30 13:07:19.399986306 +0200 +++ /work/SRC/openSUSE:Factory/.kdiff3.new.8875/kdiff3.changes 2025-07-18 15:59:55.429963418 +0200 @@ -1,0 +2,6 @@ +Thu Jul 17 11:54:05 UTC 2025 - Bruno Pitrus <brunopit...@hotmail.com> + +- Add backported m_bWordWrap-wrong-condition-hang.patch + * fixes mergetool hang (kde#507065) + +------------------------------------------------------------------- New: ---- m_bWordWrap-wrong-condition-hang.patch ----------(New B)---------- New: - Add backported m_bWordWrap-wrong-condition-hang.patch * fixes mergetool hang (kde#507065) ----------(New E)---------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdiff3.spec ++++++ --- /var/tmp/diff_new_pack.gP1Yqs/_old 2025-07-18 15:59:57.322042400 +0200 +++ /var/tmp/diff_new_pack.gP1Yqs/_new 2025-07-18 15:59:57.338043068 +0200 @@ -31,10 +31,12 @@ 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 ++++++ >From b6e97aeb2541f770fe114467259df44e46413862 Mon Sep 17 00:00:00 2001 From: Michael Reeves <reeves...@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)
