From 0c9a33b9bf481985fcbab2ca18fa2d8360524bbb Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Mon, 11 Sep 2017 23:14:02 +0200 Subject: Update / disable KDE patches --- kde/patch/digikam.patch | 6 +++--- kde/patch/krita.patch | 2 +- kde/patch/ksudoku.patch | 2 +- kde/patch/sddm-qt5.patch | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/kde/patch/digikam.patch b/kde/patch/digikam.patch index fa9c73e..ec056c9 100644 --- a/kde/patch/digikam.patch +++ b/kde/patch/digikam.patch @@ -3,7 +3,7 @@ #cat $CWD/patch/digikam/digikam_clang_fix.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } # Fix linking issue, backport from git master: -cd core - cat $CWD/patch/digikam/digikam_databasemodel.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } -cd - +#cd core +# cat $CWD/patch/digikam/digikam_databasemodel.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +#cd - diff --git a/kde/patch/krita.patch b/kde/patch/krita.patch index 3f1486b..e1604ab 100644 --- a/kde/patch/krita.patch +++ b/kde/patch/krita.patch @@ -1,3 +1,3 @@ # Fix compilation of Krita against Qt 5.9: -cat $CWD/patch/krita/krita_qt59.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +#cat $CWD/patch/krita/krita_qt59.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/kde/patch/ksudoku.patch b/kde/patch/ksudoku.patch index 9789c51..d379585 100644 --- a/kde/patch/ksudoku.patch +++ b/kde/patch/ksudoku.patch @@ -1,4 +1,4 @@ # Qt5 apps accept qwindowtitle, not caption. KDEBUG 381087, # however ksudoku-17.04.x is still kdelibs4 based: -cat $CWD/patch/ksudoku/ksudoku_qwindowtitle.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +#cat $CWD/patch/ksudoku/ksudoku_qwindowtitle.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/kde/patch/sddm-qt5.patch b/kde/patch/sddm-qt5.patch index 8b2df3a..21f2c04 100644 --- a/kde/patch/sddm-qt5.patch +++ b/kde/patch/sddm-qt5.patch @@ -9,7 +9,7 @@ cat $CWD/patch/sddm-qt5/sddm_userxsession.diff | patch -p1 --verbose || { touch # Fix display of user avatars ($HOME/.face.icon file) # (fixed in sddm-0.15.0). -cat $CWD//patch/sddm-qt5/sddm_avatars.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +#cat $CWD//patch/sddm-qt5/sddm_avatars.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } # Fix a compilation error on passwd backend: #cat $CWD/patch/sddm-qt5/sddm_auth.diff | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } -- cgit v1.2.3