Hello community, here is the log from the commit of package konsole for openSUSE:Factory checked in at 2019-12-18 14:42:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/konsole (Old) and /work/SRC/openSUSE:Factory/.konsole.new.4691 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "konsole" Wed Dec 18 14:42:38 2019 rev:119 rq:757562 version:19.12.0 Changes: -------- --- /work/SRC/openSUSE:Factory/konsole/konsole.changes 2019-12-13 12:03:52.293413571 +0100 +++ /work/SRC/openSUSE:Factory/.konsole.new.4691/konsole.changes 2019-12-18 14:45:27.633860187 +0100 @@ -1,0 +2,7 @@ +Tue Dec 17 08:38:36 UTC 2019 - Wolfgang Bauer <[email protected]> + +- Add ColorScheme-fix-stack-use-after-scope.patch to fix wrong + background color with "Black on Random Light" color scheme + (boo#1159247, kde#415242) + +------------------------------------------------------------------- @@ -7 +14 @@ - * https://www.kde.org/announcements/releases/19.12.0 + * https://www.kde.org/announcements/releases/19.12 New: ---- ColorScheme-fix-stack-use-after-scope.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ konsole.spec ++++++ --- /var/tmp/diff_new_pack.M3jNHb/_old 2019-12-18 14:45:30.173861348 +0100 +++ /var/tmp/diff_new_pack.M3jNHb/_new 2019-12-18 14:45:30.201861361 +0100 @@ -42,6 +42,8 @@ Source26: utilities-terminal-su-128.png # PATCH-FIX-OPENSUSE Patch0: fix-build-with-gcc48.patch +# PATCH-FIX-UPSTREAM +Patch1: ColorScheme-fix-stack-use-after-scope.patch BuildRequires: fdupes BuildRequires: cmake(KF5Bookmarks) BuildRequires: cmake(KF5Completion) @@ -114,6 +116,7 @@ %if 0%{?suse_version} < 1500 %patch0 -p1 %endif +%patch1 -p1 %build %cmake_kf5 -d build ++++++ ColorScheme-fix-stack-use-after-scope.patch ++++++ >From 2251d55857c950cebaa5fe331b01b5ab220b03b4 Mon Sep 17 00:00:00 2001 From: Mariusz Glebocki <[email protected]> Date: Mon, 9 Dec 2019 23:59:27 +0100 Subject: ColorScheme: fix stack-use-after-scope detected by ASAN --- src/ColorScheme.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/ColorScheme.cpp b/src/ColorScheme.cpp index ff212b7..39eedb2 100644 --- a/src/ColorScheme.cpp +++ b/src/ColorScheme.cpp @@ -310,12 +310,13 @@ ColorEntry ColorScheme::colorEntry(int index, uint randomSeed) const const double maxLightness = qMin(baseLightness + range.lightness / 2.0, MaxLightness); // Use triangular distribution with peak at L=50.0. // Dark and very light colors are less distinguishable. - const auto lightnessIntervals = (minLightness < 50.0 && 50.0 < maxLightness) - ? std::initializer_list<double>{minLightness, 50.0, maxLightness} - : std::initializer_list<double>{minLightness, maxLightness}; static const auto lightnessWeightsFunc = [](double v) { return 50.0 - qAbs(v - 50.0); }; - std::piecewise_linear_distribution<> lightnessDistribution(lightnessIntervals, - lightnessWeightsFunc); + std::piecewise_linear_distribution<> lightnessDistribution; + if (minLightness < 50.0 && 50.0 < maxLightness) { + lightnessDistribution = std::piecewise_linear_distribution<>({minLightness, 50.0, maxLightness}, lightnessWeightsFunc); + } else { + lightnessDistribution = std::piecewise_linear_distribution<>({minLightness, maxLightness}, lightnessWeightsFunc); + } const double lightness = qFuzzyCompare(minLightness, maxLightness) ? baseLightness : lightnessDistribution(randomEngine); -- cgit v1.1
