public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #102759 from mweinelt/sddm 

sddm: 0.18.1 -> 0.19.0
This commit is contained in:
Martin Weinelt 2020-11-24 20:22:08 +01:00 committed by GitHub
parent 9c4072af40 0b5bcd88a2
commit f1e5a60e82
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/display-managers/sddm/default.nix
View File

@ -4,7 +4,7 @@
}: }:
let let
version = "0.18.1"; version = "0.19.0";
in mkDerivation { in mkDerivation {
pname = "sddm"; pname = "sddm";
@ -14,7 +14,7 @@ in mkDerivation {
owner = "sddm"; owner = "sddm";
repo = "sddm"; repo = "sddm";
rev = "v${version}"; rev = "v${version}";
sha256 = "0an1zafz0yhxd9jgd3gzdwmaw5f9vs4c924q56lp2yxxddbmzjcq"; sha256 = "1s6icb5r1n6grfs137gdzfrcvwsb3hvlhib2zh6931x8pkl1qvxa";
}; };
patches = [ patches = [

14
pkgs/applications/display-managers/sddm/sddm-ignore-config-mtime.patch
View File

@ -1,8 +1,8 @@
diff --git a/src/common/ConfigReader.cpp b/src/common/ConfigReader.cpp diff --git a/src/common/ConfigReader.cpp b/src/common/ConfigReader.cpp
index 4b5983c..911c511 100644 index 041e5ed..efb1324 100644
--- a/src/common/ConfigReader.cpp --- a/src/common/ConfigReader.cpp
+++ b/src/common/ConfigReader.cpp +++ b/src/common/ConfigReader.cpp
@@ -147,16 +147,13 @@ namespace SDDM { @@ -148,17 +148,14 @@ namespace SDDM {
// * m_path (classic fallback /etc/sddm.conf) // * m_path (classic fallback /etc/sddm.conf)
QStringList files; QStringList files;
@ -13,18 +13,20 @@ index 4b5983c..911c511 100644
QDir dir(m_sysConfigDir); QDir dir(m_sysConfigDir);
if (dir.exists()) { if (dir.exists()) {
- latestModificationTime = std::max(latestModificationTime, QFileInfo(m_sysConfigDir).lastModified()); - latestModificationTime = std::max(latestModificationTime, QFileInfo(m_sysConfigDir).lastModified());
foreach (const QFileInfo &file, dir.entryInfoList(QDir::Files | QDir::NoDotAndDotDot, QDir::LocaleAware)) { const auto dirFiles = dir.entryInfoList(QDir::Files | QDir::NoDotAndDotDot, QDir::LocaleAware);
for (const QFileInfo &file : dirFiles) {
files << (file.absoluteFilePath()); files << (file.absoluteFilePath());
- latestModificationTime = std::max(latestModificationTime, file.lastModified()); - latestModificationTime = std::max(latestModificationTime, file.lastModified());
} }
} }
} }
@@ -164,21 +161,14 @@ namespace SDDM { @@ -166,22 +163,15 @@ namespace SDDM {
//include the configDir in modification time so we also reload on any files added/removed //include the configDir in modification time so we also reload on any files added/removed
QDir dir(m_configDir); QDir dir(m_configDir);
if (dir.exists()) { if (dir.exists()) {
- latestModificationTime = std::max(latestModificationTime, QFileInfo(m_configDir).lastModified()); - latestModificationTime = std::max(latestModificationTime, QFileInfo(m_configDir).lastModified());
foreach (const QFileInfo &file, dir.entryInfoList(QDir::Files | QDir::NoDotAndDotDot, QDir::LocaleAware)) { const auto dirFiles = dir.entryInfoList(QDir::Files | QDir::NoDotAndDotDot, QDir::LocaleAware);
for (const QFileInfo &file : dirFiles) {
files << (file.absoluteFilePath()); files << (file.absoluteFilePath());
- latestModificationTime = std::max(latestModificationTime, file.lastModified()); - latestModificationTime = std::max(latestModificationTime, file.lastModified());
} }
@ -38,6 +40,6 @@ index 4b5983c..911c511 100644
- } - }
- m_fileModificationTime = latestModificationTime; - m_fileModificationTime = latestModificationTime;
- -
foreach (const QString &filepath, files) { for (const QString &filepath : qAsConst(files)) {
loadInternal(filepath); loadInternal(filepath);
} }