Accepting request 957899 from KDE:Extra
New package OBS-URL: https://build.opensuse.org/request/show/957899 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kalendar?expand=0&rev=1
This commit is contained in:
commit
26e06ed1c5
23
.gitattributes
vendored
Normal file
23
.gitattributes
vendored
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
## Default LFS
|
||||||
|
*.7z filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.bsp filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.bz2 filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.gem filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.gz filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.jar filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.lz filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.lzma filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.obscpio filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.oxt filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.pdf filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.png filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.rpm filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.tbz filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.tbz2 filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.tgz filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.ttf filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.txz filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.whl filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.xz filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.zip filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.zst filter=lfs diff=lfs merge=lfs -text
|
1
.gitignore
vendored
Normal file
1
.gitignore
vendored
Normal file
@ -0,0 +1 @@
|
|||||||
|
.osc
|
126
0001-Use-categorized-logging-in-the-reminder-daemon.patch
Normal file
126
0001-Use-categorized-logging-in-the-reminder-daemon.patch
Normal file
@ -0,0 +1,126 @@
|
|||||||
|
From f72b4c6fa652d2735cd81b942d58d05955ff49ba Mon Sep 17 00:00:00 2001
|
||||||
|
From: Volker Krause <vkrause@kde.org>
|
||||||
|
Date: Sun, 13 Feb 2022 11:53:32 +0100
|
||||||
|
Subject: [PATCH] Use categorized logging in the reminder daemon
|
||||||
|
|
||||||
|
This silences the rather verbose debug output by default.
|
||||||
|
---
|
||||||
|
kalendarac/CMakeLists.txt | 14 +++++++++++++-
|
||||||
|
kalendarac/kalendaralarmclient.cpp | 17 +++++++++--------
|
||||||
|
2 files changed, 22 insertions(+), 9 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/kalendarac/CMakeLists.txt b/kalendarac/CMakeLists.txt
|
||||||
|
index 8a0d960..f2bbcb6 100644
|
||||||
|
--- a/kalendarac/CMakeLists.txt
|
||||||
|
+++ b/kalendarac/CMakeLists.txt
|
||||||
|
@@ -30,6 +30,14 @@ target_link_libraries(kalendarac
|
||||||
|
Qt5::DBus
|
||||||
|
)
|
||||||
|
|
||||||
|
+ecm_qt_declare_logging_category(kalendarac
|
||||||
|
+ HEADER logging.h
|
||||||
|
+ IDENTIFIER Log
|
||||||
|
+ CATEGORY_NAME org.kde.kalendarac
|
||||||
|
+ DESCRIPTION "Reminder daemon"
|
||||||
|
+ EXPORT REMINDER_DAEMON
|
||||||
|
+)
|
||||||
|
+
|
||||||
|
if (COMPILE_WITH_UNITY_CMAKE_SUPPORT)
|
||||||
|
set_target_properties(kalendarac PROPERTIES UNITY_BUILD ON)
|
||||||
|
endif()
|
||||||
|
@@ -48,4 +56,8 @@ install(FILES kalendarac.notifyrc DESTINATION ${KNOTIFYRC_INSTALL_DIR})
|
||||||
|
set(SERV_EXEC ${KDE_INSTALL_FULL_BINDIR}/kalendarac)
|
||||||
|
configure_file(org.kde.kalendarac.service.in ${CMAKE_CURRENT_BINARY_DIR}/org.kde.kalendarac.service)
|
||||||
|
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.kalendarac.service DESTINATION ${KDE_INSTALL_FULL_DBUSSERVICEDIR})
|
||||||
|
-
|
||||||
|
+ecm_qt_install_logging_categories(
|
||||||
|
+ EXPORT REMINDER_DAEMON
|
||||||
|
+ FILE org_kde_kalendarac.categories
|
||||||
|
+ DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}
|
||||||
|
+)
|
||||||
|
diff --git a/kalendarac/kalendaralarmclient.cpp b/kalendarac/kalendaralarmclient.cpp
|
||||||
|
index 58ba6ae..4aae6ee 100644
|
||||||
|
--- a/kalendarac/kalendaralarmclient.cpp
|
||||||
|
+++ b/kalendarac/kalendaralarmclient.cpp
|
||||||
|
@@ -4,6 +4,7 @@
|
||||||
|
#include "kalendaralarmclient.h"
|
||||||
|
#include "alarmnotification.h"
|
||||||
|
#include "calendarinterface.h"
|
||||||
|
+#include "logging.h"
|
||||||
|
|
||||||
|
#include <akonadi-calendar_version.h>
|
||||||
|
|
||||||
|
@@ -82,7 +83,7 @@ void KalendarAlarmClient::deferredInit()
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
- qDebug() << "Performing delayed initialization.";
|
||||||
|
+ qCDebug(Log) << "Performing delayed initialization.";
|
||||||
|
|
||||||
|
KCheckableProxyModel *checkableModel = mCalendar->checkableProxyModel();
|
||||||
|
checkAllItems(checkableModel);
|
||||||
|
@@ -93,7 +94,7 @@ void KalendarAlarmClient::deferredInit()
|
||||||
|
|
||||||
|
void KalendarAlarmClient::restoreSuspendedFromConfig()
|
||||||
|
{
|
||||||
|
- qDebug() << "\nrestoreSuspendedFromConfig: Restore suspended alarms from config";
|
||||||
|
+ qCDebug(Log) << "Restore suspended alarms from config";
|
||||||
|
KConfigGroup suspendedGroup(KSharedConfig::openConfig(), "Suspended");
|
||||||
|
const auto suspendedAlarms = suspendedGroup.groupList();
|
||||||
|
|
||||||
|
@@ -103,7 +104,7 @@ void KalendarAlarmClient::restoreSuspendedFromConfig()
|
||||||
|
QString txt = suspendedAlarm.readEntry("Text");
|
||||||
|
QDateTime occurrence = suspendedAlarm.readEntry("Occurrence", QDateTime());
|
||||||
|
QDateTime remindAt = suspendedAlarm.readEntry("RemindAt", QDateTime());
|
||||||
|
- qDebug() << "restoreSuspendedFromConfig: Restoring alarm" << uid << "," << txt << "," << remindAt;
|
||||||
|
+ qCDebug(Log) << "restoreSuspendedFromConfig: Restoring alarm" << uid << "," << txt << "," << remindAt;
|
||||||
|
|
||||||
|
if (!uid.isEmpty() && remindAt.isValid()) {
|
||||||
|
addNotification(uid, txt, occurrence, remindAt);
|
||||||
|
@@ -113,7 +114,7 @@ void KalendarAlarmClient::restoreSuspendedFromConfig()
|
||||||
|
|
||||||
|
void KalendarAlarmClient::dismiss(AlarmNotification *notification)
|
||||||
|
{
|
||||||
|
- qDebug() << "Alarm" << notification->uid() << "dismissed";
|
||||||
|
+ qCDebug(Log) << "Alarm" << notification->uid() << "dismissed";
|
||||||
|
removeNotification(notification);
|
||||||
|
m_notifications.remove(notification->uid());
|
||||||
|
delete notification;
|
||||||
|
@@ -121,7 +122,7 @@ void KalendarAlarmClient::dismiss(AlarmNotification *notification)
|
||||||
|
|
||||||
|
void KalendarAlarmClient::suspend(AlarmNotification *notification)
|
||||||
|
{
|
||||||
|
- qDebug() << "Alarm " << notification->uid() << "suspended";
|
||||||
|
+ qCDebug(Log) << "Alarm " << notification->uid() << "suspended";
|
||||||
|
notification->setRemindAt(QDateTime(QDateTime::currentDateTime()).addSecs(5 * 60)); // 5 minutes is hardcoded in the suspend action text
|
||||||
|
storeNotification(notification);
|
||||||
|
}
|
||||||
|
@@ -196,7 +197,7 @@ void KalendarAlarmClient::addNotification(const QString &uid, const QString &tex
|
||||||
|
}
|
||||||
|
|
||||||
|
// we either have no notification for this event yet, or one that is scheduled for later and that should be replaced
|
||||||
|
- qDebug() << "Adding notification, uid:" << uid << "text:" << text << "remindTime:" << remindTime;
|
||||||
|
+ qCDebug(Log) << "Adding notification, uid:" << uid << "text:" << text << "remindTime:" << remindTime;
|
||||||
|
notification->setText(text);
|
||||||
|
notification->setOccurrence(occurrence);
|
||||||
|
notification->setRemindAt(remindTime);
|
||||||
|
@@ -230,14 +231,14 @@ void KalendarAlarmClient::checkAlarms()
|
||||||
|
// We do not want to miss any reminders, so don't perform check unless
|
||||||
|
// the collections are available and populated.
|
||||||
|
if (!collectionsAvailable()) {
|
||||||
|
- qDebug() << "Collections are not available; aborting check.";
|
||||||
|
+ qCDebug(Log) << "Collections are not available; aborting check.";
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const QDateTime from = mLastChecked.addSecs(1);
|
||||||
|
mLastChecked = QDateTime::currentDateTime();
|
||||||
|
|
||||||
|
- qDebug() << "Check:" << from.toString() << " -" << mLastChecked.toString();
|
||||||
|
+ qCDebug(Log) << "Check:" << from.toString() << " -" << mLastChecked.toString();
|
||||||
|
|
||||||
|
// look for new alarms
|
||||||
|
const Alarm::List alarms = mCalendar->alarms(from, mLastChecked, true /* exclude blocked alarms */);
|
||||||
|
--
|
||||||
|
2.33.1
|
||||||
|
|
3
kalendar-1.0.0.tar.xz
Normal file
3
kalendar-1.0.0.tar.xz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:ca4e840dc17a4e39111f5fb16bfcab29e34a10b9c840d22b81c52890f0c9fae0
|
||||||
|
size 242448
|
11
kalendar-1.0.0.tar.xz.sig
Normal file
11
kalendar-1.0.0.tar.xz.sig
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
-----BEGIN PGP SIGNATURE-----
|
||||||
|
|
||||||
|
iQEzBAABCAAdFiEE7aztfffHzUK5s6qcxDiQie5tsK8FAmIHyF0ACgkQxDiQie5t
|
||||||
|
sK+VlggAr3NFPnTeNGrwKETv+8BRmVIKOpFXNyiCDH+qgLwPTvqNCc9GRq3FkT4y
|
||||||
|
rEJTJXSoHDC1n8ov2kqXzway9UzqBUx3aoHIhKGB0x3wsHKdZURYxaDS0FgdpcS/
|
||||||
|
OqKLusoPOM1kBn2W5roSuylTF6e5YDsUYUh5xlip+JonRSCD37bGLOwJ8OgLF2gw
|
||||||
|
3ARJN572FhpW8GPH5hKfByRx0u179IqkYiX6aw1GMvyCTrd40cuQ1WGNOYY5BDx8
|
||||||
|
oxbqLBiYJLj+Y5EaApdB16zZ2VvZQnchMxiVL7V1jCGZGghzP6qNPwgrXKnP/EKk
|
||||||
|
CD9xyaaI7Mqwu8HIzadw3Ji3KKtz5A==
|
||||||
|
=VJF2
|
||||||
|
-----END PGP SIGNATURE-----
|
11
kalendar.changes
Normal file
11
kalendar.changes
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Sat Feb 26 18:06:39 UTC 2022 - Fabian Vogt <fabian@ritter-vogt.de>
|
||||||
|
|
||||||
|
- Update to 1.0.0
|
||||||
|
- Add patch to avoid excessive logging:
|
||||||
|
* 0001-Use-categorized-logging-in-the-reminder-daemon.patch
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Sat Oct 16 14:29:05 UTC 2021 - Fabian Vogt <fabian@ritter-vogt.de>
|
||||||
|
|
||||||
|
- Initial packaging
|
BIN
kalendar.keyring
Normal file
BIN
kalendar.keyring
Normal file
Binary file not shown.
106
kalendar.spec
Normal file
106
kalendar.spec
Normal file
@ -0,0 +1,106 @@
|
|||||||
|
#
|
||||||
|
# spec file for package kalendar
|
||||||
|
#
|
||||||
|
# Copyright (c) 2021 SUSE LLC
|
||||||
|
#
|
||||||
|
# All modifications and additions to the file contributed by third parties
|
||||||
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
|
# upon. The license for this file, and modifications and additions to the
|
||||||
|
# file, is the same license as for the pristine package itself (unless the
|
||||||
|
# license for the pristine package is not an Open Source License, in which
|
||||||
|
# case the license is the MIT License). An "Open Source License" is a
|
||||||
|
# license that conforms to the Open Source Definition (Version 1.9)
|
||||||
|
# published by the Open Source Initiative.
|
||||||
|
|
||||||
|
# Please submit bugfixes or comments via https://bugs.opensuse.org/
|
||||||
|
#
|
||||||
|
|
||||||
|
|
||||||
|
%define kf5_version 5.88.0
|
||||||
|
%bcond_without released
|
||||||
|
Name: kalendar
|
||||||
|
Version: 1.0.0
|
||||||
|
Release: 0
|
||||||
|
Summary: Calendar Application
|
||||||
|
License: GPL-3.0-only
|
||||||
|
URL: https://apps.kde.org/kalendar
|
||||||
|
Source: https://download.kde.org/stable/%{name}/%{name}-%{version}.tar.xz
|
||||||
|
%if %{with released}
|
||||||
|
Source1: https://download.kde.org/stable/%{name}/%{name}-%{version}.tar.xz.sig
|
||||||
|
Source2: kalendar.keyring
|
||||||
|
%endif
|
||||||
|
# PATCH-FIX-UPSTREAM
|
||||||
|
Patch1: 0001-Use-categorized-logging-in-the-reminder-daemon.patch
|
||||||
|
BuildRequires: extra-cmake-modules >= %{kf5_version}
|
||||||
|
BuildRequires: cmake(KF5Akonadi) >= 5.19.0
|
||||||
|
BuildRequires: cmake(KF5AkonadiContact) >= 5.19.0
|
||||||
|
BuildRequires: cmake(KF5CalendarCore)
|
||||||
|
BuildRequires: cmake(KF5CalendarSupport) >= 5.18
|
||||||
|
BuildRequires: cmake(KF5ConfigWidgets)
|
||||||
|
BuildRequires: cmake(KF5Contacts)
|
||||||
|
BuildRequires: cmake(KF5CoreAddons)
|
||||||
|
BuildRequires: cmake(KF5DBusAddons)
|
||||||
|
BuildRequires: cmake(KF5EventViews) >= 5.18.0
|
||||||
|
BuildRequires: cmake(KF5I18n)
|
||||||
|
BuildRequires: cmake(KF5IconThemes)
|
||||||
|
BuildRequires: cmake(KF5ItemModels)
|
||||||
|
BuildRequires: cmake(KF5Kirigami2)
|
||||||
|
BuildRequires: cmake(KF5Notifications)
|
||||||
|
BuildRequires: cmake(KF5QQC2DesktopStyle)
|
||||||
|
BuildRequires: cmake(KF5Service)
|
||||||
|
BuildRequires: cmake(KF5WindowSystem)
|
||||||
|
BuildRequires: cmake(KF5XmlGui)
|
||||||
|
BuildRequires: cmake(Qt5Core) >= 5.15.2
|
||||||
|
BuildRequires: cmake(Qt5DBus)
|
||||||
|
BuildRequires: cmake(Qt5Gui)
|
||||||
|
BuildRequires: cmake(Qt5Location)
|
||||||
|
BuildRequires: cmake(Qt5Qml)
|
||||||
|
BuildRequires: cmake(Qt5QuickControls2)
|
||||||
|
BuildRequires: cmake(Qt5Svg)
|
||||||
|
Requires: kdepim-addons
|
||||||
|
Requires: kdepim-runtime
|
||||||
|
# No automatic qmlimport requires for embedded resources :-/
|
||||||
|
Requires: kirigami2 >= %{kf5_version}
|
||||||
|
Requires: qt5qmlimport(QtGraphicalEffects.1)
|
||||||
|
Requires: qt5qmlimport(QtLocation.5)
|
||||||
|
Requires: qt5qmlimport(QtQuick.Dialogs.1)
|
||||||
|
Requires: qt5qmlimport(org.kde.kitemmodels.1)
|
||||||
|
# Got vendored for now
|
||||||
|
#Requires: qt5qmlimport(org.kde.kirigamiaddons.treeview.1)
|
||||||
|
|
||||||
|
%description
|
||||||
|
Calendar application using Akonadi to sync with external services (NextCloud, GMail, ...).
|
||||||
|
|
||||||
|
%lang_package
|
||||||
|
|
||||||
|
%prep
|
||||||
|
%autosetup -p1
|
||||||
|
|
||||||
|
%build
|
||||||
|
%cmake_kf5 -d build
|
||||||
|
%cmake_build
|
||||||
|
|
||||||
|
%install
|
||||||
|
%kf5_makeinstall -C build
|
||||||
|
%if %{with released}
|
||||||
|
%find_lang %{name} --with-man --all-name
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%files
|
||||||
|
%license LICENSES/*
|
||||||
|
%{_kf5_applicationsdir}/org.kde.kalendar.desktop
|
||||||
|
%{_kf5_appstreamdir}/org.kde.kalendar.appdata.xml
|
||||||
|
%{_kf5_bindir}/kalendar
|
||||||
|
%{_kf5_bindir}/kalendarac
|
||||||
|
%{_kf5_configdir}/autostart/org.kde.kalendarac.desktop
|
||||||
|
%{_kf5_debugdir}/kalendar.categories
|
||||||
|
%{_kf5_debugdir}/org_kde_kalendarac.categories
|
||||||
|
%{_kf5_iconsdir}/hicolor/scalable/apps/org.kde.kalendar.svg
|
||||||
|
%{_kf5_notifydir}/kalendarac.notifyrc
|
||||||
|
%{_kf5_sharedir}/dbus-1/services/org.kde.kalendarac.service
|
||||||
|
|
||||||
|
%if %{with released}
|
||||||
|
%files lang -f %{name}.lang
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%changelog
|
Loading…
Reference in New Issue
Block a user