Hello community, here is the log from the commit of package kalarmcal for openSUSE:Factory checked in at 2016-02-22 10:14:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kalarmcal (Old) and /work/SRC/openSUSE:Factory/.kalarmcal.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kalarmcal" Changes: -------- --- /work/SRC/openSUSE:Factory/kalarmcal/kalarmcal.changes 2016-01-23 01:05:58.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kalarmcal.new/kalarmcal.changes 2016-02-22 10:14:53.000000000 +0100 @@ -1,0 +2,9 @@ +Sat Feb 13 08:03:11 UTC 2016 - tittiatc...@gmail.com + +- Update to KDE Applications 15.12.2 + * KDE Applications 15.12.2 + * https://www.kde.org/announcements/announce-applications-15.12.2.php + * boo#966605 + + +------------------------------------------------------------------- Old: ---- kalarmcal-15.12.1.tar.xz New: ---- kalarmcal-15.12.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kalarmcal.spec ++++++ --- /var/tmp/diff_new_pack.5oVqAu/_old 2016-02-22 10:14:54.000000000 +0100 +++ /var/tmp/diff_new_pack.5oVqAu/_new 2016-02-22 10:14:54.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package kalarmcal # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: kalarmcal -Version: 15.12.1 +Version: 15.12.2 Release: 0 %define kf5_version 5.1.0 Summary: KDE PIM Library kalarmcal @@ -25,25 +25,25 @@ Group: System/GUI/KDE Url: http://www.kde.org Source: kalarmcal-%{version}.tar.xz +BuildRequires: akonadi-devel BuildRequires: boost-devel >= 1.34.0 BuildRequires: cyrus-sasl-devel BuildRequires: extra-cmake-modules >= 1.0.0 BuildRequires: gpgme-devel -BuildRequires: akonadi-devel BuildRequires: kcalcore-devel -BuildRequires: kholidays-devel -BuildRequires: kidentitymanagement-devel BuildRequires: kcmutils-devel >= %{kf5_version} BuildRequires: kcodecs-devel >= %{kf5_version} +BuildRequires: kcodecs-devel >= %{kf5_version} BuildRequires: kcompletion-devel >= %{kf5_version} BuildRequires: kconfig-devel >= %{kf5_version} BuildRequires: kcoreaddons-devel >= %{kf5_version} BuildRequires: kdelibs4support-devel >= %{kf5_version} BuildRequires: kdoctools-devel >= %{kf5_version} BuildRequires: kemoticons-devel >= %{kf5_version} -BuildRequires: kcodecs-devel >= %{kf5_version} BuildRequires: kf5-filesystem +BuildRequires: kholidays-devel BuildRequires: ki18n-devel >= %{kf5_version} +BuildRequires: kidentitymanagement-devel BuildRequires: kio-devel >= %{kf5_version} BuildRequires: kitemviews-devel >= %{kf5_version} BuildRequires: kparts-devel >= %{kf5_version} @@ -80,12 +80,12 @@ %package devel Summary: KDE PIM Libraries: Build Environment Group: Development/Libraries/KDE -Requires: libKF5AlarmCalendar5 = %{version} Requires: akonadi-devel >= %{version} +Requires: kcalcore-devel >= %{version} Requires: kdelibs4support-devel >= %{kf5_version} -Requires: kidentitymanagement-devel >= %{version} Requires: kholidays-devel >= %{version} -Requires: kcalcore-devel >= %{version} +Requires: kidentitymanagement-devel >= %{version} +Requires: libKF5AlarmCalendar5 = %{version} %description devel This package contains necessary include files and libraries needed ++++++ kalarmcal-15.12.1.tar.xz -> kalarmcal-15.12.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalarmcal-15.12.1/src/kaevent.cpp new/kalarmcal-15.12.2/src/kaevent.cpp --- old/kalarmcal-15.12.1/src/kaevent.cpp 2015-10-28 13:57:16.000000000 +0100 +++ new/kalarmcal-15.12.2/src/kaevent.cpp 2016-02-01 13:27:04.000000000 +0100 @@ -2,7 +2,7 @@ * kaevent.cpp - represents calendar events * This file is part of kalarmcal library, which provides access to KAlarm * calendar data. - * Copyright © 2001-2013 by David Jarvie <djar...@kde.org> + * Copyright © 2001-2016 by David Jarvie <djar...@kde.org> * * This library is free software; you can redistribute it and/or modify * it under the terms of the GNU Library General Public License as published @@ -944,8 +944,11 @@ case DEFERRED_REMINDER_ALARM: case DEFERRED_ALARM: mDeferral = (data.type == DEFERRED_REMINDER_ALARM) ? REMINDER_DEFERRAL : NORMAL_DEFERRAL; - mDeferralTime = dateTime; - if (!data.timedDeferral) { + if (data.timedDeferral) { + // Don't use start-of-day time for applying timed deferral alarm offset + mDeferralTime = data.alarm->hasStartOffset() ? data.alarm->startOffset().end(mNextMainDateTime.calendarKDateTime()) : data.alarm->time(); + } else { + mDeferralTime = dateTime; mDeferralTime.setDateOnly(true); } if (data.alarm->hasStartOffset()) {
