Merge branch f38 into epel9-next

.gitignore

@@ -21,3 +21,5 @@
 /sddm-572b128c92c5bce366f5db136423b0b296448429.tar.gz
 /sddm-e07e805c21310572b4fecc810fd5610b1d3d03fd.tar.gz
 /sddm-e6524335a54ca469401ee9487adc4ae973860aad.tar.gz
+/sddm-0.20.0.tar.xz
+/sddm-0.20.0.tar.gz

sddm-0.20.0-fedora_config.patch

@@ -1,17 +1,20 @@
-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 @@
+diff --git a/src/common/Configuration.h b/src/common/Configuration.h
+index 54bcace..9b8fa22 100644
+--- a/src/common/Configuration.h
++++ b/src/common/Configuration.h
+@@ -37,9 +37,8 @@ namespace SDDM {
          enum NumState { NUM_NONE, NUM_SET_ON, NUM_SET_OFF };
  
          //  Name                   Type         Default value                                   Description
 -        // TODO: Change default to x11-user in a future release
 -        Entry(DisplayServer,       QString,     _S("x11"),                                      _S("Which display server should be used.\n"
+-                                                                                                   "Valid values are: x11, x11-user, wayland. Wayland support is experimental"));
 +        Entry(DisplayServer,       QString,     _S("wayland"),                                  _S("Which display server should be used.\n"
-                                                                                                    "Valid values are: x11, x11-user, wayland."));
++                                                                                                   "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 @@
+         Entry(Numlock,             NumState,    NUM_NONE,                                       _S("Initial NumLock state. Can be on, off or none.\n"
+@@ -51,7 +50,7 @@ namespace SDDM {
          //  Name   Entries (but it's a regular class again)
          Section(Theme,
              Entry(ThemeDir,            QString,     _S(DATA_INSTALL_DIR "/themes"),             _S("Theme directory path"));
@@ -20,7 +23,7 @@ diff -bur ../sddm-e07e805c21310572b4fecc810fd5610b1d3d03fd-old/src/common/Config
              Entry(FacesDir,            QString,     _S(DATA_INSTALL_DIR "/faces"),              _S("Global directory for user avatars\n"
                                                                                                     "The files should be named <username>.face.icon"));
              Entry(CursorTheme,         QString,     QString(),                                  _S("Cursor theme used in the greeter"));
-@@ -71,9 +70,9 @@
+@@ -71,9 +70,9 @@ namespace SDDM {
              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"));
@@ -33,7 +36,7 @@ diff -bur ../sddm-e07e805c21310572b4fecc810fd5610b1d3d03fd-old/src/common/Config
              Entry(EnableHiDPI,         bool,        true,                                      _S("Enable Qt's automatic high-DPI scaling"));
          );
  
-@@ -82,12 +81,12 @@
+@@ -82,12 +81,12 @@ namespace SDDM {
              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"));

sddm.spec

@@ -14,12 +14,12 @@
 %bcond_without sddm_wayland_default
 %endif
 
-%global commit e6524335a54ca469401ee9487adc4ae973860aad
-%global commitdate 20230404
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
+#global commit e6524335a54ca469401ee9487adc4ae973860aad
+#global commitdate 20230404
+#global shortcommit %(c=%{commit}; echo ${c:0:7})
 
 Name:           sddm
-Version:        0.19.0%{?commitdate:^git%{commitdate}.%{shortcommit}}
+Version:        0.20.0%{?commitdate:^git%{commitdate}.%{shortcommit}}
 Release:        1%{?dist}
 License:        GPLv2+
 Summary:        QML based desktop and login manager
@@ -29,6 +29,8 @@ Url:            https://github.com/sddm/sddm
 Source0:        %{url}/archive/%{commit}/%{name}-%{commit}.tar.gz
 %else
 Source0:        %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
+# Broken: https://github.com/sddm/sddm/pull/1743
+#Source0:        %{url}/releases/download/v%{version}/%{name}-%{version}.tar.xz
 %endif
 
 ## upstream patches
@@ -289,6 +291,9 @@ fi
 
 
 %changelog
+* Fri Jun 23 2023 Neal Gompa <ngompa@fedoraproject.org> - 0.20.0-1
+- Update to 0.20.0 final
+
 * 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)
 

sources

@@ -1 +1 @@
-SHA512 (sddm-e6524335a54ca469401ee9487adc4ae973860aad.tar.gz) = 5448223161da62f08c0559bbe1d2a68fc02c2955934099995f6a75c8e2561a9ba317ae23546bcf76d82a97c7437f6dd18d0e8532217b0595d7c29b4d739f99a2
+SHA512 (sddm-0.20.0.tar.gz) = 0f64b405f1451873a01a2210530feb6f4cbbdea17be9d039c105088963a48322968db7b60c0d20ac5d97c8ec2a19e5130f0a74c0f9de58c61453d8ce8bb6272a