summaryrefslogtreecommitdiffstats
path: root/kde/patch
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2016-06-15 13:03:40 +0200
committer Eric Hameleers <alien@slackware.com>2016-06-15 13:03:40 +0200
commit2925087b365a3e714c96341bbe42d7cf3c03790e (patch)
tree11376e541ee57e682d97378a91a79e195d16235f /kde/patch
parent059ec433efdf5de32f3fa6aae287bbc484cf1709 (diff)
downloadktown-2925087b365a3e714c96341bbe42d7cf3c03790e.tar.gz
ktown-2925087b365a3e714c96341bbe42d7cf3c03790e.tar.xz
Apply a last-minute patch to make plasma-workspace compile again.
The source tarball for plasma-workspace was re-generated as 5.6.5.1 shortly after, so that this patch could be commented-out again.
Diffstat (limited to 'kde/patch')
-rw-r--r--kde/patch/plasma-workspace.patch3
-rw-r--r--kde/patch/plasma-workspace/plasma-workspace_apply_767aa57.patch23
2 files changed, 26 insertions, 0 deletions
diff --git a/kde/patch/plasma-workspace.patch b/kde/patch/plasma-workspace.patch
index 78714b0..c1e56fc 100644
--- a/kde/patch/plasma-workspace.patch
+++ b/kde/patch/plasma-workspace.patch
@@ -3,3 +3,6 @@
# This functionality has been incorporated into kscreenlocker-5.5.0.
#cat $CWD/patch/plasma-workspace/plasma-workspace_consolekit2.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+# Apply commit that fixes compilation of 5.6.5:
+#cat $CWD/patch/plasma-workspace/plasma-workspace_apply_767aa57.patc | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+
diff --git a/kde/patch/plasma-workspace/plasma-workspace_apply_767aa57.patch b/kde/patch/plasma-workspace/plasma-workspace_apply_767aa57.patch
new file mode 100644
index 0000000..4f22b8e
--- /dev/null
+++ b/kde/patch/plasma-workspace/plasma-workspace_apply_767aa57.patch
@@ -0,0 +1,23 @@
+From: Kai Uwe Broulik <kde@privat.broulik.de>
+Date: Mon, 13 Jun 2016 18:36:17 +0000
+Subject: [PanelView] Fix build...
+X-Git-Url: http://quickgit.kde.org/?p=plasma-workspace.git&a=commitdiff&h=767aa574400276b872aa0495f9af096784a8ed66
+---
+[PanelView] Fix build...
+
+CCMAIL: notmart@gmail.com
+---
+
+
+--- a/shell/panelview.cpp
++++ b/shell/panelview.cpp
+@@ -995,7 +995,7 @@
+ {
+ if (status == Plasma::Types::NeedsAttentionStatus) {
+ showTemporarily();
+- } else if (status == Plasma::AcceptingInputStatus) {
++ } else if (status == Plasma::Types::AcceptingInputStatus) {
+ KWindowSystem::forceActiveWindow(winId());
+ } else {
+ restoreAutoHide();
+