diff options
author | Eric Hameleers <alien@slackware.com> | 2020-07-31 16:13:18 +0200 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2020-07-31 16:13:18 +0200 |
commit | 703149752c6265b36973d2c1f0f5a69721e3128a (patch) | |
tree | 7ded0d801771d5705f48ffbfb48f37dd4829439e /kde/patch/plasma-framework | |
parent | dd005500c624d127321ff3fe14a0c29bfa8d67f7 (diff) | |
parent | cd7ff1719433fbb3b6a8304596be173bc1b91b00 (diff) | |
download | ktown-master.tar.gz ktown-master.tar.xz |
Diffstat (limited to '')
-rw-r--r-- | kde/patch/plasma-framework.patch | 11 | ||||
-rw-r--r-- | kde/patch/plasma-framework/plasma-framework_KDEBUG_357895.patch | 24 | ||||
-rw-r--r-- | kde/patch/plasma-framework/plasma-framework_KDEBUG_359388.patch | 31 |
3 files changed, 1 insertions, 65 deletions
diff --git a/kde/patch/plasma-framework.patch b/kde/patch/plasma-framework.patch index 601f16c..cca9a13 100644 --- a/kde/patch/plasma-framework.patch +++ b/kde/patch/plasma-framework.patch @@ -1,12 +1,3 @@ -# 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 ; } - # Password is asked twice when connecting to a new WiFi network, # KDEBUG 423093; fixed in Frameworks 5.72 and Plasma 5.20. -cat $CWD/patch/plasma-framework/plasma-framework_KDEBUG_423093.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } - +#cat $CWD/patch/plasma-framework/plasma-framework_KDEBUG_423093.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 deleted file mode 100644 index 9480314..0000000 --- a/kde/patch/plasma-framework/plasma-framework_KDEBUG_357895.patch +++ /dev/null @@ -1,24 +0,0 @@ -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 deleted file mode 100644 index 078dbfd..0000000 --- a/kde/patch/plasma-framework/plasma-framework_KDEBUG_359388.patch +++ /dev/null @@ -1,31 +0,0 @@ -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(); - |