Update x11/sddm to 0.17.

This is still one minor release behind, but a big update relative to
the previous version. Thanks to tijl@ for the patches, dbn@ for
initial testing.

PR:		228116
Submitted by:	tijl

1 files changed, 28 insertions, 30 deletions

diff --git a/x11/sddm/files/patch-src_common_Configuration.h b/x11/sddm/files/patch-src_common_Configuration.h
index b166b904512c..ee0ed81ca738 100644
--- a/x11/sddm/files/patch-src_common_Configuration.h
+++ b/x11/sddm/files/patch-src_common_Configuration.h
@@ -1,38 +1,36 @@
-Modify the default configuration to fit in to FreeBSD. That is replace '/usr/bin'
-with '/usr/local/bin' and so on.
-The setting of '$PATH' I find a bit dumb... this should respect the values of the
-users profile...
+Leave InputMethod empty by default since qtvirtualkeyboard does not appear to
+be supported by the included themes.  The keyboard is drawn on top of the
+login screen and has to be clicked away (button lower-right).
 
---- src/common/Configuration.h.orig	2016-08-28 11:54:03 UTC
+Set the default theme and cursor theme to breeze, because sddm is most likely
+used together with Plasma.  If they aren't available sddm falls back to a
+compiled-in theme.
+
+--- src/common/Configuration.h.orig	2017-12-05 16:00:16 UTC
 +++ src/common/Configuration.h
-@@ -58,11 +58,11 @@ namespace SDDM {
- 
-         // TODO: Not absolutely sure if everything belongs here. Xsessions, VT and probably some more seem universal
-         Section(X11,
--            Entry(ServerPath,          QString,     _S("/usr/bin/X"),                           _S("Path to X server binary"));
-+            Entry(ServerPath,          QString,     _S("/usr/local/bin/X"),                           _S("Path to X server binary"));
-             Entry(ServerArguments,     QString,     _S("-nolisten tcp"),                        _S("Arguments passed to the X server invocation"));
--            Entry(XephyrPath,          QString,     _S("/usr/bin/Xephyr"),                      _S("Path to Xephyr binary"));
--            Entry(XauthPath,           QString,     _S("/usr/bin/xauth"),                       _S("Path to xauth binary"));
--            Entry(SessionDir,          QString,     _S("/usr/share/xsessions"),                 _S("Directory containing available X sessions"));
-+            Entry(XephyrPath,          QString,     _S("/usr/local/bin/Xephyr"),                      _S("Path to Xephyr binary"));
-+            Entry(XauthPath,           QString,     _S("/usr/local/bin/xauth"),                       _S("Path to xauth binary"));
-+            Entry(SessionDir,          QString,     _S("/usr/local/share/xsessions"),                 _S("Directory containing available X sessions"));
-             Entry(SessionCommand,      QString,     _S(SESSION_COMMAND),                        _S("Path to a script to execute when starting the desktop session"));
- 	    Entry(SessionLogFile,      QString,     _S(".local/share/sddm/xorg-session.log"),   _S("Path to the user session log file"));
- 	    Entry(UserAuthFile,        QString,     _S(".Xauthority"),                          _S("Path to the Xauthority file"));
-@@ -72,13 +72,13 @@ namespace SDDM {
-         );
- 
-         Section(Wayland,
--            Entry(SessionDir,          QString,     _S("/usr/share/wayland-sessions"),          _S("Directory containing available Wayland sessions"));
-+            Entry(SessionDir,          QString,     _S("/usr/local/share/wayland-sessions"),          _S("Directory 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"));
+@@ -42,14 +42,14 @@ namespace SDDM {
+         Entry(Numlock,             NumState,    NUM_NONE,                                       _S("Initial NumLock state. Can be on, off or none.\n"
+                                                                                                    "If property is set to none, numlock won't be changed\n"
+                                                                                                    "NOTE: Currently ignored if autologin is enabled."));
+-        Entry(InputMethod,         QString,     QStringLiteral("qtvirtualkeyboard"),                   _S("Input method module"));
++        Entry(InputMethod,         QString,     QString(),                                      _S("Input method module"));
+         //  Name   Entries (but it's a regular class again)
+         Section(Theme,
+             Entry(ThemeDir,            QString,     _S(DATA_INSTALL_DIR "/themes"),             _S("Theme directory path"));
+-            Entry(Current,             QString,     _S(""),                                     _S("Current theme name"));
++            Entry(Current,             QString,     _S("breeze"),                               _S("Current theme name"));
+             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"));
++            Entry(CursorTheme,         QString,     _S("breeze_cursors"),                       _S("Cursor theme used in the greeter"));
+             Entry(EnableAvatars,       bool,        true,                                       _S("Enable display of custom user avatars"));
+             Entry(DisableAvatarsThreshold,int,      7,                                          _S("Number of users to use as threshold\n"
+                                                                                                    "above which avatars are disabled\n"
+@@ -80,7 +80,7 @@ namespace SDDM {
          );
  
          Section(Users,
--            Entry(DefaultPath,         QString,     _S("/bin:/usr/bin:/usr/local/bin"),         _S("Default $PATH for logged in users"));
+-            Entry(DefaultPath,         QString,     _S("/usr/local/bin:/usr/bin:/bin"),         _S("Default $PATH for logged in users"));
 +            Entry(DefaultPath,         QString,     _S("/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin"),         _S("Default $PATH for logged in users"));
              Entry(MinimumUid,          int,         UID_MIN,                                    _S("Minimum user id for displayed users"));
              Entry(MaximumUid,          int,         UID_MAX,                                    _S("Maximum user id for displayed users"));