From 3aa39a388d53dcddd7269dd8c5efa2cce1258d40 Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Sun, 25 Jun 2017 12:44:16 +0200 Subject: Disable patches that have been applied upstream --- kde/patch/gwenview.patch | 2 +- kde/patch/libkleo.patch | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/kde/patch/gwenview.patch b/kde/patch/gwenview.patch index 8a88dea..04dfe50 100644 --- a/kde/patch/gwenview.patch +++ b/kde/patch/gwenview.patch @@ -1,4 +1,4 @@ # Prevent dataloss when importing pictures; # Will be fixed in 17.04.2: -cat $CWD/patch/gwenview/gwenview-17.04.1_dataloss.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +#cat $CWD/patch/gwenview/gwenview-17.04.1_dataloss.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/kde/patch/libkleo.patch b/kde/patch/libkleo.patch index e2fe8ff..9c1cef3 100644 --- a/kde/patch/libkleo.patch +++ b/kde/patch/libkleo.patch @@ -1,3 +1,4 @@ # Compile libkleo with gcc7: -cat $CWD/patch/libkleo/libkleo_gcc7.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +# Fixed in Applications 17.04.2: +#cat $CWD/patch/libkleo/libkleo_gcc7.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } -- cgit v1.2.3