Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kdiff3 for openSUSE:Factory checked in at 2021-06-29 22:43:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdiff3 (Old) and /work/SRC/openSUSE:Factory/.kdiff3.new.2625 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdiff3" Tue Jun 29 22:43:18 2021 rev:39 rq:902933 version:1.9.2 Changes: -------- --- /work/SRC/openSUSE:Factory/kdiff3/kdiff3.changes 2021-06-01 10:39:30.889022769 +0200 +++ /work/SRC/openSUSE:Factory/.kdiff3.new.2625/kdiff3.changes 2021-06-29 22:43:54.786925380 +0200 @@ -1,0 +2,21 @@ +Mon Jun 28 13:10:55 UTC 2021 - Tilman Vogel <tilman.vo...@web.de> + +- Remove GCC 11 build fix: + * 0001-Explicitly-include-limits-for-compatibility-with-gcc.patch + now contained in squashed patch +- Add collected fixes from upstream master: + * 0001-Collected-fixes-from-master.patch + contains the original and many more fixes: + + misalignment and wrong conflict resolutions when using manual + alignment markers + + uninitialized variables causing crashes + + hangs and crashes due to wrong loop conditions + + wrong handling of new-line at end-of-file + + spurious insertion of empty lines in merge result + + access of uninitialized iterators causing crashes + + wrong buffer length calculations causing out-of-bounds access + + wrong bit-logic causing comments to always be treated as white-space + + crashes when hitting a key on empty merge results + + technical details allowing fixes to be cherry-picked + +------------------------------------------------------------------- Old: ---- 0001-Explicitly-include-limits-for-compatibility-with-gcc.patch New: ---- 0001-Collected-fixes-from-master.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdiff3.spec ++++++ --- /var/tmp/diff_new_pack.9y7gev/_old 2021-06-29 22:43:55.198925924 +0200 +++ /var/tmp/diff_new_pack.9y7gev/_new 2021-06-29 22:43:55.202925929 +0200 @@ -28,7 +28,7 @@ Source1: https://download.kde.org/stable/%{name}/%{name}-%{version}.tar.xz.sig Source2: kdiff3.keyring # PATCH-FIX-UPSTREAM -Patch0: 0001-Explicitly-include-limits-for-compatibility-with-gcc.patch +Patch0: 0001-Collected-fixes-from-master.patch BuildRequires: boost-devel BuildRequires: extra-cmake-modules BuildRequires: fdupes ++++++ 0001-Collected-fixes-from-master.patch ++++++ ++++ 1369 lines (skipped)
