diff --git a/x11/sddm/Makefile b/x11/sddm/Makefile index dce6dd4b0339..27f3009d37b6 100644 --- a/x11/sddm/Makefile +++ b/x11/sddm/Makefile @@ -1,69 +1,69 @@ PORTNAME= sddm -PORTVERSION= 0.20.0 -PORTREVISION= 3 +PORTVERSION= 0.21.0 DISTVERSIONPREFIX= v CATEGORIES= x11 MAINTAINER= kde@FreeBSD.org COMMENT= QML based login manager WWW= https://github.com/sddm/sddm # The source code is GPLv2+, but the provided themes are: # - CC-BY 3.0 (default greeter theme, maldives) # - CC-BY 4.0 (maya) # - Apache20 (font included with maya) LICENSE= GPLv2+ CC-BY-3.0 CC-BY-4.0 APACHE20 LICENSE_COMB= multi LICENSE_FILE_GPLv2+ = ${WRKSRC}/LICENSE LICENSE_FILE_CC-BY-3.0= ${WRKSRC}/LICENSE.CC-BY-3.0 BUILD_DEPENDS= rst2man.py-${PYTHON_VER}:textproc/py-docutils@${PY_FLAVOR} RUN_DEPENDS= consolekit2>1.2.5:sysutils/consolekit2 \ dbus-launch:devel/dbus \ xauth:x11/xauth \ xmessage:x11/xmessage -USES= cmake compiler:c++11-lang cpe kde:5 pkgconfig python:build qt:5 xorg +USES= cmake compiler:c++17-lang cpe pkgconfig python:build qt:5 xorg CPE_VENDOR= ${PORTNAME}_project USE_GITHUB= yes -USE_KDE= ecm:build USE_QT= core declarative dbus gui network \ 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 \ -DACCOUNTSSERVICE_DATA_DIR:PATH=/var/db/AccountsService \ -DRST2MAN_EXECUTABLE=${LOCALBASE}/bin/rst2man.py-${PYTHON_VER} \ -DSDDM_INITIAL_VT=7 USE_RC_SUBR= sddm -SUB_FILES= xinitrc.desktop +SUB_FILES= xinit-session \ + xinitrc.desktop USERS= sddm GROUPS= sddm post-patch: @${REINPLACE_CMD} -e 's#/etc/X11#${LOCALBASE}/etc/X11#' \ -e 's#/usr/bin/#${LOCALBASE}/bin/#g' \ -e 's#/usr/share/#${LOCALBASE}/share/#' \ -e 's#%%LOCALBASE%%#${LOCALBASE}#g' \ ${WRKSRC}/data/scripts/Xsession \ - ${WRKSRC}/src/common/Configuration.h + ${WRKSRC}/src/common/Configuration.h \ + ${WRKSRC}/src/greeter/waylandkeyboardbackend.cpp post-install: # Install xsession.desktop to launch .xinitrc via sddm. ${MKDIR} ${STAGEDIR}${PREFIX}/share/xsessions + ${INSTALL_DATA} ${FILESDIR}/sddm.conf.default ${STAGEDIR}${PREFIX}/etc ${INSTALL_DATA} ${WRKDIR}/xinitrc.desktop ${STAGEDIR}${PREFIX}/share/xsessions - ${INSTALL_SCRIPT} ${FILESDIR}/xinit-session ${STAGEDIR}${PREFIX}/share/sddm/scripts - ${REINPLACE_CMD} -e 's#@@LOCALBASE@@#${LOCALBASE}#' ${STAGEDIR}${PREFIX}/share/sddm/scripts/xinit-session + ${INSTALL_SCRIPT} ${WRKDIR}/xinit-session ${STAGEDIR}${PREFIX}/share/sddm/scripts ${MV} ${STAGEDIR}${PREFIX}/etc/pam.d/sddm ${STAGEDIR}${PREFIX}/etc/pam.d/sddm.default ${MV} ${STAGEDIR}${PREFIX}/etc/pam.d/sddm-autologin ${STAGEDIR}${PREFIX}/etc/pam.d/sddm-autologin.default ${MV} ${STAGEDIR}${PREFIX}/etc/pam.d/sddm-greeter ${STAGEDIR}${PREFIX}/etc/pam.d/sddm-greeter.default .include diff --git a/x11/sddm/distinfo b/x11/sddm/distinfo index 22293e126b67..afd4571f2ddc 100644 --- a/x11/sddm/distinfo +++ b/x11/sddm/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1689196955 -SHA256 (sddm-sddm-v0.20.0_GH0.tar.gz) = 467c8bd91e0d4f76d4bc4e57ab334f1f48a33478482ba9476d93b0b3d7ace9fb -SIZE (sddm-sddm-v0.20.0_GH0.tar.gz) = 3552722 +TIMESTAMP = 1715911035 +SHA256 (sddm-sddm-v0.21.0_GH0.tar.gz) = f895de2683627e969e4849dbfbbb2b500787481ca5ba0de6d6dfdae5f1549abf +SIZE (sddm-sddm-v0.21.0_GH0.tar.gz) = 3557266 diff --git a/x11/sddm/files/sddm.conf.default b/x11/sddm/files/sddm.conf.default new file mode 100644 index 000000000000..585e4bae106c --- /dev/null +++ b/x11/sddm/files/sddm.conf.default @@ -0,0 +1,2 @@ +# Disable virtual keyboard by default +InputMethod="" diff --git a/x11/sddm/files/xinit-session b/x11/sddm/files/xinit-session.in similarity index 76% rename from x11/sddm/files/xinit-session rename to x11/sddm/files/xinit-session.in index d10125d73770..d9b9cbb107b1 100644 --- a/x11/sddm/files/xinit-session +++ b/x11/sddm/files/xinit-session.in @@ -1,22 +1,22 @@ #!/bin/sh # # Runs the user's .xinitrc (at this point, .xsession has already # been sourced). If there is no .xinitrc, but xinit is installed, # then there is a default script. If neither is installed, # display a message. RC="$HOME/.xinitrc" if [ ! -f "$RC" ] ; then - RC="@@LOCALBASE@@/etc/X11/xinit/xinitrc" + RC="%%LOCALBASE%%/etc/X11/xinit/xinitrc" # But that one needs at least xterm to do something useful - if [ ! -x @@LOCALBASE@@/bin/xterm ] ; then + if [ ! -x %%LOCALBASE%%/bin/xterm ] ; then RC="" fi fi if [ -n "$RC" -a -f "$RC" ] ; then test -x "$RC" && exec "$RC" test -f "$RC" && exec /bin/sh "$RC" else - exec @@LOCALBASE@@/bin/xmessage -geometry +0+0 "There is no user-session or usable default with xterm" + exec %%LOCALBASE%%/bin/xmessage -geometry +0+0 "There is no user-session or usable default with xterm" fi diff --git a/x11/sddm/pkg-plist b/x11/sddm/pkg-plist index bc24fd18f449..dce3f0959ab0 100644 --- a/x11/sddm/pkg-plist +++ b/x11/sddm/pkg-plist @@ -1,197 +1,199 @@ bin/sddm bin/sddm-greeter -etc/dbus-1/system.d/org.freedesktop.DisplayManager.conf @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-greeter.default etc/pam.d/sddm-greeter +@sample etc/sddm.conf.default etc/sddm.conf %%QT_QMLDIR%%/SddmComponents/Background.qml %%QT_QMLDIR%%/SddmComponents/Button.qml %%QT_QMLDIR%%/SddmComponents/Clock.qml %%QT_QMLDIR%%/SddmComponents/ComboBox.qml %%QT_QMLDIR%%/SddmComponents/ImageButton.qml %%QT_QMLDIR%%/SddmComponents/LayoutBox.qml %%QT_QMLDIR%%/SddmComponents/Menu.qml %%QT_QMLDIR%%/SddmComponents/PasswordBox.qml %%QT_QMLDIR%%/SddmComponents/PictureBox.qml %%QT_QMLDIR%%/SddmComponents/TextBox.qml %%QT_QMLDIR%%/SddmComponents/TextConstants.qml %%QT_QMLDIR%%/SddmComponents/qmldir %%QT_QMLDIR%%/SddmComponents/warning.png libexec/sddm-helper libexec/sddm-helper-start-wayland libexec/sddm-helper-start-x11user +share/dbus-1/system.d/org.freedesktop.DisplayManager.conf share/man/man1/sddm-greeter.1.gz share/man/man1/sddm.1.gz share/man/man5/sddm-state.conf.5.gz share/man/man5/sddm.conf.5.gz %%DATADIR%%/faces/.face.icon %%DATADIR%%/faces/root.face.icon %%DATADIR%%/flags/ae.png %%DATADIR%%/flags/am.png %%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 %%DATADIR%%/flags/br.png %%DATADIR%%/flags/by.png %%DATADIR%%/flags/ca.png %%DATADIR%%/flags/ch.png %%DATADIR%%/flags/cu.png %%DATADIR%%/flags/cz.png %%DATADIR%%/flags/de.png %%DATADIR%%/flags/dj.png %%DATADIR%%/flags/dk.png %%DATADIR%%/flags/dz.png %%DATADIR%%/flags/ee.png %%DATADIR%%/flags/eg.png %%DATADIR%%/flags/es.png %%DATADIR%%/flags/eu.png %%DATADIR%%/flags/fi.png %%DATADIR%%/flags/fr.png %%DATADIR%%/flags/gb.png %%DATADIR%%/flags/ge.png %%DATADIR%%/flags/gr.png %%DATADIR%%/flags/hr.png %%DATADIR%%/flags/hu.png %%DATADIR%%/flags/il.png %%DATADIR%%/flags/in.png %%DATADIR%%/flags/iq.png %%DATADIR%%/flags/is.png %%DATADIR%%/flags/it.png %%DATADIR%%/flags/jo.png %%DATADIR%%/flags/jp.png %%DATADIR%%/flags/km.png %%DATADIR%%/flags/kr.png %%DATADIR%%/flags/kw.png %%DATADIR%%/flags/la.png %%DATADIR%%/flags/lb.png %%DATADIR%%/flags/lt.png %%DATADIR%%/flags/lv.png %%DATADIR%%/flags/ly.png %%DATADIR%%/flags/ma.png %%DATADIR%%/flags/mk.png %%DATADIR%%/flags/mn.png %%DATADIR%%/flags/mx.png %%DATADIR%%/flags/nl.png %%DATADIR%%/flags/no.png %%DATADIR%%/flags/om.png %%DATADIR%%/flags/pl.png %%DATADIR%%/flags/ps.png %%DATADIR%%/flags/pt.png %%DATADIR%%/flags/qa.png %%DATADIR%%/flags/qc.png %%DATADIR%%/flags/ro.png %%DATADIR%%/flags/ru.png %%DATADIR%%/flags/sa.png %%DATADIR%%/flags/sd.png %%DATADIR%%/flags/se.png %%DATADIR%%/flags/si.png %%DATADIR%%/flags/sk.png %%DATADIR%%/flags/so.png %%DATADIR%%/flags/sr.png %%DATADIR%%/flags/sy.png %%DATADIR%%/flags/th.png %%DATADIR%%/flags/tn.png %%DATADIR%%/flags/tr.png %%DATADIR%%/flags/ua.png %%DATADIR%%/flags/uk.png %%DATADIR%%/flags/un.png %%DATADIR%%/flags/us.png %%DATADIR%%/flags/uy.png %%DATADIR%%/flags/vn.png %%DATADIR%%/flags/ye.png %%DATADIR%%/flags/yu.png %%DATADIR%%/flags/zz.png %%DATADIR%%/scripts/Xsession %%DATADIR%%/scripts/Xsetup %%DATADIR%%/scripts/Xstop %%DATADIR%%/scripts/wayland-session %%DATADIR%%/scripts/xinit-session %%DATADIR%%/themes/elarun/Main.qml %%DATADIR%%/themes/elarun/README %%DATADIR%%/themes/elarun/angle-down.png %%DATADIR%%/themes/elarun/elarun.jpg %%DATADIR%%/themes/elarun/images/background.png %%DATADIR%%/themes/elarun/images/lock.png %%DATADIR%%/themes/elarun/images/login_active.png %%DATADIR%%/themes/elarun/images/login_normal.png %%DATADIR%%/themes/elarun/images/rectangle.png %%DATADIR%%/themes/elarun/images/rectangle_overlay.png %%DATADIR%%/themes/elarun/images/session_normal.png %%DATADIR%%/themes/elarun/images/system_hibernate.png %%DATADIR%%/themes/elarun/images/system_reboot.png %%DATADIR%%/themes/elarun/images/system_shutdown.png %%DATADIR%%/themes/elarun/images/system_suspend.png %%DATADIR%%/themes/elarun/images/system_switch_user.png %%DATADIR%%/themes/elarun/images/user_icon.png %%DATADIR%%/themes/elarun/metadata.desktop %%DATADIR%%/themes/elarun/theme.conf %%DATADIR%%/themes/maldives/LICENSE %%DATADIR%%/themes/maldives/Main.qml %%DATADIR%%/themes/maldives/README %%DATADIR%%/themes/maldives/angle-down.png %%DATADIR%%/themes/maldives/background.jpg %%DATADIR%%/themes/maldives/maldives.jpg %%DATADIR%%/themes/maldives/metadata.desktop %%DATADIR%%/themes/maldives/rectangle.png %%DATADIR%%/themes/maldives/theme.conf %%DATADIR%%/themes/maya/LICENSE %%DATADIR%%/themes/maya/Main.qml %%DATADIR%%/themes/maya/README %%DATADIR%%/themes/maya/components/SpButton.qml %%DATADIR%%/themes/maya/components/SpClock.qml %%DATADIR%%/themes/maya/fonts/OpenSans_CondLight.ttf %%DATADIR%%/themes/maya/images/ic_arrow_drop_down_white_24px.svg %%DATADIR%%/themes/maya/images/ic_power_settings_new_white_24px.svg %%DATADIR%%/themes/maya/images/ic_refresh_white_24px.svg %%DATADIR%%/themes/maya/images/ic_warning_white_24px.svg %%DATADIR%%/themes/maya/metadata.desktop %%DATADIR%%/themes/maya/screenshots/hi_IN.png %%DATADIR%%/themes/maya/theme.conf -%%DATADIR%%/translations/ar.qm -%%DATADIR%%/translations/bn.qm -%%DATADIR%%/translations/ca.qm -%%DATADIR%%/translations/cs.qm -%%DATADIR%%/translations/da.qm -%%DATADIR%%/translations/de.qm -%%DATADIR%%/translations/es.qm -%%DATADIR%%/translations/et.qm -%%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 -%%DATADIR%%/translations/lv.qm -%%DATADIR%%/translations/nb.qm -%%DATADIR%%/translations/nl.qm -%%DATADIR%%/translations/nn.qm -%%DATADIR%%/translations/oc.qm -%%DATADIR%%/translations/pl.qm -%%DATADIR%%/translations/pt_BR.qm -%%DATADIR%%/translations/pt_PT.qm -%%DATADIR%%/translations/ro.qm -%%DATADIR%%/translations/ru.qm -%%DATADIR%%/translations/sk.qm -%%DATADIR%%/translations/sr.qm -%%DATADIR%%/translations/sr@ijekavian.qm -%%DATADIR%%/translations/sr@ijekavianlatin.qm -%%DATADIR%%/translations/sr@latin.qm -%%DATADIR%%/translations/sv.qm -%%DATADIR%%/translations/tr.qm -%%DATADIR%%/translations/uk.qm -%%DATADIR%%/translations/zh_CN.qm -%%DATADIR%%/translations/zh_TW.qm +%%DATADIR%%/translations-qt5/ar.qm +%%DATADIR%%/translations-qt5/bg.qm +%%DATADIR%%/translations-qt5/bn.qm +%%DATADIR%%/translations-qt5/ca.qm +%%DATADIR%%/translations-qt5/cs.qm +%%DATADIR%%/translations-qt5/da.qm +%%DATADIR%%/translations-qt5/de.qm +%%DATADIR%%/translations-qt5/es.qm +%%DATADIR%%/translations-qt5/et.qm +%%DATADIR%%/translations-qt5/eu.qm +%%DATADIR%%/translations-qt5/fi.qm +%%DATADIR%%/translations-qt5/fr.qm +%%DATADIR%%/translations-qt5/gl.qm +%%DATADIR%%/translations-qt5/he.qm +%%DATADIR%%/translations-qt5/hi_IN.qm +%%DATADIR%%/translations-qt5/hu.qm +%%DATADIR%%/translations-qt5/ie.qm +%%DATADIR%%/translations-qt5/is.qm +%%DATADIR%%/translations-qt5/it.qm +%%DATADIR%%/translations-qt5/ja.qm +%%DATADIR%%/translations-qt5/ka.qm +%%DATADIR%%/translations-qt5/kk.qm +%%DATADIR%%/translations-qt5/ko.qm +%%DATADIR%%/translations-qt5/lt.qm +%%DATADIR%%/translations-qt5/lv.qm +%%DATADIR%%/translations-qt5/nb.qm +%%DATADIR%%/translations-qt5/nl.qm +%%DATADIR%%/translations-qt5/nn.qm +%%DATADIR%%/translations-qt5/oc.qm +%%DATADIR%%/translations-qt5/pl.qm +%%DATADIR%%/translations-qt5/pt_BR.qm +%%DATADIR%%/translations-qt5/pt_PT.qm +%%DATADIR%%/translations-qt5/ro.qm +%%DATADIR%%/translations-qt5/ru.qm +%%DATADIR%%/translations-qt5/sk.qm +%%DATADIR%%/translations-qt5/sr.qm +%%DATADIR%%/translations-qt5/sr@ijekavian.qm +%%DATADIR%%/translations-qt5/sr@ijekavianlatin.qm +%%DATADIR%%/translations-qt5/sr@latin.qm +%%DATADIR%%/translations-qt5/sv.qm +%%DATADIR%%/translations-qt5/tr.qm +%%DATADIR%%/translations-qt5/uk.qm +%%DATADIR%%/translations-qt5/zh_CN.qm +%%DATADIR%%/translations-qt5/zh_TW.qm share/xsessions/xinitrc.desktop