sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-04-28 01:26:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

x11/sddm: Update to latest commit

Browse source 
It's be almost exactly a year since last release and I'm kind of getting
itchy. Deal with all that has transpired since last release.

Switch to Qt6 and pet portclippy(1).
This commit is contained in:
Jason E. Hale 2025-02-23 04:00:57 -05:00
parent ee9e39ceb1
commit 2ec4b88df2
9 changed files with 112 additions and 137 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
x11/sddm/Makefile
View file

@ -1,6 +1,7 @@
PORTNAME= sddm PORTNAME= sddm
PORTVERSION= 0.21.0
DISTVERSIONPREFIX= v DISTVERSIONPREFIX= v
DISTVERSION= 0.21.0-36
DISTVERSIONSUFFIX= -gc2b97dd
CATEGORIES= x11 CATEGORIES= x11
MAINTAINER= kde@FreeBSD.org MAINTAINER= kde@FreeBSD.org
@ -13,8 +14,8 @@ WWW= https://github.com/sddm/sddm
# - Apache20 (font included with maya) # - Apache20 (font included with maya)
LICENSE= GPLv2+ CC-BY-3.0 CC-BY-4.0 APACHE20 LICENSE= GPLv2+ CC-BY-3.0 CC-BY-4.0 APACHE20
LICENSE_COMB= multi LICENSE_COMB= multi
LICENSE_FILE_GPLv2+ = ${WRKSRC}/LICENSE
LICENSE_FILE_CC-BY-3.0= ${WRKSRC}/LICENSE.CC-BY-3.0 LICENSE_FILE_CC-BY-3.0= ${WRKSRC}/LICENSE.CC-BY-3.0
LICENSE_FILE_GPLv2+ = ${WRKSRC}/LICENSE
BUILD_DEPENDS= rst2man:textproc/py-docutils@${PY_FLAVOR} BUILD_DEPENDS= rst2man:textproc/py-docutils@${PY_FLAVOR}
RUN_DEPENDS= consolekit2>1.2.5:sysutils/consolekit2 \ RUN_DEPENDS= consolekit2>1.2.5:sysutils/consolekit2 \
@ -22,25 +23,26 @@ RUN_DEPENDS= consolekit2>1.2.5:sysutils/consolekit2 \
xauth:x11/xauth \ xauth:x11/xauth \
xmessage:x11/xmessage xmessage:x11/xmessage
USES= cmake compiler:c++17-lang cpe pkgconfig python:build qt:5 xorg USES= cmake compiler:c++17-lang cpe gl pkgconfig python:build qt:6 xorg
CPE_VENDOR= ${PORTNAME}_project CPE_VENDOR= ${PORTNAME}_project
USE_GITHUB= yes USE_GITHUB= yes
USE_QT= core declarative dbus gui network \ USE_GL= gl opengl # GLX
buildtools:build linguisttools:build declarative-test:build \ USE_QT= base declarative \
qmake:build testlib:build tools:build
USE_RC_SUBR= sddm
USE_XORG= xau xcb USE_XORG= xau xcb
CMAKE_ARGS= -DACCOUNTSSERVICE_DATA_DIR:PATH=/var/db/AccountsService \
-DCMAKE_INSTALL_SYSCONFDIR:PATH=${LOCALBASE}/etc \
-DRST2MAN_EXECUTABLE=${LOCALBASE}/bin/rst2man \
-DSDDM_INITIAL_VT=7 \
-DUID_MIN=1000 \
-DUID_MAX=65000
CMAKE_ON= BUILD_MAN_PAGES \
BUILD_WITH_QT6
CONFLICTS_INSTALL= lightdm CONFLICTS_INSTALL= lightdm
CMAKE_ON= BUILD_MAN_PAGES
CMAKE_ARGS= -DUID_MIN=1000 \
-DUID_MAX=65000 \
-DCMAKE_INSTALL_SYSCONFDIR:PATH=${LOCALBASE}/etc \
-DACCOUNTSSERVICE_DATA_DIR:PATH=/var/db/AccountsService \
-DRST2MAN_EXECUTABLE=${LOCALBASE}/bin/rst2man \
-DSDDM_INITIAL_VT=7
USE_RC_SUBR= sddm
SUB_FILES= xinit-session \ SUB_FILES= xinit-session \
xinitrc.desktop xinitrc.desktop
@ -62,8 +64,12 @@ post-install:
${INSTALL_DATA} ${FILESDIR}/sddm.conf.default ${STAGEDIR}${PREFIX}/etc ${INSTALL_DATA} ${FILESDIR}/sddm.conf.default ${STAGEDIR}${PREFIX}/etc
${INSTALL_DATA} ${WRKDIR}/xinitrc.desktop ${STAGEDIR}${PREFIX}/share/xsessions ${INSTALL_DATA} ${WRKDIR}/xinitrc.desktop ${STAGEDIR}${PREFIX}/share/xsessions
${INSTALL_SCRIPT} ${WRKDIR}/xinit-session ${STAGEDIR}${PREFIX}/share/sddm/scripts ${INSTALL_SCRIPT} ${WRKDIR}/xinit-session ${STAGEDIR}${PREFIX}/share/sddm/scripts
${MV} ${STAGEDIR}${PREFIX}/etc/pam.d/sddm ${STAGEDIR}${PREFIX}/etc/pam.d/sddm.default # Install our own PAM configs. Upstream is no longer providing these for any
${MV} ${STAGEDIR}${PREFIX}/etc/pam.d/sddm-autologin ${STAGEDIR}${PREFIX}/etc/pam.d/sddm-autologin.default # platform and now just leaves this part to downstream packagers.
${MV} ${STAGEDIR}${PREFIX}/etc/pam.d/sddm-greeter ${STAGEDIR}${PREFIX}/etc/pam.d/sddm-greeter.default # https://github.com/sddm/sddm/commit/b82f9be9cbd25e734958ad5eb3465579befcd0c0
# https://github.com/sddm/sddm/commit/ae072f901671b68861da9577e3e12e350a9053d5
${CP} ${FILESDIR}/sddm.default ${STAGEDIR}${PREFIX}/etc/pam.d
${CP} ${FILESDIR}/sddm-autologin.default ${STAGEDIR}${PREFIX}/etc/pam.d
${CP} ${FILESDIR}/sddm-greeter.default ${STAGEDIR}${PREFIX}/etc/pam.d
.include <bsd.port.mk> .include <bsd.port.mk>

