summaryrefslogtreecommitdiffstats
path: root/kde/patch/kdelibs.patch
diff options
context:
space:
mode:
Diffstat (limited to 'kde/patch/kdelibs.patch')
-rw-r--r--kde/patch/kdelibs.patch8
1 files changed, 5 insertions, 3 deletions
diff --git a/kde/patch/kdelibs.patch b/kde/patch/kdelibs.patch
index 63cfd34..c314b55 100644
--- a/kde/patch/kdelibs.patch
+++ b/kde/patch/kdelibs.patch
@@ -6,7 +6,9 @@ zcat $CWD/patch/kdelibs/kdelibs.docbook.patch.gz | patch -p1 --verbose || { touc
# export SOLID_UPNP=1
zcat $CWD/patch/kdelibs/kdelibs.upnp_conditional.patch.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-## Fix plasma crash noticed exiting KDE, or quitting Amarok:
-# Fixed in KDE 4.10.4:
-#zcat $CWD/patch/kdelibs/changeset_r9323adac35d40da69e3cb18504340e984c4afd05.diff.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+# Revert 3 patches which (although they probably follow the FDo spec better),
+# cause incorrect icon overrides:
+zcat $CWD/patch/kdelibs/return-not-break.-copy-paste-error.patch.gz | patch -R -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+zcat $CWD/patch/kdelibs/coding-style-fixes.patch.gz | patch -R -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+zcat $CWD/patch/kdelibs/return-application-icons-properly.patch.gz | patch -R -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }