diff --git a/0001-Remove-some-features-with-questionable-security.patch b/0001-Remove-some-features-with-questionable-security.patch index 7e17602..bc929fd 100644 --- a/0001-Remove-some-features-with-questionable-security.patch +++ b/0001-Remove-some-features-with-questionable-security.patch @@ -1,4 +1,4 @@ -From bc12001cb93b29799bc7cbbf963e4b793c008032 Mon Sep 17 00:00:00 2001 +From e4e1a5f5d90d84363637806437ffb3f2758fbc88 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Wed, 20 Mar 2024 09:38:27 +0100 Subject: [PATCH] Remove some features with questionable security @@ -11,10 +11,10 @@ Subject: [PATCH] Remove some features with questionable security 2 files changed, 8 deletions(-) diff --git a/src/ui/Advanced.qml b/src/ui/Advanced.qml -index 8be5d81..3d05eea 100644 +index d6f1827..ca777ee 100644 --- a/src/ui/Advanced.qml +++ b/src/ui/Advanced.qml -@@ -36,7 +36,6 @@ Kirigami.Page { +@@ -45,7 +45,6 @@ Kirigami.Page { // to appear when the user checks the checkbox, not all the // time when the checkbox is checked. if (checked && kcm.KDEWalletAvailable()) { @@ -23,7 +23,7 @@ index 8be5d81..3d05eea 100644 } } diff --git a/src/ui/main.qml b/src/ui/main.qml -index c30dd1f..e8b3bdd 100644 +index ef8ee86..dbe143e 100644 --- a/src/ui/main.qml +++ b/src/ui/main.qml @@ -34,13 +34,6 @@ KCM.GridViewKCM { @@ -39,7 +39,7 @@ index c30dd1f..e8b3bdd 100644 - } } ] - header: Kirigami.InlineMessage { + -- -2.43.2 +2.46.0 diff --git a/0002-Read-and-write-autologin-user-to-etc-sysconfig-displ.patch b/0002-Read-and-write-autologin-user-to-etc-sysconfig-displ.patch index 214a60d..9ec1be4 100644 --- a/0002-Read-and-write-autologin-user-to-etc-sysconfig-displ.patch +++ b/0002-Read-and-write-autologin-user-to-etc-sysconfig-displ.patch @@ -1,4 +1,4 @@ -From faaff11bc4aaddc471bc3ee2d0a79d72f4a0cda7 Mon Sep 17 00:00:00 2001 +From 957d6a8d4dc546e64d39c7d49599e67ab4be6b38 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Tue, 19 Jan 2021 20:45:33 +0100 Subject: [PATCH] Read and write autologin user to @@ -11,10 +11,10 @@ That's where SDDM reads from. 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/sddmauthhelper.cpp b/sddmauthhelper.cpp -index dea06ef..8f453a8 100644 +index 2a38b40..0702465 100644 --- a/sddmauthhelper.cpp +++ b/sddmauthhelper.cpp -@@ -17,6 +17,8 @@ +@@ -19,6 +19,8 @@ #include #include #include @@ -22,8 +22,8 @@ index dea06ef..8f453a8 100644 +#include #include - #include -@@ -281,6 +283,34 @@ ActionReply SddmAuthHelper::save(const QVariantMap &args) + #include +@@ -310,6 +312,34 @@ ActionReply SddmAuthHelper::save(const QVariantMap &args) QString groupName = configFields[1]; QString keyName = configFields[2]; @@ -59,7 +59,7 @@ index dea06ef..8f453a8 100644 // hierarchically SDDM prefers "etc/sddm.conf" to "/etc/sddm.conf.d/some_file.conf" diff --git a/src/sddmsettingsbase.cpp b/src/sddmsettingsbase.cpp -index a928823..74ab3c9 100644 +index e6e4af0..cbf3b3d 100644 --- a/src/sddmsettingsbase.cpp +++ b/src/sddmsettingsbase.cpp @@ -9,6 +9,7 @@ @@ -74,18 +74,18 @@ index a928823..74ab3c9 100644 QString SddmSettingsBase::defaultUser() const { -- return m_defaultConfig->group("AutoLogin").readEntry("User"); +- return m_defaultConfig->group(QStringLiteral("AutoLogin")).readEntry("User"); + QSettings sysconfSettings(QStringLiteral("/etc/sysconfig/displaymanager"), QSettings::IniFormat); + return sysconfSettings.value(QStringLiteral("DISPLAYMANAGER_AUTOLOGIN")).toString(); } QString SddmSettingsBase::defaultSession() const { -- return m_defaultConfig->group("AutoLogin").readEntry("Session"); -+ return m_defaultConfig->group("AutoLogin").readEntry("Session", "default.desktop"); +- return m_defaultConfig->group(QStringLiteral("AutoLogin")).readEntry("Session"); ++ return m_defaultConfig->group(QStringLiteral("AutoLogin")).readEntry("Session", "default.desktop"); } bool SddmSettingsBase::defaultRelogin() const -- -2.41.0 +2.45.2 diff --git a/sddm-kcm-6.1.5.tar.xz b/sddm-kcm-6.1.5.tar.xz deleted file mode 100644 index 6fd357a..0000000 --- a/sddm-kcm-6.1.5.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:009235174d372079ee3aadf51e0bd7da1a382d1852ae65b0b96710b226698e9c -size 98940 diff --git a/sddm-kcm-6.1.5.tar.xz.sig b/sddm-kcm-6.1.5.tar.xz.sig deleted file mode 100644 index e237490..0000000 --- a/sddm-kcm-6.1.5.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEE4KPrIC+OV1KOE+cv11dEg7tXsY0FAmbgCSMACgkQ11dEg7tX -sY3g8BAAkQ0PPxo/mh/vgtgy4r4RfgFPhsPagUXbh0SKuLmlNNlwBlxwXqxoYfbh -ORqTpZyjX0dw+kLXMsjkAGcQy6yZlJXQXaOkGZDAJxN5B2rXm4yMlYho9CI0Xnjd -YF8TS3TQeSAOZ1iwjK3oxpw99Dc+7aUuXprCbYqwwNDrgNpIrpU4Gyj40UTAK39M -vPy6x8VcDLNuROKlHy31niKWGf8saLbeNJf74RPOJDbotGiFYj9T7pSCkX3+/txY -2/C/kcbI1XP4VPFFOafvSZd18yAEKqSHD8N9fwQ0dQxQLD/z3714OZPZ5TSn4+mc -AnMn9fSTBIrkHAe9bs/niAYnH48i3Pgurdxnu9kbXWaNOKY1T4l8xPR/kEvqQRX4 -m7CjpH9Z2CZkoNdasIOhP9tfrAUWo2hBIbMTv2PfhbwGZvfisRxZWbnIDYMPm16k -Q/ktQ4YiHC3zfSAFs2JgBnUZMbkso6d4Wv9IQtrzi9JwciEnL5aWNT4Y2Qg6hZYO -778vGhgifxDtx+4qRdskHHTRND1CnMY05jdCOkYLKUBvnoAiPTywmxuvUTko0fUe -DPkU568eksz8aIFUyMKkGKLkxrcaIu5hL3HPMcGlrMtH+JS2UE++it14A6c1zfft -HwIWn/3Hb09vxMY+EQqwgbrxGem6Ld5SYD7zEAjtNyYvZBdtrzU= -=Ktp0 ------END PGP SIGNATURE----- diff --git a/sddm-kcm-6.2.0.tar.xz b/sddm-kcm-6.2.0.tar.xz new file mode 100644 index 0000000..c13ca77 --- /dev/null +++ b/sddm-kcm-6.2.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d5c6cc98c190789d1b886dba8140396588ead6125341cf5231adf95a6368851f +size 99980 diff --git a/sddm-kcm-6.2.0.tar.xz.sig b/sddm-kcm-6.2.0.tar.xz.sig new file mode 100644 index 0000000..623f687 --- /dev/null +++ b/sddm-kcm-6.2.0.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEE4KPrIC+OV1KOE+cv11dEg7tXsY0FAmb+kLQACgkQ11dEg7tX +sY3cQg//WxqhpaD/UgzCCMz6JwH5nByu2y/HLYzS+e6evC/AhJj5w/fpphg6W7Do +AuJvDarYoWUW9KWaMHNWlArC5LNsxSpdhjTo0LaL+TDAQUwvWCeJV9Jj1BActmhC +MI0Q70aurqVklBE0fLan74FNXCdjKNig7uh4+Z8CeJPPgc7H4I9Ek7g0AWvdz6FG +rDhpOViGKQaLNvvoqGNLn3V9+p7Hz1m0VCs02s+ER6wYMwBeWcUAmdxP4pbvoVt+ +M7HSetLfTtXrP/atwDR01q0+x8SkNMNX1+DXXTCqO+X2mgFs4Fiz5Kyh4/rY5vIm +f+owHkhWtSl98uYW+Gdgx+IGD8SWtV1993l2r9EzcSQG3w44u4a+snEuk5m2f9dq +hKOSlnUmLZh8blM3yCmfzV87TvqQafbzpyDTT8lCEeptG6+jzEs3gQ4tDE58BDsQ ++ywkVLPr+f6UHQY6/PXB5wlzPrznftpp8G9kvKMXpckP0YlyBR77Y5xZj6ztZwjY +I09V5x3/ZKVoY604XmuoS0oK05sSlgjzr9pCSWgo32Yi+3R63+UfjK4LVj7JoPOx +zNdxHtJKFcYa8rXAtLxGQ/I5saqsWnxJyvJKKfUTVGCEi4Lka/NR4h+l/uxMtAZZ +0p30BvPyYtSvhvuKLoyn2x58zO8phGgNkx+1ulR+jsnFDrnGUU8= +=H/Qh +-----END PGP SIGNATURE----- diff --git a/sddm-kcm6.changes b/sddm-kcm6.changes index 700391b..f3a7a78 100644 --- a/sddm-kcm6.changes +++ b/sddm-kcm6.changes @@ -1,3 +1,36 @@ +------------------------------------------------------------------- +Sat Oct 5 10:44:41 UTC 2024 - Fabian Vogt + +- Update to 6.2.0: + * New bugfix release + * For more details see https://kde.org/announcements/plasma/6/6.2.0 +- Changes since 6.1.90: + * update version for new release + * Drop unused Qt5Compat import + +------------------------------------------------------------------- +Tue Sep 17 14:55:01 UTC 2024 - Fabian Vogt + +- Update to 6.1.90: + * New feature release + * For more details see https://kde.org/announcements/plasma/6/6.1.90 +- Changes since 6.1.5: + * update version for new release + * Port everything to Kirigami.Dialog + * Adopt card style for wallpaper changer dialog too + * Clean up preview dialog QML code a bit + * Put the preview image in a card + * Don't unnecessarily set sourceSize on preview image (kde#492950) + * Fix needssave state management (kde#490937) + * Move to modern KDE_COMPILERSETTINGS_LEVEL + * Use file descriptor to install theme + * Fix visual window artifact + * Port header InlineMessage to frameless style + * update version for new release +- Rebase patches: + * 0001-Remove-some-features-with-questionable-security.patch + * 0002-Read-and-write-autologin-user-to-etc-sysconfig-displ.patch + ------------------------------------------------------------------- Tue Sep 10 14:55:32 UTC 2024 - Fabian Vogt diff --git a/sddm-kcm6.spec b/sddm-kcm6.spec index bb12b4a..3ec3d1a 100644 --- a/sddm-kcm6.spec +++ b/sddm-kcm6.spec @@ -16,21 +16,21 @@ # -%define kf6_version 6.2.0 -%define qt6_version 6.6.0 +%define kf6_version 6.5.0 +%define qt6_version 6.7.0 %define rname sddm-kcm %bcond_without released Name: sddm-kcm6 -Version: 6.1.5 +Version: 6.2.0 Release: 0 Summary: A sddm control module for KDE License: GPL-2.0-only URL: https://projects.kde.org/projects/kdereview/sddm-kcm/repository -Source: https://download.kde.org/stable/plasma/%{version}/%{rname}-%{version}.tar.xz +Source: %{rname}-%{version}.tar.xz %if %{with released} -Source1: https://download.kde.org/stable/plasma/%{version}/%{rname}-%{version}.tar.xz.sig +Source1: %{rname}-%{version}.tar.xz.sig Source2: plasma.keyring %endif # PATCH-FIX-OPENSUSE