6
x11/sddm/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1715911035 TIMESTAMP = 1740291987
SHA256 (sddm-sddm-v0.21.0_GH0.tar.gz) = f895de2683627e969e4849dbfbbb2b500787481ca5ba0de6d6dfdae5f1549abf SHA256 (sddm-sddm-v0.21.0-36-gc2b97dd_GH0.tar.gz) = d1565eb0d4f0a9978bb9d2750fb566216bef485be2c0f4955505b952b521b875
SIZE (sddm-sddm-v0.21.0_GH0.tar.gz) = 3557266 SIZE (sddm-sddm-v0.21.0-36-gc2b97dd_GH0.tar.gz) = 3558026

26
x11/sddm/files/patch-services_sddm-autologin-tally2.pam
View file

@ -1,26 +0,0 @@
--- services/sddm-autologin-tally2.pam.orig 2023-06-23 12:28:38 UTC
+++ services/sddm-autologin-tally2.pam
@@ -1,13 +1,12 @@
#%PAM-1.0
-auth required pam_env.so
-auth required pam_tally2.so file=/var/log/tallylog onerr=succeed
-auth required pam_shells.so
-auth required pam_nologin.so
auth required pam_permit.so
--auth optional pam_gnome_keyring.so
--auth optional pam_kwallet5.so
-account include system-local-login
-password include system-local-login
-session include system-local-login
--session optional pam_gnome_keyring.so auto_start
--session optional pam_kwallet5.so auto_start
+#auth optional pam_gnome_keyring.so
+#auth optional pam_kwallet5.so
+
+account include login
+
+password required pam_deny.so
+
+session include login
+#session optional pam_gnome_keyring.so auto_start
+#session optional pam_kwallet5.so auto_start

18
x11/sddm/files/patch-services_sddm-greeter.pam.in
View file

