From f2e98ec029a9f73d282018b2d394480215e1184a8a54a2a29508b190dc735235 Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Thu, 4 Feb 2021 12:48:29 +0000 Subject: [PATCH] 20.12.2 release OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kdeconnect-kde?expand=0&rev=30 --- ...Don-t-escape-notification-title-text.patch | 41 ++++++++++++++++++ applications.keyring | Bin 0 -> 6936 bytes kdeconnect-kde-20.12.1.tar.xz | 3 -- kdeconnect-kde-20.12.1.tar.xz.sig | 11 ----- kdeconnect-kde-20.12.2.tar.xz | 3 ++ kdeconnect-kde-20.12.2.tar.xz.sig | 16 +++++++ kdeconnect-kde.changes | 14 ++++++ kdeconnect-kde.spec | 4 +- 8 files changed, 77 insertions(+), 15 deletions(-) create mode 100644 0001-Don-t-escape-notification-title-text.patch create mode 100644 applications.keyring delete mode 100644 kdeconnect-kde-20.12.1.tar.xz delete mode 100644 kdeconnect-kde-20.12.1.tar.xz.sig create mode 100644 kdeconnect-kde-20.12.2.tar.xz create mode 100644 kdeconnect-kde-20.12.2.tar.xz.sig diff --git a/0001-Don-t-escape-notification-title-text.patch b/0001-Don-t-escape-notification-title-text.patch new file mode 100644 index 0000000..5cc5828 --- /dev/null +++ b/0001-Don-t-escape-notification-title-text.patch @@ -0,0 +1,41 @@ +From 893ede696038ce52f0c9ada3999b0d40bbe04692 Mon Sep 17 00:00:00 2001 +From: Bharadwaj Raju +Date: Tue, 2 Feb 2021 12:54:16 +0000 +Subject: [PATCH] Don't escape notification title text + +Notifications don't support markup in title text, so escaping it causes +unintended HTML entities like & to show up instead of the actual +text. + + +(cherry picked from commit 26a8ca7fe98ab77079f836a7fed9e888c8d046a6) +--- + plugins/notifications/notification.cpp | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/plugins/notifications/notification.cpp b/plugins/notifications/notification.cpp +index e5206b9e..0baf0001 100644 +--- a/plugins/notifications/notification.cpp ++++ b/plugins/notifications/notification.cpp +@@ -88,15 +88,16 @@ void Notification::createKNotification(const NetworkPacket& np) + } + + QString escapedTitle = m_title.toHtmlEscaped(); ++ // notification title text does not have markup, but in some cases below it is used in body text so we escape it + QString escapedText = m_text.toHtmlEscaped(); + QString escapedTicker = m_ticker.toHtmlEscaped(); + + if (NotificationServerInfo::instance().supportedHints().testFlag(NotificationServerInfo::X_KDE_DISPLAY_APPNAME)) { +- m_notification->setTitle(escapedTitle); ++ m_notification->setTitle(m_title); + m_notification->setText(escapedText); + m_notification->setHint(QStringLiteral("x-kde-display-appname"), m_appName.toHtmlEscaped()); + } else { +- m_notification->setTitle(m_appName.toHtmlEscaped()); ++ m_notification->setTitle(m_appName); + + if (m_title.isEmpty() && m_text.isEmpty()) { + m_notification->setText(escapedTicker); +-- +2.30.0 + diff --git a/applications.keyring b/applications.keyring new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..9b6ab5c7fcff549a5c7c241e56901e15961ca2d85add060b3d44e0c17f90c88d GIT binary patch literal 6936 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 euV6i#6XT&(9ClDjfULTh(yxEzOw|D9H&tknAe literal 0 HcmV?d00001 diff --git a/kdeconnect-kde-20.12.1.tar.xz b/kdeconnect-kde-20.12.1.tar.xz deleted file mode 100644 index b41c654..0000000 --- a/kdeconnect-kde-20.12.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fc15b7dba854b5ccc0fbaf1f7accb2c60ef89f311925c89e0c76c5e653182160 -size 549772 diff --git a/kdeconnect-kde-20.12.1.tar.xz.sig b/kdeconnect-kde-20.12.1.tar.xz.sig deleted file mode 100644 index cb1fa58..0000000 --- a/kdeconnect-kde-20.12.1.tar.xz.sig +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEzBAABCgAdFiEE8jJ15L8Qr8HfaRSm29LOiT4tHIcFAl/zwfAACgkQ29LOiT4t -HIfAHQf/SKUURcO3fRiaG1lBYXYZ0YfipLNqFoicbK5Hwcn/5CBLsKIRr/rKMNHz -Airm1IVLygTNtdmp/h6mULOpHbFiOk5vYZv3ZxTgs0mXWG8G+N/VNRmkT0uDctQj -KoTkB0tcf0pg23EcAWz2NdrTIW1rjrhF8rDXYz+Mq7J7jcI8hlgEti7X3dGNO4BD -4Jo4PFOLbCEwCyTwcExdYb0ZAt8xi7FsX137kTfa76zc0ty9eVtPSLaB8qZsLqXV -N6jV2Eaf25OEHWw7qvMZYPHVQ9HGFspDCvKKsmI0qCWHOuvLbThWqejOkhQKrwnf -Xxzc8V3e4nT/jNISfS8QqwRMA4d7uQ== -=N353 ------END PGP SIGNATURE----- diff --git a/kdeconnect-kde-20.12.2.tar.xz b/kdeconnect-kde-20.12.2.tar.xz new file mode 100644 index 0000000..96b9a49 --- /dev/null +++ b/kdeconnect-kde-20.12.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:21ca118b9ca7c6107c2cbedc95778f6f0ea03411f3b8d9f815660511ec0a9d71 +size 550016 diff --git a/kdeconnect-kde-20.12.2.tar.xz.sig b/kdeconnect-kde-20.12.2.tar.xz.sig new file mode 100644 index 0000000..5164baa --- /dev/null +++ b/kdeconnect-kde-20.12.2.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmAYsOsACgkQu0YzUNbv +Me+ugQ//QGrJto8lBmVALH3SbGIEXCiOfSNP/0SITsJaz5dETQKluA0fC1v6G0gN +Sw8cRuHLqz55iIT0+uCjqPGjJkhnXxeJX1F0K8wJvFNmt/cYWLRgkDptH6WK4cxw +WA2SuMIj/2BYUIjQYvDFJrxTepSBWZwQX9yWo4rpiStuQxXZkXgYEnANFg5p0Apq +ptghPuXKr62yD8oJA/rc3J2RVPpvSf8RvbeP+eekyMqnIs6VfDKYfMgeJ4OXOu7m +JuUg0k9Z9mIM5bRyC6kKdWZw2gT+LuArLLGGTctlhR53TMPvBkKHOiKDYukYlLJw +CljTX5LQF/tNoUJsLUWWeQTEf4ycbzRW7Wd8Drq96hYFfQEz0ZKaAYOVyDFOIhhs +PB5YgK740WpDDWXPwuL9Nh2ukxYrVhlWEB04+mrBh2MW051/9NlQ236wm7cgGR24 +1aPi4pP+GbpKR8Cu6U0j/X65UsV2tPwjhATz/eY07bN2Ms+N5q/n4tk/9S66f/ti +Un5THlY+5Z8aBd4CcG8zR2vQaB2ADFdWo723DR0L1K1TSQ090ixxAfMwSJLE3Lsi +fX6muES+quUxRdaoG0yB4YWy/5+oH0gjRSUbzi4dYzIHHbFbmLfw6FvEHbxnHLr+ +aTFmq/m9shI1xBdQvLe9JQpRqz/peVTW4PaI6Ae7uA8OT06dnhA= +=EAwP +-----END PGP SIGNATURE----- diff --git a/kdeconnect-kde.changes b/kdeconnect-kde.changes index 56df427..5833495 100644 --- a/kdeconnect-kde.changes +++ b/kdeconnect-kde.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Wed Feb 3 08:28:23 UTC 2021 - Christophe Giboudeaux + +- Update to 20.12.2 + * New bugfix release + * For more details please see: + * https://kde.org/announcements/releases/2021-02-apps-update +- Changes since 20.12.1: + * Fix notifications in the KDE Connect plasmoid (kde#432337) + * UseHighDpiPixmaps in kdeconnectd and kdeconnect-indicator + * Remove OnlyShowIn from daemon desktop file +- Add upstream patch: + * 0001-Don-t-escape-notification-title-text.patch + ------------------------------------------------------------------- Tue Jan 5 12:25:20 UTC 2021 - Luca Beltrame diff --git a/kdeconnect-kde.spec b/kdeconnect-kde.spec index 12e31b7..ebfd1dd 100644 --- a/kdeconnect-kde.spec +++ b/kdeconnect-kde.spec @@ -20,7 +20,7 @@ # Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA) %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} Name: kdeconnect-kde -Version: 20.12.1 +Version: 20.12.2 Release: 0 Summary: Integration of Android with Linux desktops License: GPL-2.0-or-later @@ -32,6 +32,8 @@ Source1: https://download.kde.org/stable/release-service/%{version}/src/% %endif Source100: kdeconnect-kde.SuSEfirewall Source101: kdeconnect-kde-firewalld.xml +# PATCH-FIX-UPSTREAM +Patch0: 0001-Don-t-escape-notification-title-text.patch BuildRequires: cmake >= 3.0 BuildRequires: extra-cmake-modules BuildRequires: kf5-filesystem