x11/sddm: Update to 0.20.0

Co-authored-by: Kenneth Raplee <kenrap@kennethraplee.com>
freebsd · Jul 14, 2023 · 718687d · 718687d
1 parent 8e8792b
commit 718687d
Show file tree

Hide file tree

Showing 10 changed files with 40 additions and 159 deletions.
diff --git a/x11/sddm/Makefile b/x11/sddm/Makefile
@@ -1,12 +1,8 @@
 PORTNAME=	sddm
-PORTVERSION=	0.19.0
+PORTVERSION=	0.20.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	8
 CATEGORIES=	x11
 
-PATCH_SITES=	https://github.com/sddm/sddm/commit/
-PATCHFILES=	e93bf95c54ad8c2a1604f8d7be05339164b19308.patch:-p1
-
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	QML based login manager
 WWW=		https://github.com/sddm/sddm
@@ -30,16 +26,18 @@ CPE_VENDOR=	${PORTNAME}_project
 USE_GITHUB=	yes
 USE_KDE=	ecm:build
 USE_QT=		core declarative dbus gui network \
-		buildtools:build linguisttools:build qmake:build testlib:build
-USE_XORG=	xcb
+		buildtools:build linguisttools:build declarative-test:build \
+		qmake:build testlib:build
+USE_XORG=	xau xcb
 
 CONFLICTS_INSTALL=	lightdm
 
 CMAKE_ON=	BUILD_MAN_PAGES
 CMAKE_ARGS=	-DUID_MIN=1000 \
 		-DUID_MAX=65000 \
 		-DCMAKE_INSTALL_SYSCONFDIR:PATH=${LOCALBASE}/etc \
-		-DRST2MAN_EXECUTABLE=${LOCALBASE}/bin/rst2man.py-${PYTHON_VER}
+		-DRST2MAN_EXECUTABLE=${LOCALBASE}/bin/rst2man.py-${PYTHON_VER} \
+		-DSDDM_INITIAL_VT=7
 
 USE_RC_SUBR=	sddm
 SUB_FILES=	xinitrc.desktop

diff --git a/x11/sddm/distinfo b/x11/sddm/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1640593130
-SHA256 (sddm-sddm-v0.19.0_GH0.tar.gz) = e76da1f13d5ad5e0179e3fec57543126044339405ef19c397e105e0807bd4e41
-SIZE (sddm-sddm-v0.19.0_GH0.tar.gz) = 3532945
-SHA256 (e93bf95c54ad8c2a1604f8d7be05339164b19308.patch) = 4878cbadf98d0219e268ba2dd73adda917fccf1bd99113652e626082f2bdfc72
-SIZE (e93bf95c54ad8c2a1604f8d7be05339164b19308.patch) = 865
+TIMESTAMP = 1689196955
+SHA256 (sddm-sddm-v0.20.0_GH0.tar.gz) = 467c8bd91e0d4f76d4bc4e57ab334f1f48a33478482ba9476d93b0b3d7ace9fb
+SIZE (sddm-sddm-v0.20.0_GH0.tar.gz) = 3552722
diff --git a/x11/sddm/files/patch-data_scripts_Xsession b/x11/sddm/files/patch-data_scripts_Xsession
diff --git a/x11/sddm/files/patch-services_sddm-autologin.pam b/x11/sddm/files/patch-services_sddm-autologin.pam
@@ -1,9 +1,9 @@
---- services/sddm-autologin.pam.orig	2020-11-03 09:55:31 UTC
+--- services/sddm-autologin.pam.orig	2021-10-03 13:28:23 UTC
 +++ services/sddm-autologin.pam
-@@ -1,13 +1,9 @@
+@@ -1,13 +1,10 @@
  #%PAM-1.0
 -auth        required    pam_env.so
--auth        required    pam_tally2.so file=/var/log/tallylog onerr=succeed
+ auth        required    pam_faillock.so preauth
 -auth        required    pam_shells.so
 -auth        required    pam_nologin.so
  auth        required    pam_permit.so

diff --git a/x11/sddm/files/patch-services_sddm.pam b/x11/sddm/files/patch-services_sddm.pam
@@ -1,27 +1,27 @@
---- services/sddm.pam.orig	2017-12-05 16:00:16 UTC
+--- services/sddm.pam.orig	2023-02-08 07:12:21 UTC
 +++ services/sddm.pam
 @@ -1,15 +1,14 @@
  #%PAM-1.0
 
