diff --git a/dont-set-empty-autologin.patch b/dont-set-empty-autologin.patch new file mode 100644 index 0000000..67acc11 --- /dev/null +++ b/dont-set-empty-autologin.patch @@ -0,0 +1,16 @@ +Index: sddm-kcm-5.13.80git.20180704T081749~7a9b287/src/advanceconfig.cpp +=================================================================== +--- sddm-kcm-5.13.80git.20180704T081749~7a9b287.orig/src/advanceconfig.cpp ++++ sddm-kcm-5.13.80git.20180704T081749~7a9b287/src/advanceconfig.cpp +@@ -122,7 +122,10 @@ QVariantMap AdvanceConfig::save() + } + + args[QStringLiteral("sddm.conf/Autologin/User")] = ( configUi->autoLogin->isChecked() ) ? configUi->userList->currentText() : QString(); +- args[QStringLiteral("sddm.conf/Autologin/Session")] = ( configUi->autoLogin->isChecked() ) ? configUi->sessionList->currentData() : QString(); ++ if (configUi->autoLogin->isChecked()) { // only save the Autologin session if Autologin is actually enabled otherwise we would override the default session with "" if disabled ++ args[QStringLiteral("sddm.conf/Autologin/Session")] = configUi->sessionList->currentData(); ++ } ++ + + args[QStringLiteral("sddm.conf/Autologin/Relogin")] = configUi->reloginAfterQuit->isChecked(); + //TODO session diff --git a/kcm_sddm.changes b/kcm_sddm.changes index 99c8a15..62ec306 100644 --- a/kcm_sddm.changes +++ b/kcm_sddm.changes @@ -1,3 +1,42 @@ +------------------------------------------------------------------- +Fri Oct 5 10:01:09 UTC 2018 - fabian@ritter-vogt.de + +- Update to 5.14.0 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/plasma-5.14.0.php +- Changes since 5.13.90: + * Workaround QTBUG-47066 to fix crash on startup +- Remove patch, now upstream: + * 0001-Workaround-QTBUG-47066-to-fix-crash-on-startup.patch + +------------------------------------------------------------------- +Sat Sep 15 16:25:26 UTC 2018 - fabian@ritter-vogt.de + +- Add tarball signature and keyring containing keys of release managers + Jonathan Riddell and Bhushan Shah + +------------------------------------------------------------------- +Thu Sep 13 17:24:59 UTC 2018 - fabian@ritter-vogt.de + +- Update to 5.13.90 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/plasma-5.13.90.php +- Changes since 5.13.5: + * QT_MIN_VERSIONS is Qt 5.11 for Plasma 5.14. Agreed at kickoff meeting. Set everywhere for clearity and consistency. + * Sync MAX_UID with upstream + * Remove deprecated class + * Check version + * Remove unused include moc + * Use nullptr. Use const'ref + * Make compile with strict compile flags (I found a missing i18n too) +- Refresh patches remove-wayland-suffix.patch +- Replace set-default-session-to-plasma5-for-autologin.patch with + dont-set-empty-autologin.patch +- Add patch to fix crash on startup: + * 0001-Workaround-QTBUG-47066-to-fix-crash-on-startup.patch + ------------------------------------------------------------------- Tue Sep 4 10:58:40 UTC 2018 - fabian@ritter-vogt.de diff --git a/kcm_sddm.spec b/kcm_sddm.spec index af2a914..ec98cca 100644 --- a/kcm_sddm.spec +++ b/kcm_sddm.spec @@ -18,15 +18,19 @@ %bcond_without lang Name: kcm_sddm -Version: 5.13.5 +Version: 5.14.0 Release: 0 Summary: A sddm control module for KDE License: GPL-2.0-only Group: System/GUI/KDE Url: https://projects.kde.org/projects/kdereview/sddm-kcm/repository -Source: http://download.kde.org/stable/plasma/%{version}/sddm-kcm-%{version}.tar.xz -# PATCH-FIX-OPENSUSE set-default-session-to-plasma5-for-autologin.patch boo#951886 wbauer@tmo.at -- set the default autologin session to plasma5.desktop -Patch1: set-default-session-to-plasma5-for-autologin.patch +Source: sddm-kcm-%{version}.tar.xz +%if %{with lang} +Source1: sddm-kcm-%{version}.tar.xz.sig +Source2: plasma.keyring +%endif +# PATCH-FIX-OPENSUSE +Patch1: dont-set-empty-autologin.patch # PATCH-FIX-OPENSUSE Patch2: 0002-Support-default.session-symlink.patch # PATCH-FIX-OPENSUSE diff --git a/plasma.keyring b/plasma.keyring new file mode 100644 index 0000000..5e9faf8 Binary files /dev/null and b/plasma.keyring differ diff --git a/remove-wayland-suffix.patch b/remove-wayland-suffix.patch index 291e32b..e3eff0f 100644 --- a/remove-wayland-suffix.patch +++ b/remove-wayland-suffix.patch @@ -1,24 +1,32 @@ +From c6fda4bb877a71687b37e6a19f9daf7298e32f98 Mon Sep 17 00:00:00 2001 From: Fabian Vogt -Subject: Don't add a (Wayland) suffix to Wayland sessions +Date: Sat, 7 Jul 2018 20:34:44 +0200 +Subject: [PATCH] Don't add a (Wayland) suffix to Wayland sessions It got removed from sddm as well. +--- + src/sessionmodel.cpp | 7 +------ + 1 file changed, 1 insertion(+), 6 deletions(-) -Index: sddm-kcm-5.12.5/src/sessionmodel.cpp -=================================================================== ---- sddm-kcm-5.12.5.orig/src/sessionmodel.cpp -+++ sddm-kcm-5.12.5/src/sessionmodel.cpp -@@ -81,13 +81,8 @@ void SessionModel::loadDir(const QString +diff --git a/src/sessionmodel.cpp b/src/sessionmodel.cpp +index ff63dbd..eeb962c 100644 +--- a/src/sessionmodel.cpp ++++ b/src/sessionmodel.cpp +@@ -81,13 +81,8 @@ void SessionModel::loadDir(const QString &path, SessionType type) if (current_section != QLatin1String("Desktop Entry")) continue; // We are only interested in the "Desktop Entry" section -- if (line.startsWith("Name=")) { -+ if (line.startsWith("Name=")) +- if (line.startsWith(QLatin1String("Name="))) { ++ if (line.startsWith(QLatin1String("Name="))) si->name = line.mid(5); - if (type == SessionTypeWayland) { - //we want to exactly match the SDDM prompt which is formatted in this way - si->name = i18nc("%1 is the name of a session", "%1 (Wayland)", si->name); - } - } - if (line.startsWith("Exec=")) + if (line.startsWith(QLatin1String("Exec="))) si->exec = line.mid(5); - if (line.startsWith("Comment=")) + if (line.startsWith(QLatin1String("Comment="))) +-- +2.17.1 + diff --git a/sddm-kcm-5.13.5.tar.xz b/sddm-kcm-5.13.5.tar.xz deleted file mode 100644 index 002625a..0000000 --- a/sddm-kcm-5.13.5.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:90a1f9f12f2ea6e92693ee6c23f8fd75a1ea007f30b35837f5b80328d5404f88 -size 60560 diff --git a/sddm-kcm-5.14.0.tar.xz b/sddm-kcm-5.14.0.tar.xz new file mode 100644 index 0000000..d0d3557 --- /dev/null +++ b/sddm-kcm-5.14.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6d8c5ad18e1bcf8bb42287962a5225ea16203b662935155874cc1387c18fe637 +size 60768 diff --git a/sddm-kcm-5.14.0.tar.xz.sig b/sddm-kcm-5.14.0.tar.xz.sig new file mode 100644 index 0000000..22c1c00 --- /dev/null +++ b/sddm-kcm-5.14.0.tar.xz.sig @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQEzBAABCAAdFiEEs8s2ZVJUC+Bu6a2XEZaMRJKMrvwFAlu3qzoACgkQEZaMRJKM +rvymLAf9GWpEOlxozy3TOREC/I4kqrKuPYm+vEtPFWLZrgpjG4A1ovijmM0EcUzw +mOcM7JVKb3I7rT1Gr0QwlXgXb5/k1AylqU4gZjjdK/UMac4FN9IKuGopNmpy93oX +0X45CzbMNzS6TCC70HXOji2cxUWNrGfk6zlq1jch/gc2f2dWn6lvVF4UPZEyAWv8 +eHTZM7czxgm4+bsoxeNcgybdkRBejEo4Ev0FYlIHE7FTUHQd8XZDePa0dG9alalk +5lDfINEGkeXbCFZ+TYKJmLAVzojciP5hCvsZFNh4lvjWnz63Tqr7sW1yLr1lP1xm +ndpY62dHmpLMjV9KXktQTJpMH46EJA== +=oZcP +-----END PGP SIGNATURE----- diff --git a/set-default-session-to-plasma5-for-autologin.patch b/set-default-session-to-plasma5-for-autologin.patch deleted file mode 100644 index cd04ef0..0000000 --- a/set-default-session-to-plasma5-for-autologin.patch +++ /dev/null @@ -1,24 +0,0 @@ -Index: sddm-kcm-5.12.2/src/advanceconfig.cpp -=================================================================== ---- sddm-kcm-5.12.2.orig/src/advanceconfig.cpp -+++ sddm-kcm-5.12.2/src/advanceconfig.cpp -@@ -90,7 +90,7 @@ void AdvanceConfig::load() - const QString currentUser = mConfig->group("Autologin").readEntry("User", ""); - configUi->userList->setCurrentIndex(userModel->indexOf(currentUser)); - -- const QString autologinSession = mConfig->group("Autologin").readEntry("Session", ""); -+ const QString autologinSession = mConfig->group("Autologin").readEntry("Session", "plasma5.desktop"); - configUi->sessionList->setCurrentIndex(sessionModel->indexOf(autologinSession)); - - configUi->autoLogin->setChecked(!currentUser.isEmpty()); -@@ -123,7 +123,9 @@ QVariantMap AdvanceConfig::save() - } - - args["sddm.conf/Autologin/User"] = ( configUi->autoLogin->isChecked() ) ? configUi->userList->currentText() : ""; -- args["sddm.conf/Autologin/Session"] = ( configUi->autoLogin->isChecked() ) ? configUi->sessionList->currentData() : ""; -+ if (configUi->autoLogin->isChecked()) { // only save the Autologin session if Autologin is actually enabled otherwise we would override the default session with "" if disabled -+ args["sddm.conf/Autologin/Session"] = configUi->sessionList->currentData(); -+ } - - args["sddm.conf/Autologin/Relogin"] = configUi->reloginAfterQuit->isChecked(); - //TODO session