From d1b626b81c84c81ee9d64f28f19719c3fceed066 Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Thu, 17 Dec 2015 16:28:03 +0100 Subject: Obsoleted patches for KDE-5_15.12 --- kde/patch/kaccounts-integration.patch | 2 +- kde/patch/plasma-desktop.patch | 3 +++ kde/patch/plasma-workspace.patch | 3 ++- 3 files changed, 6 insertions(+), 2 deletions(-) (limited to 'kde/patch') diff --git a/kde/patch/kaccounts-integration.patch b/kde/patch/kaccounts-integration.patch index f9870eb..26b87d4 100644 --- a/kde/patch/kaccounts-integration.patch +++ b/kde/patch/kaccounts-integration.patch @@ -1,4 +1,4 @@ # A bug with 15.08.2/.3 breaks KDE Telepathy accounts connection . # Will be fixed in 15.12.0: -cat $CWD/patch/kaccounts-integration/kaccounts-integration-15.08.3_service.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +#cat $CWD/patch/kaccounts-integration/kaccounts-integration-15.08.3_service.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/kde/patch/plasma-desktop.patch b/kde/patch/plasma-desktop.patch index a407570..bdc18a4 100644 --- a/kde/patch/plasma-desktop.patch +++ b/kde/patch/plasma-desktop.patch @@ -3,3 +3,6 @@ # Forgotten includes: #cat $CWD/patch/plasma-desktop/plasma-desktop_kdelibs4support.diff | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } + +# Fix for Plasma 5.5.0 (KDEBUG #356398): +#cat $CWD/patch/plasma-desktop//plasma-desktop_kickoff_kdebug_356398.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/kde/patch/plasma-workspace.patch b/kde/patch/plasma-workspace.patch index 2b1c630..78714b0 100644 --- a/kde/patch/plasma-workspace.patch +++ b/kde/patch/plasma-workspace.patch @@ -1,4 +1,5 @@ # Add ConsoleKit2 support for screenlocker (ConsoleKit2 has implemented the # systemd-logind API for Lock, Unlock, PrepareForSleep and Inhibit. -cat $CWD/patch/plasma-workspace/plasma-workspace_consolekit2.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +# 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 ; } -- cgit v1.2.3