From 368e58c70b03645b538ed22a6d4fa75b603ad1a870cd74d5d778d01cedc173f3 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Sat, 6 Oct 2018 16:17:29 +0000 Subject: [PATCH] Plasma 5.14.0 final (attempt 2) OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kcm_sddm?expand=0&rev=173 --- ...-QTBUG-47066-to-fix-crash-on-startup.patch | 41 ------------------- kcm_sddm.changes | 12 ++++++ kcm_sddm.spec | 8 ++-- sddm-kcm-5.13.90.tar.xz | 3 -- sddm-kcm-5.13.90.tar.xz.sig | 11 ----- sddm-kcm-5.14.0.tar.xz | 3 ++ sddm-kcm-5.14.0.tar.xz.sig | 11 +++++ 7 files changed, 29 insertions(+), 60 deletions(-) delete mode 100644 0001-Workaround-QTBUG-47066-to-fix-crash-on-startup.patch delete mode 100644 sddm-kcm-5.13.90.tar.xz delete mode 100644 sddm-kcm-5.13.90.tar.xz.sig create mode 100644 sddm-kcm-5.14.0.tar.xz create mode 100644 sddm-kcm-5.14.0.tar.xz.sig diff --git a/0001-Workaround-QTBUG-47066-to-fix-crash-on-startup.patch b/0001-Workaround-QTBUG-47066-to-fix-crash-on-startup.patch deleted file mode 100644 index 4e69cf4..0000000 --- a/0001-Workaround-QTBUG-47066-to-fix-crash-on-startup.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 0497a6e917c9cf6c49d30658d11d4e624037610d Mon Sep 17 00:00:00 2001 -From: Fabian Vogt -Date: Fri, 14 Sep 2018 11:35:12 +0200 -Subject: [PATCH] Workaround QTBUG-47066 to fix crash on startup - -Summary: -The lambda returns a QStringBuilder which contains dangling references. -Work around that by converting to QString inside the lambda's context. - -Test Plan: Does not crash anymore. - -Reviewers: #plasma - -Subscribers: plasma-devel - -Tags: #plasma - -Differential Revision: https://phabricator.kde.org/D15498 ---- - src/sddmkcm.cpp | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -Index: sddm-kcm-5.13.90/src/sddmkcm.cpp -=================================================================== ---- sddm-kcm-5.13.90.orig/src/sddmkcm.cpp -+++ sddm-kcm-5.13.90/src/sddmkcm.cpp -@@ -62,10 +62,12 @@ SddmKcm::SddmKcm(QWidget *parent, const - // This does not listen for new config files in the directory. - QStringList configFiles = QDir(QString::fromLatin1(SDDM_CONFIG_DIR)).entryList(QDir::Files | QDir::NoDotAndDotDot, QDir::LocaleAware), - systemConfigFiles = QDir(QString::fromLatin1(SDDM_SYSTEM_CONFIG_DIR)).entryList(QDir::Files | QDir::NoDotAndDotDot, QDir::LocaleAware); -+ -+ // QStringBuilder keeps dangling references, so force return of QString (QTBUG-47066) - std::transform(systemConfigFiles.begin(), systemConfigFiles.end(), systemConfigFiles.begin(), -- [](const QString &filename) { return QStringLiteral(SDDM_SYSTEM_CONFIG_DIR "/") + filename; }); -+ [](const QString &filename) -> QString { return QStringLiteral(SDDM_SYSTEM_CONFIG_DIR "/") + filename; }); - std::transform(configFiles.begin(), configFiles.end(), configFiles.begin(), -- [](const QString &filename) { return QStringLiteral(SDDM_CONFIG_DIR "/") + filename; }); -+ [](const QString &filename) -> QString { return QStringLiteral(SDDM_CONFIG_DIR "/") + filename; }); - - mSddmConfig->addConfigSources(systemConfigFiles + configFiles); - diff --git a/kcm_sddm.changes b/kcm_sddm.changes index da00a36..62ec306 100644 --- a/kcm_sddm.changes +++ b/kcm_sddm.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +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 diff --git a/kcm_sddm.spec b/kcm_sddm.spec index 0961933..ec98cca 100644 --- a/kcm_sddm.spec +++ b/kcm_sddm.spec @@ -18,15 +18,15 @@ %bcond_without lang Name: kcm_sddm -Version: 5.13.90 +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/unstable/plasma/%{version}/sddm-kcm-%{version}.tar.xz +Source: sddm-kcm-%{version}.tar.xz %if %{with lang} -Source1: http://download.kde.org/unstable/plasma/%{version}/sddm-kcm-%{version}.tar.xz.sig +Source1: sddm-kcm-%{version}.tar.xz.sig Source2: plasma.keyring %endif # PATCH-FIX-OPENSUSE @@ -37,8 +37,6 @@ Patch2: 0002-Support-default.session-symlink.patch Patch3: 0001-Replace-autologin-configuration-with-a-note-to-use-Y.patch # PATCH-FIX-UPSTREAM Patch4: remove-wayland-suffix.patch -# PATCH-FIX-UPSTREAM -Patch5: 0001-Workaround-QTBUG-47066-to-fix-crash-on-startup.patch BuildRequires: extra-cmake-modules >= 1.0.0 BuildRequires: kf5-filesystem BuildRequires: pkgconfig diff --git a/sddm-kcm-5.13.90.tar.xz b/sddm-kcm-5.13.90.tar.xz deleted file mode 100644 index 2af04ee..0000000 --- a/sddm-kcm-5.13.90.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f6810eb1aad7ce09cf26d7c1de7f7a563b283689d8bc1aaaa0947a40e5e573eb -size 61056 diff --git a/sddm-kcm-5.13.90.tar.xz.sig b/sddm-kcm-5.13.90.tar.xz.sig deleted file mode 100644 index d2bd41d..0000000 --- a/sddm-kcm-5.13.90.tar.xz.sig +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAluamTgACgkQ7JTRj38F -mX5SIgf+L4WeqJcIZUSHIIHmYPv+FZKcpXngrTOTQ64iLqNrlg1gqcyYOnaxL0+2 -CU7H08utPbqzlzTcdGJCqBx2oP46Hi1Q9KFwiUzvdPoLVMsD+towbLj63GaLLrSE -ua0dWIN8KnW8EkKijz/7DSo0xffa74PAHPwzCYYx+BPeNPuzSj2fElDhhGHWoQfk -cOJ1Xxlef/+qQ8jASNJPfOIpPlpSytoY8NED3+e4cixXoq5JgzTM6kOuJ5H3nESQ -hdb5yrCInAjC6lW4paFLVf9Ly8leiyT5KPTeItuEYc2dq3kLo46D6nX68tKSr05t -Szl/78hAwg7VeVZyu8cg+09f6DuDgw== -=uivd ------END PGP SIGNATURE----- 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-----