@ -1,18 +0,0 @@
--- services/sddm-greeter.pam.in.orig 2019-03-13 09:22:35 UTC
+++ services/sddm-greeter.pam.in
@@ -1,8 +1,5 @@
#%PAM-1.0
-# Load environment from /etc/environment and ~/.pam_environment
-auth required pam_env.so
-
# Always let the greeter start without authentication
auth required pam_permit.so
@@ -13,5 +10,4 @@ account required pam_permit.so
password required pam_deny.so
# Setup session
-session required pam_unix.so
-session optional @LOGIND_PAM_MODULE@
+session required pam_permit.so

27
x11/sddm/files/patch-services_sddm.pam
View file

@ -1,27 +0,0 @@
--- 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
-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
-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

12
x11/sddm/files/sddm-autologin.default Normal file
View file

@ -0,0 +1,12 @@
#%PAM-1.0
auth required pam_permit.so
#auth optional pam_gnome_keyring.so
#auth optional pam_kwallet5.so
account include login
password required pam_deny.so
session include login
#session optional pam_gnome_keyring.so auto_start
#session optional pam_kwallet5.so auto_start

13
x11/sddm/files/sddm-greeter.default Normal file
View file

@ -0,0 +1,13 @@
#%PAM-1.0
# Always let the greeter start without authentication
auth required pam_permit.so
# No action required for account management
account required pam_permit.so
# Can't change password
password required pam_deny.so
# Setup session
session required pam_permit.so

14
x11/sddm/files/sddm.default Normal file
View file

@ -0,0 +1,14 @@
#%PAM-1.0
auth include login
#auth optional pam_gnome_keyring.so
#auth optional pam_kwallet5.so
account include login
password include login
#password optional pam_gnome_keyring.so use_authtok
session include login
#session optional pam_gnome_keyring.so auto_start
#session optional pam_kwallet5.so auto_start

91
x11/sddm/pkg-plist
View file

