From 2925087b365a3e714c96341bbe42d7cf3c03790e Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Wed, 15 Jun 2016 13:03:40 +0200 Subject: 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. --- kde/patch/plasma-workspace.patch | 3 +++ .../plasma-workspace_apply_767aa57.patch | 23 ++++++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 kde/patch/plasma-workspace/plasma-workspace_apply_767aa57.patch 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 +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(); + -- cgit v1.2.3