From 0dbae212aafec772a6f3db3308852ffb98a4e0c5 Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Thu, 20 Apr 2017 21:33:28 +0200 Subject: Some patches are no longer necessary --- kde/patch/akonadi.patch | 5 +++-- kde/patch/kdesdk-kioslaves.patch | 2 +- kde/patch/kholidays.patch | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) (limited to 'kde') diff --git a/kde/patch/akonadi.patch b/kde/patch/akonadi.patch index 5d8e15e..c5f95f6 100644 --- a/kde/patch/akonadi.patch +++ b/kde/patch/akonadi.patch @@ -2,8 +2,9 @@ # This is Windows-centric and breaks on any linux GCC upgrade. # Thanks to Gentoo where I found the following two patches at # https://packages.gentoo.org/packages/kde-apps/akonadi -cat $CWD/patch/akonadi/akonadi_revert-abs-path.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } -cat $CWD/patch/akonadi/akonadi_rename-header.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +# No longer needed since 17.04.0. +#cat $CWD/patch/akonadi/akonadi_revert-abs-path.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +#cat $CWD/patch/akonadi/akonadi_rename-header.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/kde/patch/kdesdk-kioslaves.patch b/kde/patch/kdesdk-kioslaves.patch index dd4f9e2..da2f885 100644 --- a/kde/patch/kdesdk-kioslaves.patch +++ b/kde/patch/kdesdk-kioslaves.patch @@ -1,3 +1,3 @@ # Fix compilation against svn > 1.8. -cat $CWD/patch/kdesdk-kioslaves/svn19.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +#cat $CWD/patch/kdesdk-kioslaves/svn19.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/kde/patch/kholidays.patch b/kde/patch/kholidays.patch index db024f8..ec8ad80 100644 --- a/kde/patch/kholidays.patch +++ b/kde/patch/kholidays.patch @@ -4,5 +4,5 @@ # Revert depfreeze breaking merges (KF5_VERSION, cmake, PIM_VERSION). # Should be fixed in Applications > 16.12.3. -cat $CWD/patch/kholidays/kholidays_depfreeze_revert.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +#cat $CWD/patch/kholidays/kholidays_depfreeze_revert.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } -- cgit v1.2.3