1 |
commit: caa941ea733d283d6c175a171de7e5987b3ba139 |
2 |
Author: Johannes Huber <johu <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Dec 23 16:24:02 2016 +0000 |
4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Dec 23 16:40:20 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=caa941ea |
7 |
|
8 |
x11-misc/sddm: Fix display user avatars |
9 |
|
10 |
Revision bump backports upstream patch to fix displaying user avatars. |
11 |
|
12 |
Acked-by: Michael Palimaka <kensington <AT> gentoo.org> |
13 |
|
14 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
15 |
|
16 |
x11-misc/sddm/files/sddm-0.14.0-avatars.patch | 33 +++++++++++ |
17 |
x11-misc/sddm/sddm-0.14.0-r2.ebuild | 85 +++++++++++++++++++++++++++ |
18 |
2 files changed, 118 insertions(+) |
19 |
|
20 |
diff --git a/x11-misc/sddm/files/sddm-0.14.0-avatars.patch b/x11-misc/sddm/files/sddm-0.14.0-avatars.patch |
21 |
new file mode 100644 |
22 |
index 00000000..d40f68c |
23 |
--- /dev/null |
24 |
+++ b/x11-misc/sddm/files/sddm-0.14.0-avatars.patch |
25 |
@@ -0,0 +1,33 @@ |
26 |
+From ecb903e48822bd90650bdd64fe80754e3e9664cb Mon Sep 17 00:00:00 2001 |
27 |
+From: Bastian Beischer <bastian.beischer@×××××.com> |
28 |
+Date: Fri, 2 Sep 2016 13:05:18 +0200 |
29 |
+Subject: [PATCH] Fix display of user avatars. (#684) |
30 |
+ |
31 |
+QFile::exists("...") does not understand file:// URLs, at least in Qt |
32 |
+5.7.0 and Qt 4.8.7. |
33 |
+--- |
34 |
+ src/greeter/UserModel.cpp | 8 ++++---- |
35 |
+ 1 file changed, 4 insertions(+), 4 deletions(-) |
36 |
+ |
37 |
+diff --git a/src/greeter/UserModel.cpp b/src/greeter/UserModel.cpp |
38 |
+index 41a9f10..94c492d 100644 |
39 |
+--- a/src/greeter/UserModel.cpp |
40 |
++++ b/src/greeter/UserModel.cpp |
41 |
+@@ -107,13 +107,13 @@ namespace SDDM { |
42 |
+ d->lastIndex = i; |
43 |
+ |
44 |
+ if (avatarsEnabled) { |
45 |
+- const QString userFace = QStringLiteral("file://%1/.face.icon").arg(user->homeDir); |
46 |
+- const QString systemFace = QStringLiteral("file://%1/%2.face.icon").arg(facesDir).arg(user->name); |
47 |
++ const QString userFace = QStringLiteral("%1/.face.icon").arg(user->homeDir); |
48 |
++ const QString systemFace = QStringLiteral("%1/%2.face.icon").arg(facesDir).arg(user->name); |
49 |
+ |
50 |
+ if (QFile::exists(userFace)) |
51 |
+- user->icon = userFace; |
52 |
++ user->icon = QStringLiteral("file://%1").arg(userFace); |
53 |
+ else if (QFile::exists(systemFace)) |
54 |
+- user->icon = systemFace; |
55 |
++ user->icon = QStringLiteral("file://%1").arg(systemFace); |
56 |
+ } |
57 |
+ } |
58 |
+ } |
59 |
|
60 |
diff --git a/x11-misc/sddm/sddm-0.14.0-r2.ebuild b/x11-misc/sddm/sddm-0.14.0-r2.ebuild |
61 |
new file mode 100644 |
62 |
index 00000000..8081ae6 |
63 |
--- /dev/null |
64 |
+++ b/x11-misc/sddm/sddm-0.14.0-r2.ebuild |
65 |
@@ -0,0 +1,85 @@ |
66 |
+# Copyright 1999-2016 Gentoo Foundation |
67 |
+# Distributed under the terms of the GNU General Public License v2 |
68 |
+# $Id$ |
69 |
+ |
70 |
+EAPI=6 |
71 |
+inherit cmake-utils user |
72 |
+ |
73 |
+DESCRIPTION="Simple Desktop Display Manager" |
74 |
+HOMEPAGE="https://github.com/sddm/sddm" |
75 |
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz" |
76 |
+KEYWORDS="~amd64 ~arm ~x86" |
77 |
+ |
78 |
+LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain" |
79 |
+SLOT="0" |
80 |
+IUSE="consolekit +pam systemd" |
81 |
+ |
82 |
+RDEPEND=">=dev-qt/qtcore-5.6:5 |
83 |
+ >=dev-qt/qtdbus-5.6:5 |
84 |
+ >=dev-qt/qtgui-5.6:5 |
85 |
+ >=dev-qt/qtdeclarative-5.6:5 |
86 |
+ >=dev-qt/qtnetwork-5.6:5 |
87 |
+ >=x11-base/xorg-server-1.15.1 |
88 |
+ x11-libs/libxcb[xkb(-)] |
89 |
+ consolekit? ( >=sys-auth/consolekit-0.9.4 ) |
90 |
+ pam? ( sys-libs/pam ) |
91 |
+ systemd? ( sys-apps/systemd:= ) |
92 |
+ !systemd? ( || ( sys-power/upower sys-power/upower-pm-utils ) )" |
93 |
+ |
94 |
+DEPEND="${RDEPEND} |
95 |
+ dev-python/docutils |
96 |
+ >=dev-qt/linguist-tools-5.6:5 |
97 |
+ >=dev-qt/qttest-5.6:5 |
98 |
+ kde-frameworks/extra-cmake-modules |
99 |
+ virtual/pkgconfig" |
100 |
+ |
101 |
+PATCHES=( |
102 |
+ "${FILESDIR}/${PN}-0.13.0-pam_kwallet.patch" |
103 |
+ # fix for flags handling and bug 563108 |
104 |
+ "${FILESDIR}/${PN}-0.12.0-respect-user-flags.patch" |
105 |
+ "${FILESDIR}/${P}-avatars.patch" |
106 |
+) |
107 |
+ |
108 |
+pkg_pretend() { |
109 |
+ if [[ ${MERGE_TYPE} != binary && $(tc-getCC) == *gcc* ]]; then |
110 |
+ if [[ $(gcc-major-version) -lt 4 || $(gcc-major-version) == 4 && $(gcc-minor-version) -lt 7 ]] ; then |
111 |
+ die 'The active compiler needs to be gcc 4.7 (or newer)' |
112 |
+ fi |
113 |
+ fi |
114 |
+} |
115 |
+ |
116 |
+src_prepare() { |
117 |
+ use consolekit && eapply "${FILESDIR}/${P}-consolekit.patch" |
118 |
+ |
119 |
+ cmake-utils_src_prepare |
120 |
+} |
121 |
+ |
122 |
+src_configure() { |
123 |
+ local mycmakeargs=( |
124 |
+ -DENABLE_PAM=$(usex pam) |
125 |
+ -DNO_SYSTEMD=$(usex '!systemd') |
126 |
+ -DBUILD_MAN_PAGES=ON |
127 |
+ -DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf" |
128 |
+ ) |
129 |
+ |
130 |
+ cmake-utils_src_configure |
131 |
+} |
132 |
+ |
133 |
+pkg_postinst() { |
134 |
+ enewgroup ${PN} |
135 |
+ enewuser ${PN} -1 -1 /var/lib/${PN} ${PN},video |
136 |
+ |
137 |
+ if use consolekit && use pam && [[ -e "${ROOT}"/etc/pam.d/system-login ]]; then |
138 |
+ local line=$(grep "pam_ck_connector.*nox11" "${ROOT}"/etc/pam.d/system-login) |
139 |
+ if [[ -z ${line} ]]; then |
140 |
+ ewarn |
141 |
+ ewarn "Erroneous /etc/pam.d/system-login settings detected!" |
142 |
+ ewarn "Please restore 'nox11' option in the line containing pam_ck_connector:" |
143 |
+ ewarn |
144 |
+ ewarn "session optional pam_ck_connector.so nox11" |
145 |
+ ewarn |
146 |
+ ewarn "or 'emerge -1 sys-auth/pambase' and run etc-update." |
147 |
+ ewarn |
148 |
+ fi |
149 |
+ fi |
150 |
+} |