* [gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/files/
@ 2016-10-29 13:58 Michael Palimaka
0 siblings, 0 replies; 4+ messages in thread
From: Michael Palimaka @ 2016-10-29 13:58 UTC (permalink / raw
To: gentoo-commits
commit: a68e3c8d70ecaa38a20831d71a0514b2e622a1d3
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 29 13:57:47 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Oct 29 13:58:30 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a68e3c8d
x11-misc/sddm: remove unused patch
Package-Manager: portage-2.3.2
.../sddm/files/sddm-0.13.0-password-focus.patch | 109 ---------------------
1 file changed, 109 deletions(-)
diff --git a/x11-misc/sddm/files/sddm-0.13.0-password-focus.patch b/x11-misc/sddm/files/sddm-0.13.0-password-focus.patch
deleted file mode 100644
index cc27669..00000000
--- a/x11-misc/sddm/files/sddm-0.13.0-password-focus.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-From 6d5b36b28907b16280ff78995fef764bb0c573db Mon Sep 17 00:00:00 2001
-From: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
-Date: Sat, 16 Jan 2016 19:52:09 +0100
-Subject: [PATCH] Activate window for the primary screen
-
-Request activation for the view on the primary screen
-otherwise text fields won't get focus.
-
-Closes #501
-
-[ChangeLog][Greeter] Fix text field focus (issue #501)
----
- src/greeter/GreeterApp.cpp | 31 ++++++++++++++++++++++++++++++-
- src/greeter/GreeterApp.h | 4 +++-
- 2 files changed, 33 insertions(+), 2 deletions(-)
-
-diff --git a/src/greeter/GreeterApp.cpp b/src/greeter/GreeterApp.cpp
-index 06d13c5..8201a4e 100644
---- a/src/greeter/GreeterApp.cpp
-+++ b/src/greeter/GreeterApp.cpp
-@@ -1,5 +1,5 @@
- /***************************************************************************
--* Copyright (c) 2015 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
-+* Copyright (c) 2015-2016 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
- * Copyright (c) 2013 Abdurrahman AVCI <abdurrahmanavci@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
-@@ -36,6 +36,7 @@
- #include <QQmlContext>
- #include <QQmlEngine>
- #include <QDebug>
-+#include <QTimer>
- #include <QTranslator>
-
- #include <iostream>
-@@ -135,6 +136,11 @@ namespace SDDM {
-
- // handle screens
- connect(this, &GreeterApp::screenAdded, this, &GreeterApp::addViewForScreen);
-+#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
-+ connect(this, &GreeterApp::primaryScreenChanged, this, [this](QScreen *) {
-+ activatePrimary();
-+ });
-+#endif
- }
-
- void GreeterApp::addViewForScreen(QScreen *screen) {
-@@ -144,6 +150,7 @@ namespace SDDM {
- view->setResizeMode(QQuickView::SizeRootObjectToView);
- //view->setGeometry(QRect(QPoint(0, 0), screen->geometry().size()));
- view->setGeometry(screen->geometry());
-+ m_views.append(view);
-
- // remove the view when the screen is removed, but we
- // need to be careful here since Qt will move the view to
-@@ -201,11 +208,33 @@ namespace SDDM {
- // show
- qDebug() << "Adding view for" << screen->name() << screen->geometry();
- view->show();
-+
-+ // activate windows for the primary screen to give focus to text fields
-+ if (QGuiApplication::primaryScreen() == screen)
-+ view->requestActivate();
- }
-
- void GreeterApp::removeViewForScreen(QQuickView *view) {
-+ // screen is gone, remove the window
- m_views.removeOne(view);
- view->deleteLater();
-+
-+#if QT_VERSION < QT_VERSION_CHECK(5, 6, 0)
-+ // starting from Qt 5.6 we are notified when the primary screen is changed
-+ // and we request activation for the view when we get the signal, with
-+ // older version we iterate the views and request activation
-+ activatePrimary();
-+#endif
-+ }
-+
-+ void GreeterApp::activatePrimary() {
-+ // activate and give focus to the window assigned to the primary screen
-+ Q_FOREACH (QQuickView *view, m_views) {
-+ if (view->screen() == QGuiApplication::primaryScreen()) {
-+ view->requestActivate();
-+ break;
-+ }
-+ }
- }
- }
-
-diff --git a/src/greeter/GreeterApp.h b/src/greeter/GreeterApp.h
-index 91fc1a9..1ebd981 100644
---- a/src/greeter/GreeterApp.h
-+++ b/src/greeter/GreeterApp.h
-@@ -1,5 +1,5 @@
- /***************************************************************************
--* Copyright (c) 2015 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
-+* Copyright (c) 2015-2016 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
- * Copyright (c) 2013 Nikita Mikhaylov <nslqqq@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
-@@ -65,6 +65,8 @@ namespace SDDM {
- UserModel *m_userModel { nullptr };
- GreeterProxy *m_proxy { nullptr };
- KeyboardModel *m_keyboard { nullptr };
-+
-+ void activatePrimary();
- };
- }
-
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/files/
@ 2017-12-27 10:40 Michael Palimaka
0 siblings, 0 replies; 4+ messages in thread
From: Michael Palimaka @ 2017-12-27 10:40 UTC (permalink / raw
To: gentoo-commits
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.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 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);
- }
- }
- }
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/files/
@ 2018-07-08 11:33 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2018-07-08 11:33 UTC (permalink / raw
To: gentoo-commits
commit: 5d0418f942e4280b3645d273b48fdf9ae1bfec5b
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sun Jul 8 09:01:49 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jul 8 11:23:16 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d0418f9
x11-misc/sddm: remove unused patch
.../sddm/files/sddm-0.17.0-switchtogreeter.patch | 54 ----------------------
1 file changed, 54 deletions(-)
diff --git a/x11-misc/sddm/files/sddm-0.17.0-switchtogreeter.patch b/x11-misc/sddm/files/sddm-0.17.0-switchtogreeter.patch
deleted file mode 100644
index 22d2fa4ae9b..00000000000
--- a/x11-misc/sddm/files/sddm-0.17.0-switchtogreeter.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-Subject: [PATCH] Fix switchToGreeter not available without logind
-From: Alexander Miller <alex.miller@gmx.de>
-
-Seats can't be created until SeatManager's signals are
-connected to the DisplayManager, or the latter won't see
-them and switchToGreeter doesn't work. So split SeatManager
-initialization from its constructor and call initialize it
-only after all connections have been set up in DaemonApp's
-constructor.
-
-With logind there may have been enough delay before seats
-got actually added so things would work, but it's still
-cleaner to fix the order.
-
-Fixes: https://bugs.gentoo.org/644718
-Fixes: https://github.com/sddm/sddm/issues/824
-
---- a/src/daemon/SeatManager.h
-+++ b/src/daemon/SeatManager.h
-@@ -31,8 +31,9 @@ namespace SDDM {
- class SeatManager : public QObject {
- Q_OBJECT
- public:
-- explicit SeatManager(QObject *parent = 0);
-+ explicit SeatManager(QObject *parent = 0) {}
-
-+ void initialize();
- void createSeat(const QString &name);
- void removeSeat(const QString &name);
- void switchToGreeter(const QString &seat);
---- a/src/daemon/SeatManager.cpp
-+++ b/src/daemon/SeatManager.cpp
-@@ -93,8 +93,7 @@ namespace SDDM {
- }
- }
-
-- SeatManager::SeatManager(QObject *parent) : QObject(parent) {
--
-+ void SeatManager::initialize() {
- if (DaemonApp::instance()->testing() || !Logind::isAvailable()) {
- //if we don't have logind/CK2, just create a single seat immediately and don't do any other connections
- createSeat(QStringLiteral("seat0"));
---- a/src/daemon/DaemonApp.cpp
-+++ b/src/daemon/DaemonApp.cpp
-@@ -75,6 +75,9 @@ namespace SDDM {
-
- // log message
- qDebug() << "Starting...";
-+
-+ // initialize seats only after signals are connected
-+ m_seatManager->initialize();
- }
-
- bool DaemonApp::testing() const {
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/files/
@ 2020-06-20 21:41 Mikle Kolyada
0 siblings, 0 replies; 4+ messages in thread
From: Mikle Kolyada @ 2020-06-20 21:41 UTC (permalink / raw
To: gentoo-commits
commit: b784e831946a9b297a24e4e8db4877550cf18480
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 20 21:40:37 2020 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sat Jun 20 21:41:26 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b784e831
x11-misc/sddm: redo pam patch
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
x11-misc/sddm/files/pam-1.4-substack.patch | 38 ++++++++----------------------
1 file changed, 10 insertions(+), 28 deletions(-)
diff --git a/x11-misc/sddm/files/pam-1.4-substack.patch b/x11-misc/sddm/files/pam-1.4-substack.patch
index 56be825e6e9..b0467b26822 100644
--- a/x11-misc/sddm/files/pam-1.4-substack.patch
+++ b/x11-misc/sddm/files/pam-1.4-substack.patch
@@ -1,18 +1,5 @@
-From 9fc1d933517eb01846585f41d04ee335f9f198e8 Mon Sep 17 00:00:00 2001
-From: Mikle Kolyada <zlogene@gentoo.org>
-Date: Sat, 20 Jun 2020 18:32:37 +0300
-Subject: [PATCH] Fix pam v1.4.0 compat
-
-Signed-off-by: Mikle Kolyada <zlogene@gentoo.org>
----
- services/sddm-autologin.pam | 1 -
- services/sddm.pam | 8 ++++----
- 2 files changed, 4 insertions(+), 5 deletions(-)
-
-diff --git a/sddm-0.18.1/services/sddm-autologin.pam b/sddm-0.18.1/services/sddm-autologin.pam
-index 4c82048..fc86790 100755
---- a/services/sddm-autologin.pam
-+++ b/services/sddm-autologin.pam
+--- sddm-0.18.1/services/sddm-autologin.pam.bak 2020-06-19 22:27:57.305580696 +0200
++++ sddm-0.18.1/services/sddm-autologin.pam 2020-06-19 22:30:50.513583973 +0200
@@ -1,6 +1,5 @@
#%PAM-1.0
auth required pam_env.so
@@ -20,10 +7,8 @@ index 4c82048..fc86790 100755
auth required pam_shells.so
auth required pam_nologin.so
auth required pam_permit.so
-diff --git a/sddm-0.18.1/services/sddm.pam b/sddm-0.18.1/services/sddm.pam
-index 343650e..61c1976 100755
---- a/services/sddm.pam
-+++ b/services/sddm.pam
+--- sddm-0.18.1/services/sddm.pam.bak 2020-06-19 22:27:26.721580117 +0200
++++ sddm-0.18.1/services/sddm.pam 2020-06-19 22:27:48.729580533 +0200
@@ -1,15 +1,15 @@
#%PAM-1.0
@@ -33,17 +18,14 @@ index 343650e..61c1976 100755
-auth optional pam_kwallet5.so
-account include system-login
-+account substack system-login
++account substack system-login
-password include system-login
-+password substack system-login
++password substack system-login
-password optional pam_gnome_keyring.so use_authtok
--session optional pam_keyinit.so force revoke
-+session substack pam_keyinit.so force revoke
- session include system-login
+ session optional pam_keyinit.so force revoke
+-session include system-login
++session substack system-login
-session optional pam_gnome_keyring.so auto_start
- -session optional pam_kwallet5.so auto_start
---
-2.26.2
-
+ -session optional pam_kwallet5.so auto_start
\ No newline at end of file
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-06-20 21:41 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-07-08 11:33 [gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2020-06-20 21:41 Mikle Kolyada
2017-12-27 10:40 Michael Palimaka
2016-10-29 13:58 Michael Palimaka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox