From ccf84bcd604130256d1377cd58f0a634ae6ee20f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 28 Dec 2017 04:06:07 +0000 Subject: gentoo resync : 28.12.2017 --- x11-misc/sddm/Manifest | 2 -- x11-misc/sddm/files/sddm-0.13.0-pam_kwallet.patch | 10 ------- x11-misc/sddm/files/sddm-0.14.0-avatars.patch | 33 ----------------------- 3 files changed, 45 deletions(-) delete mode 100644 x11-misc/sddm/files/sddm-0.13.0-pam_kwallet.patch delete mode 100644 x11-misc/sddm/files/sddm-0.14.0-avatars.patch (limited to 'x11-misc/sddm') diff --git a/x11-misc/sddm/Manifest b/x11-misc/sddm/Manifest index ee82ff4ad45f..dd505697f8b3 100644 --- a/x11-misc/sddm/Manifest +++ b/x11-misc/sddm/Manifest @@ -1,6 +1,4 @@ AUX sddm-0.12.0-respect-user-flags.patch 779 BLAKE2B 3ea539e4e426fa745be2ae6c59f6bd96e42d864ddba9942681397a2cdae69528d837001535502e83e6ef50a9ca65a30b62601af76a11465a5b42feffef348edf SHA512 77e3f2ec4dff122e40428444055ed7cbbb177242c9c3c034b1934dda7a3ff2345dd8fcee4b927b797f66163bffc23a5760dd55c2fa24f2c614cd7dec88ffde88 -AUX sddm-0.13.0-pam_kwallet.patch 391 BLAKE2B 0d55dec54b2ae4f2d5aab5d90af73f9b4771ecca572e4e74e22e8f0893bc4c30d2dbc84a682e84dc9e9609582298ca63137193d6242a3b62ddd1e65e2bc7b547 SHA512 55375d2c91dad5478be14988e7889344eb8f0694300aefc7803d0f193f7160b5900647e4e35a604aa76119556304d055ff323c4892023664224dc36070c62b02 -AUX sddm-0.14.0-avatars.patch 1470 BLAKE2B 4f5b5de2792f37c823bf30591f7964a6a100d7f5a8a5521578a41dcf5be3e4b2353976538135c07be489fe68a84f3de414d2ce6bba8736c49450889667a156c4 SHA512 09a2b487767c4d84e9bb1225d27e21a6716c7c299b5f3aff5fb4934d1ddc3659658eaffcf30dd60f2c83389a461b4fe91c23cab4646c740ef5eec658e14a1eac AUX sddm-0.14.0-consolekit.patch 322 BLAKE2B ace6c045ab0282eca8bf8a11aa8aa2690fac3ce7f712cd71e48bc9ec8f04dc18b9afd997d04550ade8a37a24a66e430f6b5ae8e752345c7c132cb95ae61b2e73 SHA512 aa53338c3e154982388b2e98101cd49e607f1744acee28f46892e3a6848f06de4ba8a8bf204128da1a7b22df9efe5d95bb6ac1cd5dedb8a301f8587af381253a AUX sddm-0.16.0-Xsession.patch 606 BLAKE2B 8d437038be2b5fd3934174320aa14484ddd5de5b3d8529100af2679b4cb8ac2ef846ca2812ac8136b7482cf8010d724e37555636304fbe1e72b3a53c0d6b5b1e SHA512 ce01832d8af011c4e244c9357f540182cdf3b7af8d00616132f94c95a95b32df41beb1760ac8cad7a0a5a34165b8b289df0308656268d67f9bc420b5d3fb40f1 AUX sddm-0.16.0-ck2-revert.patch 918 BLAKE2B 803f3370260ce40a4b46d3d7a9f2f7529db90baba039c080606f9333e4933c6e3a219331d57dbc577e6a32567fedade3a4aec8bd1706bfb5887a0c281d37c2fb SHA512 f9b49390f656d3ba9528c9fecaff044bab7f4933293bd439fc3ccec873aae9899b4f8b93fa769d506948de2be1d3275dafc96795b1c20caf547cbf474ee12b60 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 ff1c4d2dd409..000000000000 --- 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 d40f68c10a2e..000000000000 --- 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 -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); - } - } - } -- cgit v1.2.3