@ -1,5 +1,5 @@
bin/sddm bin/sddm
bin/sddm-greeter bin/sddm-greeter-qt6
@sample etc/pam.d/sddm.default etc/pam.d/sddm @sample etc/pam.d/sddm.default etc/pam.d/sddm
@sample etc/pam.d/sddm-autologin.default etc/pam.d/sddm-autologin @sample etc/pam.d/sddm-autologin.default etc/pam.d/sddm-autologin
@sample etc/pam.d/sddm-greeter.default etc/pam.d/sddm-greeter @sample etc/pam.d/sddm-greeter.default etc/pam.d/sddm-greeter
@ -152,48 +152,49 @@ share/man/man5/sddm.conf.5.gz
%%DATADIR%%/themes/maya/metadata.desktop %%DATADIR%%/themes/maya/metadata.desktop
%%DATADIR%%/themes/maya/screenshots/hi_IN.png %%DATADIR%%/themes/maya/screenshots/hi_IN.png
%%DATADIR%%/themes/maya/theme.conf %%DATADIR%%/themes/maya/theme.conf
%%DATADIR%%/translations-qt5/ar.qm %%DATADIR%%/translations-qt6/ar.qm
%%DATADIR%%/translations-qt5/bg.qm %%DATADIR%%/translations-qt6/bg.qm
%%DATADIR%%/translations-qt5/bn.qm %%DATADIR%%/translations-qt6/bn.qm
%%DATADIR%%/translations-qt5/ca.qm %%DATADIR%%/translations-qt6/ca.qm
%%DATADIR%%/translations-qt5/cs.qm %%DATADIR%%/translations-qt6/cs.qm
%%DATADIR%%/translations-qt5/da.qm %%DATADIR%%/translations-qt6/da.qm
%%DATADIR%%/translations-qt5/de.qm %%DATADIR%%/translations-qt6/de.qm
%%DATADIR%%/translations-qt5/es.qm %%DATADIR%%/translations-qt6/es.qm
%%DATADIR%%/translations-qt5/et.qm %%DATADIR%%/translations-qt6/et.qm
%%DATADIR%%/translations-qt5/eu.qm %%DATADIR%%/translations-qt6/eu.qm
%%DATADIR%%/translations-qt5/fi.qm %%DATADIR%%/translations-qt6/fa.qm
%%DATADIR%%/translations-qt5/fr.qm %%DATADIR%%/translations-qt6/fi.qm
%%DATADIR%%/translations-qt5/gl.qm %%DATADIR%%/translations-qt6/fr.qm
%%DATADIR%%/translations-qt5/he.qm %%DATADIR%%/translations-qt6/gl.qm
%%DATADIR%%/translations-qt5/hi_IN.qm %%DATADIR%%/translations-qt6/he.qm
%%DATADIR%%/translations-qt5/hu.qm %%DATADIR%%/translations-qt6/hi_IN.qm
%%DATADIR%%/translations-qt5/ie.qm %%DATADIR%%/translations-qt6/hu.qm
%%DATADIR%%/translations-qt5/is.qm %%DATADIR%%/translations-qt6/ie.qm
%%DATADIR%%/translations-qt5/it.qm %%DATADIR%%/translations-qt6/is.qm
%%DATADIR%%/translations-qt5/ja.qm %%DATADIR%%/translations-qt6/it.qm
%%DATADIR%%/translations-qt5/ka.qm %%DATADIR%%/translations-qt6/ja.qm
%%DATADIR%%/translations-qt5/kk.qm %%DATADIR%%/translations-qt6/ka.qm
%%DATADIR%%/translations-qt5/ko.qm %%DATADIR%%/translations-qt6/kk.qm
%%DATADIR%%/translations-qt5/lt.qm %%DATADIR%%/translations-qt6/ko.qm
%%DATADIR%%/translations-qt5/lv.qm %%DATADIR%%/translations-qt6/lt.qm
%%DATADIR%%/translations-qt5/nb.qm %%DATADIR%%/translations-qt6/lv.qm
%%DATADIR%%/translations-qt5/nl.qm %%DATADIR%%/translations-qt6/nb.qm
%%DATADIR%%/translations-qt5/nn.qm %%DATADIR%%/translations-qt6/nl.qm
%%DATADIR%%/translations-qt5/oc.qm %%DATADIR%%/translations-qt6/nn.qm
%%DATADIR%%/translations-qt5/pl.qm %%DATADIR%%/translations-qt6/oc.qm
%%DATADIR%%/translations-qt5/pt_BR.qm %%DATADIR%%/translations-qt6/pl.qm
%%DATADIR%%/translations-qt5/pt_PT.qm %%DATADIR%%/translations-qt6/pt_BR.qm
%%DATADIR%%/translations-qt5/ro.qm %%DATADIR%%/translations-qt6/pt_PT.qm
%%DATADIR%%/translations-qt5/ru.qm %%DATADIR%%/translations-qt6/ro.qm
%%DATADIR%%/translations-qt5/sk.qm %%DATADIR%%/translations-qt6/ru.qm
%%DATADIR%%/translations-qt5/sr.qm %%DATADIR%%/translations-qt6/sk.qm
%%DATADIR%%/translations-qt5/sr@ijekavian.qm %%DATADIR%%/translations-qt6/sr.qm
%%DATADIR%%/translations-qt5/sr@ijekavianlatin.qm %%DATADIR%%/translations-qt6/sr@ijekavian.qm
%%DATADIR%%/translations-qt5/sr@latin.qm %%DATADIR%%/translations-qt6/sr@ijekavianlatin.qm
%%DATADIR%%/translations-qt5/sv.qm %%DATADIR%%/translations-qt6/sr@latin.qm
%%DATADIR%%/translations-qt5/tr.qm %%DATADIR%%/translations-qt6/sv.qm
%%DATADIR%%/translations-qt5/uk.qm %%DATADIR%%/translations-qt6/tr.qm
%%DATADIR%%/translations-qt5/zh_CN.qm %%DATADIR%%/translations-qt6/uk.qm
%%DATADIR%%/translations-qt5/zh_TW.qm %%DATADIR%%/translations-qt6/zh_CN.qm
%%DATADIR%%/translations-qt6/zh_TW.qm
share/xsessions/xinitrc.desktop share/xsessions/xinitrc.desktop