commit: 07fcab0de1513d9ab62b4c07f49f9f69c06a415d Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> AuthorDate: Wed Dec 27 09:46:54 2017 +0000 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> CommitDate: Wed Dec 27 10:40:19 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07fcab0d
x11-misc/sddm: remove unused patches Closes: https://github.com/gentoo/gentoo/pull/6658 x11-misc/sddm/files/sddm-0.13.0-pam_kwallet.patch | 10 ------- x11-misc/sddm/files/sddm-0.14.0-avatars.patch | 33 ----------------------- 2 files changed, 43 deletions(-) diff --git a/x11-misc/sddm/files/sddm-0.13.0-pam_kwallet.patch b/x11-misc/sddm/files/sddm-0.13.0-pam_kwallet.patch deleted file mode 100644 index ff1c4d2dd40..00000000000 --- a/x11-misc/sddm/files/sddm-0.13.0-pam_kwallet.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/services/sddm.pam 2015-08-17 18:06:19.000000000 +0200 -+++ b/services/sddm.pam 2016-02-21 19:54:08.654091951 +0100 -@@ -4,3 +4,7 @@ - account include system-login - password include system-login - session include system-login -+-auth optional pam_kwallet.so kdehome=.kde4 -+-auth optional pam_kwallet5.so -+-session optional pam_kwallet.so -+-session optional pam_kwallet5.so auto_start diff --git a/x11-misc/sddm/files/sddm-0.14.0-avatars.patch b/x11-misc/sddm/files/sddm-0.14.0-avatars.patch deleted file mode 100644 index d40f68c10a2..00000000000 --- a/x11-misc/sddm/files/sddm-0.14.0-avatars.patch +++ /dev/null @@ -1,33 +0,0 @@ -From ecb903e48822bd90650bdd64fe80754e3e9664cb Mon Sep 17 00:00:00 2001 -From: Bastian Beischer <bastian.beisc...@gmail.com> -Date: Fri, 2 Sep 2016 13:05:18 +0200 -Subject: [PATCH] Fix display of user avatars. (#684) - -QFile::exists("...") does not understand file:// URLs, at least in Qt -5.7.0 and Qt 4.8.7. ---- - src/greeter/UserModel.cpp | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/greeter/UserModel.cpp b/src/greeter/UserModel.cpp -index 41a9f10..94c492d 100644 ---- a/src/greeter/UserModel.cpp -+++ b/src/greeter/UserModel.cpp -@@ -107,13 +107,13 @@ namespace SDDM { - d->lastIndex = i; - - if (avatarsEnabled) { -- const QString userFace = QStringLiteral("file://%1/.face.icon").arg(user->homeDir); -- const QString systemFace = QStringLiteral("file://%1/%2.face.icon").arg(facesDir).arg(user->name); -+ const QString userFace = QStringLiteral("%1/.face.icon").arg(user->homeDir); -+ const QString systemFace = QStringLiteral("%1/%2.face.icon").arg(facesDir).arg(user->name); - - if (QFile::exists(userFace)) -- user->icon = userFace; -+ user->icon = QStringLiteral("file://%1").arg(userFace); - else if (QFile::exists(systemFace)) -- user->icon = systemFace; -+ user->icon = QStringLiteral("file://%1").arg(systemFace); - } - } - }
