rpms
/
sddm
20
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch f37 into epel9-next

Browse Source
epel9
Troy Dawson 2 years ago
parent 6e291bef12 7df02a806e
commit 6c7277a10b
5 changed files with 28 additions and 17 deletions
Show Stats Download Patch File Download Diff File

2
.gitignore vendored
Unescape View File

@ -19,3 +19,5 @@
/sddm-3ee57e99836fe051c97e0f301962120466d220f7.tar.gz /sddm-3ee57e99836fe051c97e0f301962120466d220f7.tar.gz
/sddm-8f1e3df4768bd521034e02602c4410b06aaef7d5.tar.gz /sddm-8f1e3df4768bd521034e02602c4410b06aaef7d5.tar.gz
/sddm-572b128c92c5bce366f5db136423b0b296448429.tar.gz /sddm-572b128c92c5bce366f5db136423b0b296448429.tar.gz
/sddm-e07e805c21310572b4fecc810fd5610b1d3d03fd.tar.gz
/sddm-e6524335a54ca469401ee9487adc4ae973860aad.tar.gz

8
0001-Delay-for-logind-and-fallback-to-seat0.patch
Unescape View File

@ -1,4 +1,4 @@
From 5e6c0f872272fd617228628ab46c491313750019 Mon Sep 17 00:00:00 2001 From 4d44531c8f624f5b479c3ff23e8fecc67eb848ab Mon Sep 17 00:00:00 2001
From: Jeremy Linton <jeremy.linton@arm.com> From: Jeremy Linton <jeremy.linton@arm.com>
Date: Fri, 22 Oct 2021 14:51:54 -0500 Date: Fri, 22 Oct 2021 14:51:54 -0500
Subject: [PATCH] Delay for logind, and fallback to seat0 Subject: [PATCH] Delay for logind, and fallback to seat0
@ -79,7 +79,7 @@ index 011bb7f..6255c69 100644
if (QDBusConnection::systemBus().interface()->isServiceRegistered(QStringLiteral("org.freedesktop.ConsoleKit"))) { if (QDBusConnection::systemBus().interface()->isServiceRegistered(QStringLiteral("org.freedesktop.ConsoleKit"))) {
qDebug() << "Console kit interface found"; qDebug() << "Console kit interface found";
diff --git a/src/daemon/SeatManager.cpp b/src/daemon/SeatManager.cpp diff --git a/src/daemon/SeatManager.cpp b/src/daemon/SeatManager.cpp
index 429ed19..9f569bb 100644 index bd207e6..39d8b85 100644
--- a/src/daemon/SeatManager.cpp --- a/src/daemon/SeatManager.cpp
+++ b/src/daemon/SeatManager.cpp +++ b/src/daemon/SeatManager.cpp
@@ -26,6 +26,9 @@ @@ -26,6 +26,9 @@
@ -124,7 +124,7 @@ index 429ed19..9f569bb 100644
+ +
void SDDM::SeatManager::logindSeatAdded(const QString& name, const QDBusObjectPath& objectPath) void SDDM::SeatManager::logindSeatAdded(const QString& name, const QDBusObjectPath& objectPath)
{ {
auto logindSeat = new LogindSeat(name, objectPath, this); auto logindSeat = new LogindSeat(name, objectPath);
diff --git a/src/daemon/SeatManager.h b/src/daemon/SeatManager.h diff --git a/src/daemon/SeatManager.h b/src/daemon/SeatManager.h
index b2f9796..aa43047 100644 index b2f9796..aa43047 100644
--- a/src/daemon/SeatManager.h --- a/src/daemon/SeatManager.h
@ -138,5 +138,5 @@ index b2f9796..aa43047 100644
} }
-- --
2.38.1 2.39.2

19
sddm-0.20.0-fedora_config.patch
Unescape View File

@ -1,8 +1,7 @@
diff --git a/src/common/Configuration.h b/src/common/Configuration.h diff -bur ../sddm-e07e805c21310572b4fecc810fd5610b1d3d03fd-old/src/common/Configuration.h ./src/common/Configuration.h
index 182f6a1..538243b 100644 --- ../sddm-e07e805c21310572b4fecc810fd5610b1d3d03fd-old/src/common/Configuration.h 2023-03-20 12:26:39.000000000 +0100
--- a/src/common/Configuration.h +++ ./src/common/Configuration.h 2023-03-20 13:26:27.420722920 +0100
+++ b/src/common/Configuration.h @@ -37,8 +37,7 @@
@@ -37,8 +37,7 @@ namespace SDDM {
enum NumState { NUM_NONE, NUM_SET_ON, NUM_SET_OFF }; enum NumState { NUM_NONE, NUM_SET_ON, NUM_SET_OFF };
// Name Type Default value Description // Name Type Default value Description
@ -12,7 +11,7 @@ index 182f6a1..538243b 100644
"Valid values are: x11, x11-user, wayland.")); "Valid values are: x11, x11-user, wayland."));
Entry(HaltCommand, QString, _S(HALT_COMMAND), _S("Halt command")); Entry(HaltCommand, QString, _S(HALT_COMMAND), _S("Halt command"));
Entry(RebootCommand, QString, _S(REBOOT_COMMAND), _S("Reboot command")); Entry(RebootCommand, QString, _S(REBOOT_COMMAND), _S("Reboot command"));
@@ -51,7 +50,7 @@ namespace SDDM { @@ -51,7 +50,7 @@
// Name Entries (but it's a regular class again) // Name Entries (but it's a regular class again)
Section(Theme, Section(Theme,
Entry(ThemeDir, QString, _S(DATA_INSTALL_DIR "/themes"), _S("Theme directory path")); Entry(ThemeDir, QString, _S(DATA_INSTALL_DIR "/themes"), _S("Theme directory path"));
@ -21,7 +20,7 @@ index 182f6a1..538243b 100644
Entry(FacesDir, QString, _S(DATA_INSTALL_DIR "/faces"), _S("Global directory for user avatars\n" Entry(FacesDir, QString, _S(DATA_INSTALL_DIR "/faces"), _S("Global directory for user avatars\n"
"The files should be named <username>.face.icon")); "The files should be named <username>.face.icon"));
Entry(CursorTheme, QString, QString(), _S("Cursor theme used in the greeter")); Entry(CursorTheme, QString, QString(), _S("Cursor theme used in the greeter"));
@@ -71,9 +70,9 @@ namespace SDDM { @@ -71,9 +70,9 @@
Entry(SessionDir, QStringList, {_S("/usr/local/share/xsessions"), Entry(SessionDir, QStringList, {_S("/usr/local/share/xsessions"),
_S("/usr/share/xsessions")}, _S("Comma-separated list of directories containing available X sessions")); _S("/usr/share/xsessions")}, _S("Comma-separated list of directories containing available X sessions"));
Entry(SessionCommand, QString, _S(SESSION_COMMAND), _S("Path to a script to execute when starting the desktop session")); Entry(SessionCommand, QString, _S(SESSION_COMMAND), _S("Path to a script to execute when starting the desktop session"));
@ -31,16 +30,16 @@ index 182f6a1..538243b 100644
+ Entry(SessionLogFile, QString, _S(".cache/xsession-errors"), _S("Path to the user session log file")); + Entry(SessionLogFile, QString, _S(".cache/xsession-errors"), _S("Path to the user session log file"));
+ Entry(DisplayCommand, QString, _S(SYS_CONFIG_DIR "/sddm/Xsetup"), _S("Path to a script to execute when starting the display server")); + Entry(DisplayCommand, QString, _S(SYS_CONFIG_DIR "/sddm/Xsetup"), _S("Path to a script to execute when starting the display server"));
+ Entry(DisplayStopCommand, QString, _S(SYS_CONFIG_DIR "/sddm/Xstop"), _S("Path to a script to execute when stopping the display server")); + Entry(DisplayStopCommand, QString, _S(SYS_CONFIG_DIR "/sddm/Xstop"), _S("Path to a script to execute when stopping the display server"));
Entry(EnableHiDPI, bool, false, _S("Enable Qt's automatic high-DPI scaling")); Entry(EnableHiDPI, bool, true, _S("Enable Qt's automatic high-DPI scaling"));
); );
@@ -82,12 +81,12 @@ namespace SDDM { @@ -82,12 +81,12 @@
Entry(SessionDir, QStringList, {_S("/usr/local/share/wayland-sessions"), Entry(SessionDir, QStringList, {_S("/usr/local/share/wayland-sessions"),
_S("/usr/share/wayland-sessions")}, _S("Comma-separated list of directories containing available Wayland sessions")); _S("/usr/share/wayland-sessions")}, _S("Comma-separated list of directories containing available Wayland sessions"));
Entry(SessionCommand, QString, _S(WAYLAND_SESSION_COMMAND), _S("Path to a script to execute when starting the desktop session")); Entry(SessionCommand, QString, _S(WAYLAND_SESSION_COMMAND), _S("Path to a script to execute when starting the desktop session"));
- Entry(SessionLogFile, QString, _S(".local/share/sddm/wayland-session.log"),_S("Path to the user session log file")); - Entry(SessionLogFile, QString, _S(".local/share/sddm/wayland-session.log"),_S("Path to the user session log file"));
+ Entry(SessionLogFile, QString, _S(".cache/wayland-errors"), _S("Path to the user session log file")); + Entry(SessionLogFile, QString, _S(".cache/wayland-errors"), _S("Path to the user session log file"));
Entry(EnableHiDPI, bool, false, _S("Enable Qt's automatic high-DPI scaling")); Entry(EnableHiDPI, bool, true, _S("Enable Qt's automatic high-DPI scaling"));
); );
Section(Users, Section(Users,

14
sddm.spec
Unescape View File

@ -14,8 +14,8 @@
%bcond_without sddm_wayland_default %bcond_without sddm_wayland_default
%endif %endif
%global commit 572b128c92c5bce366f5db136423b0b296448429 %global commit e6524335a54ca469401ee9487adc4ae973860aad
%global commitdate 20230306 %global commitdate 20230404
%global shortcommit %(c=%{commit}; echo ${c:0:7}) %global shortcommit %(c=%{commit}; echo ${c:0:7})
Name: sddm Name: sddm
@ -289,6 +289,16 @@ fi
%changelog %changelog
* Wed Apr 05 2023 Neal Gompa <ngompa@fedoraproject.org> - 0.19.0^git20230404.e652433-1
- Update to new snapshot to include a fix for logout issues (#2179591)
* Mon Mar 20 2023 Neal Gompa <ngompa@fedoraproject.org> - 0.19.0^git20230320.e07e805-2
- Add patch to stop launching xdg-desktop-portal with Wayland greeter (#2178971, #2129479)
* Mon Mar 20 2023 Marc Deop i Argemí <marcdeop@fedoraproject.org> - 0.19.0^git20230320.e07e805-1
- Update to snapshot e07e805c21310572b4fecc810fd5610b1d3d03fd
- Fixes #2179591
* Mon Mar 06 2023 Marc Deop i Argemí <marcdeop@fedoraproject.org> - 0.19.0^git20230306.7bd10de-1 * Mon Mar 06 2023 Marc Deop i Argemí <marcdeop@fedoraproject.org> - 0.19.0^git20230306.7bd10de-1
- Update to new snapshot - Update to new snapshot
- Fixes #2175947 - Fixes #2175947

2
sources
Unescape View File

@ -1 +1 @@
SHA512 (sddm-572b128c92c5bce366f5db136423b0b296448429.tar.gz) = 0c0b2997f52a1a49ca9b2c05b8ca554a1b356bbfed067fde01c6b0239be1469f9c7726725196c2a438cbf86ad85fc7b466f6eaceee7a6c211b4e0052f456b3c7 SHA512 (sddm-e6524335a54ca469401ee9487adc4ae973860aad.tar.gz) = 5448223161da62f08c0559bbe1d2a68fc02c2955934099995f6a75c8e2561a9ba317ae23546bcf76d82a97c7437f6dd18d0e8532217b0595d7c29b4d739f99a2

Write Preview
Loading…
Cancel
Save