summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2016-02-27 01:56:14 +0100
committer Eric Hameleers <alien@slackware.com>2016-02-27 01:56:14 +0100
commitb6208c6a4d81f62cedbd0a1b002334ff43856763 (patch)
tree09540ae599d2ee454dbc3ce9ae35467a640b2e55
parentf026c76ca3c4058e4cc046fd6622b9b1886c1f49 (diff)
downloadktown-b6208c6a4d81f62cedbd0a1b002334ff43856763.tar.gz
ktown-b6208c6a4d81f62cedbd0a1b002334ff43856763.tar.xz
Fix 'empty systray icons' for applications that use the Xembed protocol.
Xembed issue is KDEBUG 359388. Fix a crash in plasma too; KDEBUG 357895.
-rw-r--r--kde/build/plasma-framework1
-rw-r--r--kde/patch/plasma-framework.patch8
-rw-r--r--kde/patch/plasma-framework/plasma-framework_KDEBUG_357895.patch24
-rw-r--r--kde/patch/plasma-framework/plasma-framework_KDEBUG_359388.patch31
4 files changed, 64 insertions, 0 deletions
diff --git a/kde/build/plasma-framework b/kde/build/plasma-framework
new file mode 100644
index 0000000..0cfbf08
--- /dev/null
+++ b/kde/build/plasma-framework
@@ -0,0 +1 @@
+2
diff --git a/kde/patch/plasma-framework.patch b/kde/patch/plasma-framework.patch
new file mode 100644
index 0000000..0fcd59e
--- /dev/null
+++ b/kde/patch/plasma-framework.patch
@@ -0,0 +1,8 @@
+# KDE Plasma with KF 5.18 crash, if mouse repeatedly hovers over TaskManager
+# KDEBUG 357895; fixed in Frameworks 5.20.
+cat $CWD/patch/plasma-framework/plasma-framework_KDEBUG_357895.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+
+# Icons for SNI Qt apps not appearing
+# KDEBUG 359388; fixed in Frameworks 5.20.
+cat $CWD/patch/plasma-framework/plasma-framework_KDEBUG_359388.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+
diff --git a/kde/patch/plasma-framework/plasma-framework_KDEBUG_357895.patch b/kde/patch/plasma-framework/plasma-framework_KDEBUG_357895.patch
new file mode 100644
index 0000000..9480314
--- /dev/null
+++ b/kde/patch/plasma-framework/plasma-framework_KDEBUG_357895.patch
@@ -0,0 +1,24 @@
+From: David Rosca <nowrep@gmail.com>
+Date: Mon, 15 Feb 2016 18:05:26 +0000
+Subject: WindowThumbnail: Discard glx pixmap in stopRedirecting()
+X-Git-Url: http://quickgit.kde.org/?p=plasma-framework.git&a=commitdiff&h=1e196fdfb2a6eaf1664e1155c086616d55c6712b
+---
+WindowThumbnail: Discard glx pixmap in stopRedirecting()
+
+BUG: 357895
+FIXED-IN: 5.20
+REVIEW: 127072
+---
+
+
+--- a/src/declarativeimports/core/windowthumbnail.cpp
++++ b/src/declarativeimports/core/windowthumbnail.cpp
+@@ -584,6 +584,7 @@
+ return;
+ }
+ xcb_composite_unredirect_window(c, m_winId, XCB_COMPOSITE_REDIRECT_AUTOMATIC);
++ discardPixmap();
+ if (m_damage == XCB_NONE) {
+ return;
+ }
+
diff --git a/kde/patch/plasma-framework/plasma-framework_KDEBUG_359388.patch b/kde/patch/plasma-framework/plasma-framework_KDEBUG_359388.patch
new file mode 100644
index 0000000..078dbfd
--- /dev/null
+++ b/kde/patch/plasma-framework/plasma-framework_KDEBUG_359388.patch
@@ -0,0 +1,31 @@
+From: Dan Vrátil <dvratil@kde.org>
+Date: Tue, 16 Feb 2016 16:59:32 +0000
+Subject: Fix IconItem not loading non-theme icons with name
+X-Git-Url: http://quickgit.kde.org/?p=plasma-framework.git&a=commitdiff&h=525bf2d377c21b41971a72d694a507bf2af0ada6
+---
+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
+---
+
+
+--- a/src/declarativeimports/core/iconitem.cpp
++++ b/src/declarativeimports/core/iconitem.cpp
+@@ -148,6 +148,10 @@
+ //fail, use QIcon
+ } else {
+ m_icon = QIcon::fromTheme(sourceString);
++ if (m_icon.isNull()) {
++ // fallback for non-theme icons
++ m_icon = source.value<QIcon>();
++ }
+ delete m_svgIcon;
+ m_svgIcon = 0;
+ m_imageIcon = QImage();
+