From b8ec9071f5d20d8518b02d0077428b2c9f88861b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 29 Jan 2023 02:53:24 +0000 Subject: gentoo auto-resync : 29:01:2023 - 02:53:24 --- kde-apps/akonadi-calendar/Manifest | 6 ++- .../akonadi-calendar-22.08.3-r1.ebuild | 53 ++++++++++++++++++++++ .../akonadi-calendar-22.12.1-r1.ebuild | 49 ++++++++++++++++++++ .../akonadi-calendar-22.12.1.ebuild | 47 ------------------- ...08.3-convert-event-start-time-to-local-tz.patch | 33 ++++++++++++++ ...konadi-calendar-22.08.3-fix-hidpi-scaling.patch | 32 +++++++++++++ ...adi-calendar-22.08.3-fix-kalendarac-crash.patch | 36 +++++++++++++++ 7 files changed, 208 insertions(+), 48 deletions(-) create mode 100644 kde-apps/akonadi-calendar/akonadi-calendar-22.08.3-r1.ebuild create mode 100644 kde-apps/akonadi-calendar/akonadi-calendar-22.12.1-r1.ebuild delete mode 100644 kde-apps/akonadi-calendar/akonadi-calendar-22.12.1.ebuild create mode 100644 kde-apps/akonadi-calendar/files/akonadi-calendar-22.08.3-convert-event-start-time-to-local-tz.patch create mode 100644 kde-apps/akonadi-calendar/files/akonadi-calendar-22.08.3-fix-hidpi-scaling.patch create mode 100644 kde-apps/akonadi-calendar/files/akonadi-calendar-22.08.3-fix-kalendarac-crash.patch (limited to 'kde-apps/akonadi-calendar') diff --git a/kde-apps/akonadi-calendar/Manifest b/kde-apps/akonadi-calendar/Manifest index cc09f47c332a..3a5ac27115eb 100644 --- a/kde-apps/akonadi-calendar/Manifest +++ b/kde-apps/akonadi-calendar/Manifest @@ -1,5 +1,9 @@ +AUX akonadi-calendar-22.08.3-convert-event-start-time-to-local-tz.patch 1329 BLAKE2B 5b9b79400c52fb3ad8e60eb169ed2240523c755db9104bf2f664794353630e8ce745fcf4dc2f569a571c8dc2025f80ff95386da6f7c5ffe6f2f529fa5a27646c SHA512 ca13afff8e21812bf5044b7d98f61d6524d660d60b6272405f279139b2718308401bf7db7f7f68db4691eac0c96f2dde03651496d88071835ad1b6254d4010be +AUX akonadi-calendar-22.08.3-fix-hidpi-scaling.patch 1059 BLAKE2B ee8032cb8224323b038d1d6ce9f2a0610334c7c1e36305462df6d51df57f8f28a91a8933367354cae86d7539049d227d665315b8882c60485b8b6c986c64eddf SHA512 4413b0f4e9538ccd40462b962d36ebfe1f780f36ab2f57b6c1359b25842592d9ba82e0dea2306fe4e7d26255f71ed1b2551480c1e7a94aa1618ce9ea67036f8f +AUX akonadi-calendar-22.08.3-fix-kalendarac-crash.patch 1425 BLAKE2B cc4cb85ae85fc87908068b69f153dd385544da8d18facf04376c897c473db138c05dcef2125e79825ae0f072d88facfcd2a656e1108272f3afe99bb830a48c2b SHA512 d8a36eb4bda36c33181968af31379d6250896b2f58806b1860f030ab8e60f68f22d68e0de7fc5019ec4d70a5ba014c2553a86fb92f2a0af4d056469247958171 DIST akonadi-calendar-22.08.3.tar.xz 395312 BLAKE2B 0d28e8435014a83625d59ac73137533b87305143a4ba720741bb8374c6cac30ac8af504d7cbe132b7b9e567e7f173ad48f78f1f02d81e6a3356837e0cd0299e2 SHA512 d708a2ebc1ba76115725eeed18685e0cbd0715d730468eff9d9017d35658bb4a264d52b0b083e47fdb790cbad552be4fdac6d505981f7a34acd29eee1576c502 DIST akonadi-calendar-22.12.1.tar.xz 410000 BLAKE2B a468cc1e2156701a462bf6863119dc46dafd24dbeb813b1ad9bcec5666394635c229067440ac3af46c4c3a9e83096b49d76bcd7551765586d68b5bcb2b7086ea SHA512 3ecbbe45184e355292c444c7cacabe1cd525df4275279ac40a8084491cb8b0c60d860f8370d0cbf146fbe0a429da5a4f7fcf0d9013f60a786c2b1525431148fe +EBUILD akonadi-calendar-22.08.3-r1.ebuild 1457 BLAKE2B fa80f6af5479d07eb0fce5f4430ea0cb7f76a0488538484bad166569919c75e29062b7cf22cb27fe8d7ecc0c792ca0b2df7391aa06c724b958f496ef1c86446e SHA512 0330e51989a13ff1cb4e40e837e8e5d2a67dd82dc86a06143f0cef4bb799ffe307389d70e8f5740e425c4d834088e8de3ad905a1f709c143237b9c6acc58e0ea EBUILD akonadi-calendar-22.08.3.ebuild 1287 BLAKE2B 03fb6b740224bb6ddd8029069f000844c6d6e785cf543cd42cd15e25c313ebcc9c42bc1edcd2893afa683fea30055dfa420d19b7796e258350efb1a64c71778d SHA512 171776fc1217bb97d8a98237b4b8cc0dd3a64e328f1d18b6ea7c2e725059216177b6c90b3a6fa42c16024f70209185721ba30ec51765ebf914d2e9a1bd705be8 -EBUILD akonadi-calendar-22.12.1.ebuild 1291 BLAKE2B 859fb7e677dcbeac782eabda5b6e65477b43c6b99e559413a9c1432c3ccc36ed9e2852faf1278d4f986c6fea438f6b8fd6b37152309c5640b26f8dc24415503e SHA512 028dc228fb2e8f55cc08a8461054ea6a9a8c673f8b3af3cf2513cf990466fbba6cb101344107d23006b0cc0162450b79d5da0fd611c00780a5a4092ed3190d77 +EBUILD akonadi-calendar-22.12.1-r1.ebuild 1375 BLAKE2B d2f3c5445d428da81cf2febaf7537f01441c0d312fbf4623d8104771c0ae809f2ee49e1bce72c0df3363072de2f30f8518d879ede868556e737d2a6fd42affe7 SHA512 a3efeb58b56760b0e331451520c2cc3690a374341ad68920a712e27427836ad8320ca882f9c6d02dc357f063720948469d8e55de1df7067a74b33bb775874de0 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6 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..4880c2331795 --- /dev/null +++ b/kde-apps/akonadi-calendar/akonadi-calendar-22.08.3-r1.ebuild @@ -0,0 +1,53 @@ +# 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}-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/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/akonadi-calendar-22.12.1.ebuild b/kde-apps/akonadi-calendar/akonadi-calendar-22.12.1.ebuild deleted file mode 100644 index f2c69b26b283..000000000000 --- a/kde-apps/akonadi-calendar/akonadi-calendar-22.12.1.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# 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}" 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 + 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 +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 +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 + #include + + #include +@@ -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 + -- cgit v1.2.3