jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

sddm: fix display of user avatars

Browse source 
sddm 0.14.0 introduced an issue with displaying user avatars.  The
simple fix was committed to master, but wasn't released.
https://github.com/sddm/sddm/issues/807
This commit is contained in:
Matthew Wynn 2017-06-09 11:52:50 -05:00
parent 8886b12d61
commit ffddd848f1
No known key found for this signature in database
GPG key ID: ECEB282430604CA4
2 changed files with 35 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
srcpkgs/sddm/patches/0001-Fix-Avatars.patch Normal file
View file

@ -0,0 +1,34 @@
From ecb903e48822bd90650bdd64fe80754e3e9664cb Mon Sep 17 00:00:00 2001
From: Bastian Beischer <bastian.beischer@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 src/greeter/UserModel.cpp src/greeter/UserModel.cpp
index 41a9f10c..94c492d0 100644
--- src/greeter/UserModel.cpp
+++ 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);
}
}
}

2
srcpkgs/sddm/template
View file

@ -1,7 +1,7 @@
# Template file for 'sddm'
pkgname=sddm
version=0.14.0
revision=3
revision=4
build_style=cmake
configure_args="-DBUILD_MAN_PAGES=1 -DNO_SYSTEMD=1 -DLOGIN_DEFS_PATH=/etc/login.defs"
hostmakedepends="extra-cmake-modules pkg-config python-docutils"