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

Merge pull request #7563 from Hoshpak/update-sddm

Browse source 
sddm: update to 0.15.0
This commit is contained in:
Toyam Cox 2017-09-04 13:55:25 -04:00 committed by GitHub
parent bc5447b030 47a902ec10
commit 3a71f56600
2 changed files with 5 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,34 +0,0 @@
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);
}
}
}

10
srcpkgs/sddm/template
View file

@ -1,18 +1,18 @@
# Template file for 'sddm'
pkgname=sddm
version=0.14.0
revision=4
version=0.15.0
revision=1
build_style=cmake
configure_args="-DBUILD_MAN_PAGES=1 -DNO_SYSTEMD=1 -DLOGIN_DEFS_PATH=/etc/login.defs"
configure_args="-DBUILD_MAN_PAGES=1 -DNO_SYSTEMD=1 -DUSE_ELOGIND=1 -DLOGIN_DEFS_PATH=/etc/login.defs"
hostmakedepends="extra-cmake-modules pkg-config python-docutils"
makedepends="qt5-declarative-devel qt5-tools-devel pam-devel"
makedepends="qt5-declarative-devel qt5-tools-devel pam-devel elogind-devel"
depends="dbus"
short_desc="QML based X11 display manager"
maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="GPL-2"
homepage="http://github.com/sddm/sddm"
distfiles="https://github.com/${pkgname}/${pkgname}/archive/v${version}.tar.gz"
checksum=a551551a6ba324e9c384c89bc63e871de65fea3740eadbea2d63df86045f8205
checksum=7a84089b2e424097664bf7cfb24bdc5896ba0eebf8d54eb77bcac6d16db1e358
if [ -n "$CROSS_BUILD" ]; then
hostmakedepends+=" sddm qt5-host-tools qt5-qmake qt5-tools"