--auth		include		system-login
---auth		optional	pam_gnome_keyring.so
---auth   optional  pam_kwallet5.so
-+auth		include		login
-+#auth		optional	pam_gnome_keyring.so
-+#auth		optional	pam_kwallet5.so
+-auth        include     system-login
+--auth       optional    pam_gnome_keyring.so
+--auth       optional    pam_kwallet5.so
++auth        include     login
++#auth       optional    pam_gnome_keyring.so
++#auth       optional    pam_kwallet5.so
 
--account		include		system-login
-+account		include		login
+-account     include     system-login
++account     include     login
 
--password	include		system-login
---password	optional	pam_gnome_keyring.so use_authtok
-+password	include		login
-+#password	optional	pam_gnome_keyring.so use_authtok
+-password    include     system-login
+--password   optional    pam_gnome_keyring.so    use_authtok
++password    include     login
++#password   optional    pam_gnome_keyring.so    use_authtok
 
--session		optional	pam_keyinit.so force revoke
--session		include		system-login
---session		optional	pam_gnome_keyring.so auto_start
---session  optional  pam_kwallet5.so auto_start
-+session 	include		login
-+#session 	optional	pam_gnome_keyring.so auto_start
-+#session 	optional	pam_kwallet5.so auto_start
+-session     optional    pam_keyinit.so          force revoke
+-session     include     system-login
+--session    optional    pam_gnome_keyring.so    auto_start
+--session    optional    pam_kwallet5.so         auto_start
++session     include     login
++#session    optional    pam_gnome_keyring.so    auto_start
++#session    optional    pam_kwallet5.so         auto_start
diff --git a/x11/sddm/files/patch-src_common_Configuration.h b/x11/sddm/files/patch-src_common_Configuration.h
@@ -6,9 +6,9 @@ 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	2020-11-03 09:55:31 UTC
+--- src/common/Configuration.h.orig	2021-10-12 20:26:16 UTC
 +++ src/common/Configuration.h
-@@ -47,10 +47,10 @@ namespace SDDM {
+@@ -51,10 +51,10 @@ 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"));
@@ -18,6 +18,6 @@ compiled-in theme.
                                                                                                     "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(CursorSize,          QString,     QString(),                                  _S("Cursor size used in the greeter"));
              Entry(Font,                QString,     QString(),                                  _S("Font 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"
diff --git a/x11/sddm/files/patch-src_daemon_DaemonApp.cpp b/x11/sddm/files/patch-src_daemon_DaemonApp.cpp
diff --git a/x11/sddm/files/patch-src_daemon_Display.cpp b/x11/sddm/files/patch-src_daemon_Display.cpp
diff --git a/x11/sddm/files/patch-src_helper_UserSession.cpp b/x11/sddm/files/patch-src_helper_UserSession.cpp
diff --git a/x11/sddm/pkg-plist b/x11/sddm/pkg-plist
@@ -18,6 +18,8 @@ etc/dbus-1/system.d/org.freedesktop.DisplayManager.conf
 %%QT_QMLDIR%%/SddmComponents/qmldir
 %%QT_QMLDIR%%/SddmComponents/warning.png
 libexec/sddm-helper
+libexec/sddm-helper-start-wayland
+libexec/sddm-helper-start-x11user
 share/man/man1/sddm-greeter.1.gz
 share/man/man1/sddm.1.gz
 share/man/man5/sddm-state.conf.5.gz
@@ -29,6 +31,7 @@ share/man/man5/sddm.conf.5.gz
 %%DATADIR%%/flags/ar.png
 %%DATADIR%%/flags/at.png
 %%DATADIR%%/flags/az.png
+%%DATADIR%%/flags/bd.png
 %%DATADIR%%/flags/be.png
 %%DATADIR%%/flags/bg.png
 %%DATADIR%%/flags/bh.png
@@ -159,13 +162,15 @@ share/man/man5/sddm.conf.5.gz
 %%DATADIR%%/translations/eu.qm
 %%DATADIR%%/translations/fi.qm
 %%DATADIR%%/translations/fr.qm
+%%DATADIR%%/translations/gl.qm
 %%DATADIR%%/translations/he.qm
 %%DATADIR%%/translations/hi_IN.qm
 %%DATADIR%%/translations/hu.qm
 %%DATADIR%%/translations/ie.qm
 %%DATADIR%%/translations/is.qm
 %%DATADIR%%/translations/it.qm
 %%DATADIR%%/translations/ja.qm
+%%DATADIR%%/translations/ka.qm
 %%DATADIR%%/translations/kk.qm
 %%DATADIR%%/translations/ko.qm
 %%DATADIR%%/translations/lt.qm