summaryrefslogtreecommitdiff
path: root/kde-apps/akonadi-calendar/files
diff options
context:
space:
mode:
Diffstat (limited to 'kde-apps/akonadi-calendar/files')
-rw-r--r--kde-apps/akonadi-calendar/files/akonadi-calendar-22.08.3-convert-event-start-time-to-local-tz.patch33
-rw-r--r--kde-apps/akonadi-calendar/files/akonadi-calendar-22.08.3-fix-hidpi-scaling.patch32
-rw-r--r--kde-apps/akonadi-calendar/files/akonadi-calendar-22.08.3-fix-kalendarac-crash.patch36
3 files changed, 0 insertions, 101 deletions
diff --git a/kde-apps/akonadi-calendar/files/akonadi-calendar-22.08.3-convert-event-start-time-to-local-tz.patch b/kde-apps/akonadi-calendar/files/akonadi-calendar-22.08.3-convert-event-start-time-to-local-tz.patch
deleted file mode 100644
index 4ede6334a029..000000000000
--- a/kde-apps/akonadi-calendar/files/akonadi-calendar-22.08.3-convert-event-start-time-to-local-tz.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From fdbd7e42b6707cf99db48f62d43ca104de632159 Mon Sep 17 00:00:00 2001
-From: Kishore Gopalakrishnan <kishore96@gmail.com>
-Date: Sun, 6 Nov 2022 13:03:22 +0530
-Subject: [PATCH] Convert event start time to user's local timezone
-
-Since we don't display the timezone of the event in the notification,
-this is required when the event is in a different timezone from the
-user's local one.
-
-BUG: 453805
-
-
-(cherry picked from commit 750200aa58e3a8c4073e6304a0e214c1c5beafb9)
----
- reminder-daemon/alarmnotification.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/reminder-daemon/alarmnotification.cpp b/reminder-daemon/alarmnotification.cpp
-index 6082e9a..27e53e2 100644
---- a/reminder-daemon/alarmnotification.cpp
-+++ b/reminder-daemon/alarmnotification.cpp
-@@ -30,7 +30,7 @@ AlarmNotification::~AlarmNotification()
-
- void AlarmNotification::send(KalendarAlarmClient *client, const KCalendarCore::Incidence::Ptr &incidence)
- {
-- const QDateTime startTime = m_occurrence.isValid() ? m_occurrence : incidence->dtStart();
-+ const QDateTime startTime = m_occurrence.isValid() ? m_occurrence.toLocalTime() : incidence->dtStart().toLocalTime();
- const bool notificationExists = m_notification;
- if (!notificationExists) {
- m_notification = new KNotification(QStringLiteral("alarm"));
---
-GitLab
-
diff --git a/kde-apps/akonadi-calendar/files/akonadi-calendar-22.08.3-fix-hidpi-scaling.patch b/kde-apps/akonadi-calendar/files/akonadi-calendar-22.08.3-fix-hidpi-scaling.patch
deleted file mode 100644
index 26698be849c4..000000000000
--- a/kde-apps/akonadi-calendar/files/akonadi-calendar-22.08.3-fix-hidpi-scaling.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From cb8e88e6b50a6edc399510b1a8d6307177f00bb7 Mon Sep 17 00:00:00 2001
-From: Moody Liu <mooodyhunter@outlook.com>
-Date: Fri, 14 Oct 2022 23:19:25 +0000
-Subject: [PATCH] kalendarac: set AA_EnableHighDpiScaling attribute before
- constructing QGuiApplication
-
----
- reminder-daemon/kalendaracmain.cpp | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/reminder-daemon/kalendaracmain.cpp b/reminder-daemon/kalendaracmain.cpp
-index 0566c7f..c0ae2be 100644
---- a/reminder-daemon/kalendaracmain.cpp
-+++ b/reminder-daemon/kalendaracmain.cpp
-@@ -12,10 +12,13 @@
-
- int main(int argc, char **argv)
- {
-+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-+ // set this attribute before contructing QGuiApplication
-+ QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
-+#endif
- QGuiApplication app(argc, argv);
- app.setQuitOnLastWindowClosed(false);
- #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-- QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
- app.setAttribute(Qt::AA_UseHighDpiPixmaps, true);
- #endif
-
---
-GitLab
-
diff --git a/kde-apps/akonadi-calendar/files/akonadi-calendar-22.08.3-fix-kalendarac-crash.patch b/kde-apps/akonadi-calendar/files/akonadi-calendar-22.08.3-fix-kalendarac-crash.patch
deleted file mode 100644
index 64801160d886..000000000000
--- a/kde-apps/akonadi-calendar/files/akonadi-calendar-22.08.3-fix-kalendarac-crash.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 9baa8ca070a73658bec0c5a9a1854e4ec73abd8a Mon Sep 17 00:00:00 2001
-From: Allen Winter <winter@kde.org>
-Date: Fri, 30 Dec 2022 09:29:02 -0500
-Subject: [PATCH] Ensure Akonadi IncidenceChanger doesn't try to show dialogs
-
-Since kalendarac is not a proper QApplication it can't
-show dialogs anyway. Else you'll see crashes with:
-"QWidget: Cannot create a QWidget without QApplication"
----
- reminder-daemon/kalendaralarmclient.cpp | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/reminder-daemon/kalendaralarmclient.cpp b/reminder-daemon/kalendaralarmclient.cpp
-index b726ac1..da3b050 100644
---- a/reminder-daemon/kalendaralarmclient.cpp
-+++ b/reminder-daemon/kalendaralarmclient.cpp
-@@ -6,6 +6,7 @@
- #include "calendarinterface.h"
- #include "logging.h"
-
-+#include <Akonadi/IncidenceChanger>
- #include <KIO/ApplicationLauncherJob>
-
- #include <KCheckableProxyModel>
-@@ -52,6 +53,8 @@ void KalendarAlarmClient::setupAkonadi()
- const QStringList mimeTypes{Event::eventMimeType(), Todo::todoMimeType()};
- mCalendar = Akonadi::ETMCalendar::Ptr(new Akonadi::ETMCalendar(mimeTypes));
- mCalendar->setObjectName(QStringLiteral("KalendarAC's calendar"));
-+ Akonadi::IncidenceChanger *changer = mCalendar->incidenceChanger();
-+ changer->setShowDialogsOnError(false);
- mETM = mCalendar->entityTreeModel();
-
- connect(&mCheckTimer, &QTimer::timeout, this, &KalendarAlarmClient::checkAlarms);
---
-GitLab
-