diff --git a/.gitignore b/.gitignore index ecc8898..6a9cfb2 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ /sddm-3ee57e99836fe051c97e0f301962120466d220f7.tar.gz /sddm-8f1e3df4768bd521034e02602c4410b06aaef7d5.tar.gz /sddm-572b128c92c5bce366f5db136423b0b296448429.tar.gz +/sddm-e07e805c21310572b4fecc810fd5610b1d3d03fd.tar.gz diff --git a/sddm-0.20.0-fedora_config.patch b/sddm-0.20.0-fedora_config.patch index ab93e5e..f6472c8 100644 --- a/sddm-0.20.0-fedora_config.patch +++ b/sddm-0.20.0-fedora_config.patch @@ -1,8 +1,7 @@ -diff --git a/src/common/Configuration.h b/src/common/Configuration.h -index 182f6a1..538243b 100644 ---- a/src/common/Configuration.h -+++ b/src/common/Configuration.h -@@ -37,8 +37,7 @@ namespace SDDM { +diff -bur ../sddm-e07e805c21310572b4fecc810fd5610b1d3d03fd-old/src/common/Configuration.h ./src/common/Configuration.h +--- ../sddm-e07e805c21310572b4fecc810fd5610b1d3d03fd-old/src/common/Configuration.h 2023-03-20 12:26:39.000000000 +0100 ++++ ./src/common/Configuration.h 2023-03-20 13:26:27.420722920 +0100 +@@ -37,8 +37,7 @@ enum NumState { NUM_NONE, NUM_SET_ON, NUM_SET_OFF }; // Name Type Default value Description @@ -12,7 +11,7 @@ index 182f6a1..538243b 100644 "Valid values are: x11, x11-user, wayland.")); Entry(HaltCommand, QString, _S(HALT_COMMAND), _S("Halt 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) Section(Theme, 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" "The files should be named .face.icon")); 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"), _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")); @@ -31,16 +30,16 @@ index 182f6a1..538243b 100644 + 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(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"), _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(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(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, diff --git a/sddm.spec b/sddm.spec index 501e3df..5750e9b 100644 --- a/sddm.spec +++ b/sddm.spec @@ -14,8 +14,8 @@ %bcond_without sddm_wayland_default %endif -%global commit 572b128c92c5bce366f5db136423b0b296448429 -%global commitdate 20230306 +%global commit e07e805c21310572b4fecc810fd5610b1d3d03fd +%global commitdate 20230320 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: sddm @@ -289,6 +289,10 @@ fi %changelog +* Mon Mar 20 2023 Marc Deop i Argemí - 0.19.0^git20230320.e07e805-1 +- Update to snapshot e07e805c21310572b4fecc810fd5610b1d3d03fd +- Fixes #2179591 + * Mon Mar 06 2023 Marc Deop i Argemí - 0.19.0^git20230306.7bd10de-1 - Update to new snapshot - Fixes #2175947 diff --git a/sources b/sources index 48a899f..33d14e6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (sddm-572b128c92c5bce366f5db136423b0b296448429.tar.gz) = 0c0b2997f52a1a49ca9b2c05b8ca554a1b356bbfed067fde01c6b0239be1469f9c7726725196c2a438cbf86ad85fc7b466f6eaceee7a6c211b4e0052f456b3c7 +SHA512 (sddm-e07e805c21310572b4fecc810fd5610b1d3d03fd.tar.gz) = d7dcfc02f3225fcab8a8b4636d2b00b1391ae1cff9117bd6f8ac6ca8607405e1f8170969e6b6bdcd191475dddc09111327fb2fbdcddbdd381232589944df3a1f