* [gentoo-commits] repo/gentoo:master commit in: kde-apps/akonadi-calendar/files/, kde-apps/akonadi-calendar/
@ 2023-01-28 22:48 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2023-01-28 22:48 UTC (permalink / raw
To: gentoo-commits
commit: 0c7ed55c2504ea2aae077eedddd170b1fa4ba696
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 28 22:10:50 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jan 28 22:32:26 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c7ed55c
kde-apps/akonadi-calendar: Convert event start time to user's local tz
Upstream commit fdbd7e42b6707cf99db48f62d43ca104de632159
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=453805
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../akonadi-calendar-22.08.3-r1.ebuild | 49 ++++++++++++++++++++++
.../akonadi-calendar-22.12.1-r1.ebuild | 49 ++++++++++++++++++++++
...08.3-convert-event-start-time-to-local-tz.patch | 33 +++++++++++++++
3 files changed, 131 insertions(+)
diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-22.08.3-r1.ebuild b/kde-apps/akonadi-calendar/akonadi-calendar-22.08.3-r1.ebuild
new file mode 100644
index 000000000000..d5f48f842b30
--- /dev/null
+++ b/kde-apps/akonadi-calendar/akonadi-calendar-22.08.3-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.96.0
+QTMIN=5.15.5
+inherit ecm gear.kde.org
+
+DESCRIPTION="Library for akonadi calendar integration"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RESTRICT="test"
+
+DEPEND="
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=kde-apps/akonadi-${PVCUT}:5
+ >=kde-apps/akonadi-contacts-${PVCUT}:5
+ >=kde-apps/akonadi-mime-${PVCUT}:5
+ >=kde-apps/kcalutils-${PVCUT}:5
+ >=kde-apps/kidentitymanagement-${PVCUT}:5
+ >=kde-apps/kmailtransport-${PVCUT}:5
+ >=kde-apps/kmime-${PVCUT}:5
+ >=kde-frameworks/kcalendarcore-${KFMIN}:5
+ >=kde-frameworks/kcodecs-${KFMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/kdbusaddons-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kiconthemes-${KFMIN}:5
+ >=kde-frameworks/kio-${KFMIN}:5
+ >=kde-frameworks/kitemmodels-${KFMIN}:5
+ >=kde-frameworks/kjobwidgets-${KFMIN}:5
+ >=kde-frameworks/knotifications-${KFMIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+ >=kde-frameworks/kxmlgui-${KFMIN}:5
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-convert-event-start-time-to-local-tz.patch" )
diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-22.12.1-r1.ebuild b/kde-apps/akonadi-calendar/akonadi-calendar-22.12.1-r1.ebuild
new file mode 100644
index 000000000000..dd68fabee9f3
--- /dev/null
+++ b/kde-apps/akonadi-calendar/akonadi-calendar-22.12.1-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.101.0
+QTMIN=5.15.5
+inherit ecm gear.kde.org
+
+DESCRIPTION="Library for akonadi calendar integration"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RESTRICT="test"
+
+DEPEND="
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=kde-apps/akonadi-${PVCUT}:5
+ >=kde-apps/akonadi-contacts-${PVCUT}:5
+ >=kde-apps/akonadi-mime-${PVCUT}:5
+ >=kde-apps/kcalutils-${PVCUT}:5
+ >=kde-apps/kidentitymanagement-${PVCUT}:5
+ >=kde-apps/kmailtransport-${PVCUT}:5
+ >=kde-apps/kmime-${PVCUT}:5
+ >=kde-frameworks/kcalendarcore-${KFMIN}:5
+ >=kde-frameworks/kcodecs-${KFMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/kdbusaddons-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kiconthemes-${KFMIN}:5
+ >=kde-frameworks/kio-${KFMIN}:5
+ >=kde-frameworks/kitemmodels-${KFMIN}:5
+ >=kde-frameworks/kjobwidgets-${KFMIN}:5
+ >=kde-frameworks/knotifications-${KFMIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+ >=kde-frameworks/kxmlgui-${KFMIN}:5
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-22.08.3-convert-event-start-time-to-local-tz.patch" )
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
new file mode 100644
index 000000000000..4ede6334a029
--- /dev/null
+++ b/kde-apps/akonadi-calendar/files/akonadi-calendar-22.08.3-convert-event-start-time-to-local-tz.patch
@@ -0,0 +1,33 @@
+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
+
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-apps/akonadi-calendar/files/, kde-apps/akonadi-calendar/
@ 2023-01-28 22:48 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2023-01-28 22:48 UTC (permalink / raw
To: gentoo-commits
commit: 7530e75c45ce9caa4e5cfd2722f797af4c90adda
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 28 22:29:06 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jan 28 22:32:26 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7530e75c
kde-apps/akonadi-calendar: Fix hidpi scaling, kalendarac crashes
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=453676
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=463222
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../akonadi-calendar-22.08.3-r1.ebuild | 6 +++-
...konadi-calendar-22.08.3-fix-hidpi-scaling.patch | 32 +++++++++++++++++++
...adi-calendar-22.08.3-fix-kalendarac-crash.patch | 36 ++++++++++++++++++++++
3 files changed, 73 insertions(+), 1 deletion(-)
diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-22.08.3-r1.ebuild b/kde-apps/akonadi-calendar/akonadi-calendar-22.08.3-r1.ebuild
index d5f48f842b30..4880c2331795 100644
--- a/kde-apps/akonadi-calendar/akonadi-calendar-22.08.3-r1.ebuild
+++ b/kde-apps/akonadi-calendar/akonadi-calendar-22.08.3-r1.ebuild
@@ -46,4 +46,8 @@ DEPEND="
"
RDEPEND="${DEPEND}"
-PATCHES=( "${FILESDIR}/${P}-convert-event-start-time-to-local-tz.patch" )
+PATCHES=(
+ "${FILESDIR}/${P}-fix-hidpi-scaling.patch"
+ "${FILESDIR}/${P}-fix-kalendarac-crash.patch"
+ "${FILESDIR}/${P}-convert-event-start-time-to-local-tz.patch"
+)
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
new file mode 100644
index 000000000000..26698be849c4
--- /dev/null
+++ b/kde-apps/akonadi-calendar/files/akonadi-calendar-22.08.3-fix-hidpi-scaling.patch
@@ -0,0 +1,32 @@
+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
new file mode 100644
index 000000000000..64801160d886
--- /dev/null
+++ b/kde-apps/akonadi-calendar/files/akonadi-calendar-22.08.3-fix-kalendarac-crash.patch
@@ -0,0 +1,36 @@
+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
+
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-01-28 22:48 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-01-28 22:48 [gentoo-commits] repo/gentoo:master commit in: kde-apps/akonadi-calendar/files/, kde-apps/akonadi-calendar/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2023-01-28 22:48 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox