From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id EE65A15800F for ; Sat, 28 Jan 2023 22:48:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DDD2BE08F0; Sat, 28 Jan 2023 22:48:47 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C4037E08F0 for ; Sat, 28 Jan 2023 22:48:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A4440340ECC for ; Sat, 28 Jan 2023 22:48:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0F42C893 for ; Sat, 28 Jan 2023 22:48:45 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1674945146.0c7ed55c2504ea2aae077eedddd170b1fa4ba696.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-apps/akonadi-calendar/files/, kde-apps/akonadi-calendar/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-apps/akonadi-calendar/akonadi-calendar-22.08.3-r1.ebuild kde-apps/akonadi-calendar/akonadi-calendar-22.12.1-r1.ebuild kde-apps/akonadi-calendar/files/akonadi-calendar-22.08.3-convert-event-start-time-to-local-tz.patch X-VCS-Directories: kde-apps/akonadi-calendar/ kde-apps/akonadi-calendar/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 0c7ed55c2504ea2aae077eedddd170b1fa4ba696 X-VCS-Branch: master Date: Sat, 28 Jan 2023 22:48:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 89dfb4d2-3b0c-40a6-9838-5464846367eb X-Archives-Hash: e6f7c1d85f88d14dcf61b438ff5f7f25 commit: 0c7ed55c2504ea2aae077eedddd170b1fa4ba696 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Jan 28 22:10:50 2023 +0000 Commit: Andreas Sturmlechner gentoo 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 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 +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 +