Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kdiff3 for openSUSE:Factory checked in at 2023-05-04 17:10:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdiff3 (Old) and /work/SRC/openSUSE:Factory/.kdiff3.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdiff3" Thu May 4 17:10:45 2023 rev:45 rq:1084460 version:1.10.2 Changes: -------- --- /work/SRC/openSUSE:Factory/kdiff3/kdiff3.changes 2023-01-17 17:36:24.585555977 +0100 +++ /work/SRC/openSUSE:Factory/.kdiff3.new.1533/kdiff3.changes 2023-05-04 17:11:05.664547588 +0200 @@ -1,0 +2,16 @@ +Wed May 3 13:42:10 UTC 2023 - Christophe Marin <christo...@krop.fr> + +- Update to 1.10.2 + * Prevent false error due to faulty check when + m_pOptions->m_bDiff3AlignBC = true + * fix crash when word wrap enabled (kde#468492) + * Rework KDiff3App::completeInit to avoid crash on exit in auto + mode + * "Escape" shortcut ignored if merge output in focus (kde#467652) + * save and restore dock states (kde#466522) + * Show UI before comparison start (kde#439148) + * Don't crash on broken links (kde#466241) + * Fix memory safety issues during reload. (kde#466524) + * Fix mishandling line count for files containing '0x0b' + +------------------------------------------------------------------- Old: ---- kdiff3-1.10.0.tar.xz kdiff3-1.10.0.tar.xz.sig New: ---- kdiff3-1.10.2.tar.xz kdiff3-1.10.2.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdiff3.spec ++++++ --- /var/tmp/diff_new_pack.UqXN6K/_old 2023-05-04 17:11:06.244550984 +0200 +++ /var/tmp/diff_new_pack.UqXN6K/_new 2023-05-04 17:11:06.248551008 +0200 @@ -18,11 +18,10 @@ %bcond_without released Name: kdiff3 -Version: 1.10.0 +Version: 1.10.2 Release: 0 Summary: Code Comparison Utility License: GPL-2.0-or-later -Group: Development/Tools/Version Control URL: https://apps.kde.org/kdiff3 Source0: https://download.kde.org/stable/%{name}/%{name}-%{version}.tar.xz %if %{with released} @@ -30,7 +29,7 @@ Source2: kdiff3.keyring %endif # PATCH-FIX-OPENSUSE -Patch: Fix-linking-with-boost-1.75.0.patch +Patch0: Fix-linking-with-boost-1.75.0.patch %if 0%{?suse_version} <= 1500 BuildRequires: libboost_headers1_75_0-devel %else ++++++ Fix-linking-with-boost-1.75.0.patch ++++++ --- /var/tmp/diff_new_pack.UqXN6K/_old 2023-05-04 17:11:06.272551148 +0200 +++ /var/tmp/diff_new_pack.UqXN6K/_new 2023-05-04 17:11:06.276551172 +0200 @@ -1,4 +1,4 @@ -From d1f6385c0838602bce35f02087556f978d7c074b Mon Sep 17 00:00:00 2001 +From e446ad2f7fd795d7d2afa654262c77cdbc45ea4a Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer <wba...@tmo.at> Date: Tue, 17 Jan 2023 11:33:47 +0100 Subject: [PATCH] Fix linking with boost 1.75.0 @@ -12,14 +12,14 @@ As a (ugly) workaround, override the function that breaks kdiff3's build to be inline before including the boost headers (when using 1.75.0). --- - src/TypeUtils.h | 10 ++++++++++ - 1 file changed, 10 insertions(+) + src/TypeUtils.h | 11 +++++++++++ + 1 file changed, 11 insertions(+) diff --git a/src/TypeUtils.h b/src/TypeUtils.h -index de2265f0..459a5777 100644 +index a9c3ba2..ab735ba 100644 --- a/src/TypeUtils.h +++ b/src/TypeUtils.h -@@ -14,6 +14,16 @@ +@@ -14,6 +14,17 @@ #include <type_traits> #include <limits> @@ -33,10 +33,11 @@ + inline const char * literal_string(const safe_numerics_error & e); +} +#endif ++ + #include <boost/safe_numerics/automatic.hpp> #include <boost/safe_numerics/safe_integer.hpp> - #if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) -- -2.35.3 +2.40.1 ++++++ kdiff3-1.10.0.tar.xz -> kdiff3-1.10.2.tar.xz ++++++ ++++ 152031 lines of diff (skipped)
