From a9d71515a154550b44e1a61658dd87706f8940f0 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 22 Feb 2016 17:35:02 -0600 Subject: [PATCH] KDE Plasma crashes when the mouse pointer repeatedly hovers the TaskManager (#1310875) --- ...Discard-glx-pixmap-in-stopRedirectin.patch | 28 ++++++++++++++++++ ...ot-loading-non-theme-icons-with-name.patch | 29 +++++++++++-------- kf5-plasma.spec | 8 +++-- 3 files changed, 51 insertions(+), 14 deletions(-) create mode 100644 0007-WindowThumbnail-Discard-glx-pixmap-in-stopRedirectin.patch rename 0001-fix-iconitem-not-loading-non-theme-icons.patch => 0009-Fix-IconItem-not-loading-non-theme-icons-with-name.patch (55%) diff --git a/0007-WindowThumbnail-Discard-glx-pixmap-in-stopRedirectin.patch b/0007-WindowThumbnail-Discard-glx-pixmap-in-stopRedirectin.patch new file mode 100644 index 0000000..629ad85 --- /dev/null +++ b/0007-WindowThumbnail-Discard-glx-pixmap-in-stopRedirectin.patch @@ -0,0 +1,28 @@ +From 1e196fdfb2a6eaf1664e1155c086616d55c6712b Mon Sep 17 00:00:00 2001 +From: David Rosca +Date: Mon, 15 Feb 2016 19:05:26 +0100 +Subject: [PATCH 07/25] WindowThumbnail: Discard glx pixmap in + stopRedirecting() + +BUG: 357895 +FIXED-IN: 5.20 +REVIEW: 127072 +--- + src/declarativeimports/core/windowthumbnail.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/declarativeimports/core/windowthumbnail.cpp b/src/declarativeimports/core/windowthumbnail.cpp +index 21e655e..b838053 100644 +--- a/src/declarativeimports/core/windowthumbnail.cpp ++++ b/src/declarativeimports/core/windowthumbnail.cpp +@@ -584,6 +584,7 @@ void WindowThumbnail::stopRedirecting() + return; + } + xcb_composite_unredirect_window(c, m_winId, XCB_COMPOSITE_REDIRECT_AUTOMATIC); ++ discardPixmap(); + if (m_damage == XCB_NONE) { + return; + } +-- +2.5.0 + diff --git a/0001-fix-iconitem-not-loading-non-theme-icons.patch b/0009-Fix-IconItem-not-loading-non-theme-icons-with-name.patch similarity index 55% rename from 0001-fix-iconitem-not-loading-non-theme-icons.patch rename to 0009-Fix-IconItem-not-loading-non-theme-icons-with-name.patch index 10f02d1..ba440fb 100644 --- a/0001-fix-iconitem-not-loading-non-theme-icons.patch +++ b/0009-Fix-IconItem-not-loading-non-theme-icons-with-name.patch @@ -1,16 +1,18 @@ -commit 525bf2d377c21b41971a72d694a507bf2af0ada6 -Author: Dan Vrátil -Date: Tue Feb 16 17:59:32 2016 +0100 +From 525bf2d377c21b41971a72d694a507bf2af0ada6 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dan=20Vr=C3=A1til?= +Date: Tue, 16 Feb 2016 17:59:32 +0100 +Subject: [PATCH 09/25] Fix IconItem not loading non-theme icons with name - Fix IconItem not loading non-theme icons with name - - Commit 5184ac introduced a small regression that caused IconItem - to no longer load non-theme icons with name set, for instance icons - coming from sni-qt, causing sni-qt apps to not show in systray. - - BUG: 359388 - FIXED-IN: 5.20 - REVIEW: 127091 +Commit 5184ac introduced a small regression that caused IconItem +to no longer load non-theme icons with name set, for instance icons +coming from sni-qt, causing sni-qt apps to not show in systray. + +BUG: 359388 +FIXED-IN: 5.20 +REVIEW: 127091 +--- + src/declarativeimports/core/iconitem.cpp | 4 ++++ + 1 file changed, 4 insertions(+) diff --git a/src/declarativeimports/core/iconitem.cpp b/src/declarativeimports/core/iconitem.cpp index 1d7921a..085f284 100644 @@ -27,3 +29,6 @@ index 1d7921a..085f284 100644 delete m_svgIcon; m_svgIcon = 0; m_imageIcon = QImage(); +-- +2.5.0 + diff --git a/kf5-plasma.spec b/kf5-plasma.spec index 38799d5..b1e9864 100644 --- a/kf5-plasma.spec +++ b/kf5-plasma.spec @@ -2,7 +2,7 @@ Name: kf5-%{framework} Version: 5.19.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: KDE Frameworks 5 Tier 3 framework is foundation to build a primary user interface License: GPLv2+ and LGPLv2+ and BSD @@ -21,7 +21,8 @@ Source0: http://download.kde.org/%{stable}/frameworks/%{versiondir}/%{framework} Source10: fedora-plasma-cache.sh.in ## upstream patches -Patch0: 0001-fix-iconitem-not-loading-non-theme-icons.patch +Patch7: 0007-WindowThumbnail-Discard-glx-pixmap-in-stopRedirectin.patch +Patch9: 0009-Fix-IconItem-not-loading-non-theme-icons-with-name.patch BuildRequires: extra-cmake-modules >= %{version} BuildRequires: kf5-kactivities-devel >= %{version} @@ -142,6 +143,9 @@ sed -e "s|@@VERSION@@|%{version}|g" fedora-plasma-cache.sh.in > \ %changelog +* Mon Feb 22 2016 Rex Dieter 5.19.0-3 +- KDE Plasma crashes when the mouse pointer repeatedly hovers the TaskManager (#1310875) + * Thu Feb 16 2016 Daniel Vrátil - 5.19.0-2 - pull upstream patch for BKO#359388