Hello community, here is the log from the commit of package kscreen5 for openSUSE:Factory checked in at 2015-10-30 13:41:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kscreen5 (Old) and /work/SRC/openSUSE:Factory/.kscreen5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kscreen5" Changes: -------- --- /work/SRC/openSUSE:Factory/kscreen5/kscreen5.changes 2015-10-19 22:17:46.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kscreen5.new/kscreen5.changes 2015-10-30 13:41:51.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Oct 26 15:39:36 UTC 2015 - hrvoje.sen...@gmail.com + +- Added fix-crash-when-exiting-kscreen-kcm-in-systemsettings.patch + (kde#344651, boo#951933) + +------------------------------------------------------------------- New: ---- fix-crash-when-exiting-kscreen-kcm-in-systemsettings.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kscreen5.spec ++++++ --- /var/tmp/diff_new_pack.in5OhK/_old 2015-10-30 13:41:51.000000000 +0100 +++ /var/tmp/diff_new_pack.in5OhK/_new 2015-10-30 13:41:51.000000000 +0100 @@ -26,6 +26,8 @@ Url: http://www.kde.org Source: kscreen-%{version}.tar.xz Source99: %{name}-rpmlintrc +# PATCH-FIX-UPSTREAM fix-crash-when-exiting-kscreen-kcm-in-systemsettings.patch +Patch0: fix-crash-when-exiting-kscreen-kcm-in-systemsettings.patch BuildRequires: cmake >= 2.8.12 BuildRequires: extra-cmake-modules >= 1.6.0 BuildRequires: fdupes @@ -69,6 +71,7 @@ %lang_package %prep %setup -q -n kscreen-%{version} +%patch0 -p1 %build %cmake_kf5 -d build -- -DCMAKE_INSTALL_LOCALEDIR=share/locale/kf5 ++++++ fix-crash-when-exiting-kscreen-kcm-in-systemsettings.patch ++++++ From: Martin Gräßlin <mgraess...@kde.org> Date: Wed, 21 Oct 2015 08:30:58 +0000 Subject: Fix crash when exiting kscreen kcm in systemsettings X-Git-Url: http://quickgit.kde.org/?p=kscreen.git&a=commitdiff&h=4653c287f844f2cb19379ff001ca76d7d9e3a2a1 --- Fix crash when exiting kscreen kcm in systemsettings When using threaded rendering loop [1] systemsettings crashed when clicking the back button. This crash is caused inside the shader effect used by the OpacityMask. QtQuick informed us also that something is wrong: "QSGDefaultLayer::bind: ShaderEffectSource: 'recursive' must be set to true when rendering recursively." The actual problem is that orientationPanelContainer and the OpacityMask are children to the monitor item causing recursion. By making them siblings to the orientationPanelContainer the problem is resolved. The error message from QtQuick is no longer shown and systemsettings doesn't crash any more. BUG: 344651 FIXED-IN: 5.4.3 REVIEW: 125734 [1] QSG_RENDER_LOOP=threaded systemsettings5 --- --- a/kcm/qml/Output.qml +++ b/kcm/qml/Output.qml @@ -249,40 +249,39 @@ } } } - - Item { - id: orientationPanelContainer; - - anchors.fill: monitor; - - visible: false - - Rectangle { - id: orientationPanel; - - anchors { - left: parent.left; - right: parent.right; - bottom: parent.bottom; - } - - height: 10; - color: root.focus ? palette.highlight : palette.shadow; - smooth: true; - - Behavior on color { - PropertyAnimation { - duration: 150; - } - } - } - } - - OpacityMask { - anchors.fill: orientationPanelContainer; - source: orientationPanelContainer; - maskSource: monitor; - } + } + Item { + id: orientationPanelContainer; + + anchors.fill: monitor; + + visible: false + + Rectangle { + id: orientationPanel; + + anchors { + left: parent.left; + right: parent.right; + bottom: parent.bottom; + } + + height: 10; + color: root.focus ? palette.highlight : palette.shadow; + smooth: true; + + Behavior on color { + PropertyAnimation { + duration: 150; + } + } + } + } + + OpacityMask { + anchors.fill: orientationPanelContainer; + source: orientationPanelContainer; + maskSource: monitor; } }
