diff options
| author |   Eric Hameleers <alien@slackware.com> | 2020-06-08 21:30:18 +0200 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2020-06-08 21:30:18 +0200 |
| commit | e41c0c99c8d498cc2f3761eb35d4f5389a6d1798 (patch) | |
| tree | 3b0294e2874f1a34943eeb9a19682313ba43e6c2 /kde/patch/sddm-qt5.patch | |
| parent | f6a28c20081bd24619074c99ddfeb1932b09df2f (diff) | |
| download | ktown-e41c0c99c8d498cc2f3761eb35d4f5389a6d1798.tar.gz ktown-e41c0c99c8d498cc2f3761eb35d4f5389a6d1798.tar.xz | |
Proposed changes for a migration from ConsoleKit2 to elogind
Using elogind will enable a fully working Wayland session for KDE Plasma5.
Diffstat (limited to 'kde/patch/sddm-qt5.patch')
| -rw-r--r-- | kde/patch/sddm-qt5.patch | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/kde/patch/sddm-qt5.patch b/kde/patch/sddm-qt5.patch index d57fb12..5919925 100644 --- a/kde/patch/sddm-qt5.patch +++ b/kde/patch/sddm-qt5.patch @@ -1,26 +1,21 @@ -# Add missing consolekit support -# (brings back the switch_user functionality in KDE): -cat $CWD/patch/sddm-qt5/sddm_consolekit.diff | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +if [ "$SLKELOGIND" == "no" ]; then + # Add missing consolekit support + # (brings back the switch_user functionality in KDE): + cat $CWD/patch/sddm-qt5/sddm_consolekit.diff | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } -# Don't assume that ConsoleKit2 exposes a login1 dbus interface: -cat $CWD/patch/sddm-qt5/sddm_ck2_revert.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } + # Don't assume that ConsoleKit2 exposes a login1 dbus interface: + cat $CWD/patch/sddm-qt5/sddm_ck2_revert.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +fi + +# Properly honor supplemental groups, https://github.com/sddm/sddm/issues/1159 : +cat $CWD/patch/sddm-qt5/sddm_revert-honor-PAM-supplemental-groups.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +cat $CWD/patch/sddm-qt5/sddm_honor-PAM-supplemental-groups-v2.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } # SDDM 0.14 sources $HOME/.xsession which in Slackware will override the # session selection you make in SDDM. We fix that unwanted side effect by # reverting the change: cat $CWD/patch/sddm-qt5/sddm_userxsession.diff | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } -# 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 ; } - -# 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 ; } - -# Fix a compilation error on passwd backend: -# (fixed in sddm-0.12.0). -#cat $CWD/patch/sddm-qt5/sddm_qstring.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } - # Add the dutch translation: if ! grep -q nl.ts data/translations/CMakeLists.txt ; then sed -e '/set(TRANSLATION_FILES/s/TRANSLATION_FILES/&\n nl.ts/' \ |