[neon/mobile/plasma-dialer/Neon/unstable] debian/patches: drop upstreamed patches
Carlos De Maine
null at kde.org
Mon Jun 19 01:47:49 BST 2023
Git commit 1c1c919d1f127a472db3f59544385392bb2239aa by Carlos De Maine.
Committed on 19/06/2023 at 00:47.
Pushed by carlosdem into branch 'Neon/unstable'.
drop upstreamed patches
D +0 -35 debian/patches/01_fix_notifications
D +0 -13 debian/patches/02_fix_kpeoplebackend
M +0 -2 debian/patches/series
https://invent.kde.org/neon/mobile/plasma-dialer/-/commit/1c1c919d1f127a472db3f59544385392bb2239aa
diff --git a/debian/patches/01_fix_notifications b/debian/patches/01_fix_notifications
deleted file mode 100644
index e6904bf..0000000
--- a/debian/patches/01_fix_notifications
+++ /dev/null
@@ -1,35 +0,0 @@
-diff --git a/kde-telephony-daemon/src/notification-manager.cpp b/kde-telephony-daemon/src/notification-manager.cpp
-index c5eef92d008338525ac3464eed9e2f13a9a256e1..0d5b89fdfd9c7cd9a6bf6d658e2953a61bb13264 100644
---- a/kde-telephony-daemon/src/notification-manager.cpp
-+++ b/kde-telephony-daemon/src/notification-manager.cpp
-@@ -160,8 +160,8 @@ void NotificationManager::openRingingNotification(const QString &deviceUni,
- // with swipe decision.
- _ringingNotification->setHint(QStringLiteral("category"), QStringLiteral("x-kde.incoming-call"));
- _ringingNotification->setActions(actions);
-- _ringingNotification->addContext(QStringLiteral("deviceUni"), deviceUni);
-- _ringingNotification->addContext(QStringLiteral("callUni"), callUni);
-+ _ringingNotification->setProperty("deviceUni", deviceUni);
-+ _ringingNotification->setProperty("callUni", callUni);
- connect(_ringingNotification.get(), QOverload<unsigned int>::of(&KNotification::activated), this, &NotificationManager::onNotificationAction);
- _ringingNotification->sendEvent();
- }
-@@ -298,17 +298,8 @@ void NotificationManager::stopHapticsFeedback()
- void NotificationManager::onNotificationAction(unsigned int action)
- {
- qDebug() << Q_FUNC_INFO << action;
-- QString deviceUni;
-- QString callUni;
-- KNotification::ContextList notificationContexts = _ringingNotification->contexts();
-- for (const auto &context : notificationContexts) {
-- if (context.first == QStringLiteral("deviceUni")) {
-- deviceUni = context.second;
-- }
-- if (context.first == QStringLiteral("callUni")) {
-- callUni = context.second;
-- }
-- }
-+ const QString deviceUni = _ringingNotification->property("deviceUni").toString();
-+ const QString callUni = _ringingNotification->property("callUni").toString();
- switch (action) {
- case 1:
- accept(deviceUni, callUni);
diff --git a/debian/patches/02_fix_kpeoplebackend b/debian/patches/02_fix_kpeoplebackend
deleted file mode 100644
index 3908535..0000000
--- a/debian/patches/02_fix_kpeoplebackend
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/kde-telephony-plugin-declarative/src/declarative-contact-utils.cpp b/kde-telephony-plugin-declarative/src/declarative-contact-utils.cpp
-index 519638311113cacba919710695d8014721d9531e..affb7b81529fb772bc66907119e55414fc851ad7 100644
---- a/kde-telephony-plugin-declarative/src/declarative-contact-utils.cpp
-+++ b/kde-telephony-plugin-declarative/src/declarative-contact-utils.cpp
-@@ -5,7 +5,7 @@
- #include "declarative-contact-utils.h"
-
- #include <KContacts/VCardConverter>
--#include <KPeople/KPeopleBackend/AbstractContact>
-+#include <KPeopleBackend/AbstractContact>
- #include <KPeople/PersonData>
-
- #include "callutilsinterface.h"
diff --git a/debian/patches/series b/debian/patches/series
index bdbee94..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +0,0 @@
-01_fix_notifications
-02_fix_kpeoplebackend
\ No newline at end of file
More information about the Neon-commits
mailing list