Skip to content

Commit

Permalink
x11/sddm: Update to 0.19.0
Browse files Browse the repository at this point in the history
  • Loading branch information
arrowd committed Nov 30, 2020
1 parent cb6fe3f commit c067868
Show file tree
Hide file tree
Showing 14 changed files with 20 additions and 212 deletions.
4 changes: 1 addition & 3 deletions x11/sddm/Makefile
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
# $FreeBSD$

PORTNAME= sddm
PORTVERSION= 0.18.1
PORTVERSION= 0.19.0
DISTVERSIONPREFIX= v
PORTREVISION= 4
CATEGORIES= x11

MAINTAINER= kde@FreeBSD.org
Expand Down Expand Up @@ -46,7 +45,6 @@ post-patch:
-e 's#/usr/share/#${LOCALBASE}/share/#' \
${WRKSRC}/data/scripts/Xsession \
${WRKSRC}/src/common/Configuration.h
@${CP} ${PATCHDIR}/VirtualTerminal_FreeBSD.cpp ${WRKSRC}/src/daemon

post-install:
# Install xsession.desktop to launch .xinitrc via sddm.
Expand Down
6 changes: 3 additions & 3 deletions x11/sddm/distinfo
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
TIMESTAMP = 1581010748
SHA256 (sddm-sddm-v0.18.1_GH0.tar.gz) = 07296fc747010a5dd58a45f16c3224b439997afad42566e4b043c841b1b71700
SIZE (sddm-sddm-v0.18.1_GH0.tar.gz) = 3526726
TIMESTAMP = 1606404273
SHA256 (sddm-sddm-v0.19.0_GH0.tar.gz) = e76da1f13d5ad5e0179e3fec57543126044339405ef19c397e105e0807bd4e41
SIZE (sddm-sddm-v0.19.0_GH0.tar.gz) = 3532945
37 changes: 0 additions & 37 deletions x11/sddm/files/VirtualTerminal_FreeBSD.cpp

This file was deleted.

16 changes: 0 additions & 16 deletions x11/sddm/files/patch-CMakeLists.txt

This file was deleted.

11 changes: 0 additions & 11 deletions x11/sddm/files/patch-data_themes_maya_metadata.desktop

This file was deleted.

4 changes: 2 additions & 2 deletions x11/sddm/files/patch-services_sddm-autologin.pam
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
--- services/sddm-autologin.pam.orig 2017-12-05 16:00:16 UTC
--- services/sddm-autologin.pam.orig 2020-11-03 09:55:31 UTC
+++ services/sddm-autologin.pam
@@ -1,13 +1,9 @@
#%PAM-1.0
-auth required pam_env.so
-auth required pam_tally.so file=/var/log/faillog onerr=succeed
-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
Expand Down
4 changes: 2 additions & 2 deletions x11/sddm/files/patch-src_common_Configuration.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ 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 2019-03-13 09:22:35 UTC
--- src/common/Configuration.h.orig 2020-11-03 09:55:31 UTC
+++ src/common/Configuration.h
@@ -47,10 +47,10 @@ namespace SDDM {
// Name Entries (but it's a regular class again)
Expand All @@ -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(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"
"above which avatars are disabled\n"
11 changes: 0 additions & 11 deletions x11/sddm/files/patch-src_daemon_CMakeLists.txt

This file was deleted.

9 changes: 4 additions & 5 deletions x11/sddm/files/patch-src_daemon_Display.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ file defines DesktopNames. Our xinitrc.desktop does not set it because that
may confuse the desktop session started from ~/.xinitrc. These environment
variables are used for OnlyShowIn and NotShowIn in .desktop files.

--- src/daemon/Display.cpp.orig 2019-03-13 09:22:35 UTC
--- src/daemon/Display.cpp.orig 2020-11-03 09:55:31 UTC
+++ src/daemon/Display.cpp
@@ -321,11 +321,13 @@ namespace SDDM {
@@ -320,10 +320,12 @@ namespace SDDM {
env.insert(QStringLiteral("XDG_SEAT_PATH"), daemonApp->displayManager()->seatPath(seat()->name()));
env.insert(QStringLiteral("XDG_SESSION_PATH"), daemonApp->displayManager()->sessionPath(QStringLiteral("Session%1").arg(daemonApp->newSessionId())));
env.insert(QStringLiteral("DESKTOP_SESSION"), session.desktopSession());
Expand All @@ -18,8 +18,7 @@ variables are used for OnlyShowIn and NotShowIn in .desktop files.
env.insert(QStringLiteral("XDG_SESSION_CLASS"), QStringLiteral("user"));
env.insert(QStringLiteral("XDG_SESSION_TYPE"), session.xdgSessionType());
env.insert(QStringLiteral("XDG_SEAT"), seat()->name());

+ if (!session.desktopNames().isEmpty())
env.insert(QStringLiteral("XDG_SESSION_DESKTOP"), session.desktopNames());
if (seat()->name() == QLatin1String("seat0")) {
env.insert(QStringLiteral("XDG_VTNR"), QString::number(vt));

m_auth->insertEnvironment(env);
12 changes: 0 additions & 12 deletions x11/sddm/files/patch-src_greeter_UserModel.cpp

This file was deleted.

48 changes: 0 additions & 48 deletions x11/sddm/files/patch-src_helper_Backend.cpp

This file was deleted.

12 changes: 0 additions & 12 deletions x11/sddm/files/patch-src_helper_CMakeLists.txt

This file was deleted.

46 changes: 0 additions & 46 deletions x11/sddm/files/patch-src_helper_HelperApp.cpp

This file was deleted.

12 changes: 8 additions & 4 deletions x11/sddm/pkg-plist
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,6 @@ etc/dbus-1/system.d/org.freedesktop.DisplayManager.conf
etc/pam.d/sddm
etc/pam.d/sddm-autologin
etc/pam.d/sddm-greeter
man/man1/sddm.1.gz
man/man1/sddm-greeter.1.gz
man/man5/sddm.conf.5.gz
man/man5/sddm-state.conf.5.gz
%%QT_QMLDIR%%/SddmComponents/Background.qml
%%QT_QMLDIR%%/SddmComponents/Button.qml
%%QT_QMLDIR%%/SddmComponents/Clock.qml
Expand All @@ -22,6 +18,10 @@ man/man5/sddm-state.conf.5.gz
%%QT_QMLDIR%%/SddmComponents/qmldir
%%QT_QMLDIR%%/SddmComponents/warning.png
libexec/sddm-helper
man/man1/sddm-greeter.1.gz
man/man1/sddm.1.gz
man/man5/sddm-state.conf.5.gz
man/man5/sddm.conf.5.gz
%%DATADIR%%/faces/.face.icon
%%DATADIR%%/faces/root.face.icon
%%DATADIR%%/flags/ae.png
Expand Down Expand Up @@ -156,10 +156,13 @@ libexec/sddm-helper
%%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/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
Expand All @@ -170,6 +173,7 @@ libexec/sddm-helper
%%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
Expand Down

0 comments on commit c067868

Please sign in to comment.