diff --git a/0001-Don-t-escape-notification-title-text.patch b/0001-Don-t-escape-notification-title-text.patch deleted file mode 100644 index 5cc5828..0000000 --- a/0001-Don-t-escape-notification-title-text.patch +++ /dev/null @@ -1,41 +0,0 @@ -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/kdeconnect-kde-20.12.2.tar.xz b/kdeconnect-kde-20.12.2.tar.xz deleted file mode 100644 index 96b9a49..0000000 --- a/kdeconnect-kde-20.12.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -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 deleted file mode 100644 index 5164baa..0000000 --- a/kdeconnect-kde-20.12.2.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------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-20.12.3.tar.xz b/kdeconnect-kde-20.12.3.tar.xz new file mode 100644 index 0000000..cc1f29a --- /dev/null +++ b/kdeconnect-kde-20.12.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0198a5de49b168485f67e47b0f01f36fef78a3f8be796e8876f3cb6c819608a8 +size 551780 diff --git a/kdeconnect-kde-20.12.3.tar.xz.sig b/kdeconnect-kde-20.12.3.tar.xz.sig new file mode 100644 index 0000000..fa9d8eb --- /dev/null +++ b/kdeconnect-kde-20.12.3.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmA9kEEACgkQu0YzUNbv +Me9lKBAAgCSrVZpPX90dewRZA1i3EP6eXphtcfws1AnFnUEWAQRm25tVHNLEXeIr +hBtfwo1IIvwVJTMM3iizMVVsRhVyy99qiAGKFI+t2rQbrmG4QUKXJJQ45P2iM5yP +j9mRIHTpZQCXa1U+CnI0+aGesdxaBdgYDiUmBfunkj+XhfOld0lTluTjawbgYReO +gLGCo2KsBXPzXz926HobVnmcBUkKYAb6COketC+SwSf8Ws1WzUmKzrpLfBVH799I +Ebo37JtO2cG6RzLaG/9Z8rq8AEECM0c4deJWAQnx6CPl0H2Zs5CJznlM+OYET2uE +UHrNgM44LcQ7PmUCstDMUUJoEmUSw5e79pvSLNQJTiiRL0LvzBfenIByxqVyz6GO +zB9hB/ZPM+BJf7TE4doqpHLeyQ8WIwnKUe9ddTmDpzD4VwnS4sGenrB4VtIEcWhh +tVGxh+IuP6rk4G/fmJd3tQeeqFjWRYnGFFwGSFGGXw9ky6/XWLSIiXoHLd+/FlAq +Ur+buNEJwb8N97SRC4ivHIlYJlDP902R4cdc3/aDduE7clAfdeG8wC41WvLKeIuq +fB0jI+LLHOu7D9Q0sG34BaSB7hWhEetqp+wKkyODkmMo9Lkki9DJ9WjIhhZvpSSe +3zWVWXDRLN9eHU5oJGm1GXEFntOEf5nuCE29TWW9+e5Qsat9yYQ= +=pywc +-----END PGP SIGNATURE----- diff --git a/kdeconnect-kde.changes b/kdeconnect-kde.changes index 5833495..2a59e01 100644 --- a/kdeconnect-kde.changes +++ b/kdeconnect-kde.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Thu Mar 4 06:10:05 UTC 2021 - Luca Beltrame + +- Update to 20.12.3 + * New bugfix release + * For more details please see: + * https://kde.org/announcements/releases/2021-03-apps-update +- Changes since 20.12.2: + * Don't escape notification title text +- Dropped patch, now upstream: + * 0001-Don-t-escape-notification-title-text.patch + ------------------------------------------------------------------- Wed Feb 3 08:28:23 UTC 2021 - Christophe Giboudeaux diff --git a/kdeconnect-kde.spec b/kdeconnect-kde.spec index a7c3bbe..e82f8d8 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.2 +Version: 20.12.3 Release: 0 Summary: Integration of Android with Linux desktops License: GPL-2.0-or-later @@ -33,8 +33,6 @@ Source2: applications.keyring %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