Hello community, here is the log from the commit of package kdepim for openSUSE:Factory checked in at 2016-07-21 07:45:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdepim (Old) and /work/SRC/openSUSE:Factory/.kdepim.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdepim" Changes: -------- --- /work/SRC/openSUSE:Factory/kdepim/kdepim.changes 2016-06-20 10:59:27.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdepim.new/kdepim.changes 2016-07-21 07:45:37.000000000 +0200 @@ -1,0 +2,14 @@ +Thu Jul 7 23:47:55 UTC 2016 - [email protected] + +- Update to KDE Applications 16.04.3 + * KDE Applications 16.04.3 + * https://www.kde.org/announcements/announce-applications-16.04.3.php + + +------------------------------------------------------------------- +Thu Jun 30 16:29:19 UTC 2016 - [email protected] + +- Add korgac-autostart-default.patch to prevent korgac from + starting on the first login of a new user. + +------------------------------------------------------------------- Old: ---- kdepim-16.04.2.tar.xz New: ---- kdepim-16.04.3.tar.xz korgac-autostart-default.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepim.spec ++++++ --- /var/tmp/diff_new_pack.edE92a/_old 2016-07-21 07:45:38.000000000 +0200 +++ /var/tmp/diff_new_pack.edE92a/_new 2016-07-21 07:45:38.000000000 +0200 @@ -55,7 +55,7 @@ %{nil} Name: kdepim -Version: 16.04.2 +Version: 16.04.3 Release: 0 Summary: Base package of kdepim License: GPL-2.0+ and LGPL-2.1+ @@ -142,6 +142,8 @@ BuildRequires: pkgconfig(Qt5XmlPatterns) >= 5.2.0 Requires: akonadi-search Requires: akonadi_resources = %{version} +# PATCH-FIX-OPENSUSE korgac-autostart-default.patch [email protected] -- Change korgac autostart default +Patch1: korgac-autostart-default.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} > 1320 Obsoletes: kdepim4 < %{version} @@ -156,6 +158,7 @@ %prep %setup -q -n kdepim-%{version} +%patch1 -p1 %build %cmake_kf5 -d build -- -DBUILD_TESTING=ON -DKDEPIM_NO_TEXTTOSPEECH=TRUE ++++++ kdepim-16.04.2.tar.xz -> kdepim-16.04.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-16.04.2/CMakeLists.txt new/kdepim-16.04.3/CMakeLists.txt --- old/kdepim-16.04.2/CMakeLists.txt 2016-06-06 14:12:06.000000000 +0200 +++ new/kdepim-16.04.3/CMakeLists.txt 2016-06-30 20:42:32.000000000 +0200 @@ -50,7 +50,7 @@ set(KDEPIM_DEV_VERSION " ${KDEPIM_DEV_VERSION}") endif() -set(KDEPIM_VERSION_NUMBER "5.2.2") +set(KDEPIM_VERSION_NUMBER "5.2.3") set(KDEPIM_VERSION "${KDEPIM_VERSION_NUMBER}${KDEPIM_DEV_VERSION}") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-16.04.2/kalarm/Changelog new/kdepim-16.04.3/kalarm/Changelog --- old/kdepim-16.04.2/kalarm/Changelog 2016-06-06 14:12:06.000000000 +0200 +++ new/kdepim-16.04.3/kalarm/Changelog 2016-06-30 20:42:32.000000000 +0200 @@ -1,6 +1,9 @@ KAlarm Change Log -=== Version 2.11.6 --- 20 April 2016 === +=== Version 2.11.7 --- 11 June 2016 === +- Always use current setting for email sender address when sending emails [KDE Bug 359163] + +=== Version 2.11.6 (KDE Applications 16.04.1) --- 20 April 2016 === - Prevent KAlarm autostarting on non-KDE desktops if start-at-login is disabled. === Version 2.11.5 (KDE Applications 16.04.0) --- 13 April 2016 === diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-16.04.2/kalarm/editdlgtypes.cpp new/kdepim-16.04.3/kalarm/editdlgtypes.cpp --- old/kdepim-16.04.2/kalarm/editdlgtypes.cpp 2016-06-06 14:12:06.000000000 +0200 +++ new/kdepim-16.04.3/kalarm/editdlgtypes.cpp 2016-06-30 20:42:32.000000000 +0200 @@ -1228,7 +1228,7 @@ void EditEmailAlarmDlg::setEmailFields(uint fromID, const KCalCore::Person::List& addresses, const QString& subject, const QStringList& attachments) { - if (fromID) + if (fromID && mEmailFromList) mEmailFromList->setCurrentIdentity(fromID); if (!addresses.isEmpty()) mEmailToEdit->setText(KAEvent::joinEmailAddresses(addresses, QStringLiteral(", "))); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-16.04.2/kalarm/eventlistview.cpp new/kdepim-16.04.3/kalarm/eventlistview.cpp --- old/kdepim-16.04.2/kalarm/eventlistview.cpp 2016-06-06 14:12:06.000000000 +0200 +++ new/kdepim-16.04.3/kalarm/eventlistview.cpp 2016-06-30 20:42:32.000000000 +0200 @@ -207,8 +207,9 @@ break; case QEvent::MouseButtonRelease: { - if (!static_cast<EventListView*>(parent())->editOnSingleClick() - || !KGlobalSettings::singleClick()) + EventListView* view = static_cast<EventListView*>(parent()); + if (!view->editOnSingleClick() + || !view->style()->styleHint(QStyle::SH_ItemView_ActivateItemOnSingleClick, Q_NULLPTR, view)) return false; QMouseEvent* me = static_cast<QMouseEvent*>(e); if (me->button() != Qt::LeftButton || me->buttons() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-16.04.2/kalarm/kalarm.h new/kdepim-16.04.3/kalarm/kalarm.h --- old/kdepim-16.04.2/kalarm/kalarm.h 2016-06-06 14:12:06.000000000 +0200 +++ new/kdepim-16.04.3/kalarm/kalarm.h 2016-06-30 20:42:32.000000000 +0200 @@ -24,7 +24,7 @@ #undef QT3_SUPPORT #define VERSION_SUFFIX "-5ak" -#define KALARM_VERSION "2.11.6" VERSION_SUFFIX +#define KALARM_VERSION "2.11.7" VERSION_SUFFIX #define KALARM_NAME "KAlarm" #define KALARM_DBUS_SERVICE "org.kde.kalarm" // D-Bus service name of KAlarm application diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-16.04.2/kalarm/kamail.cpp new/kdepim-16.04.3/kalarm/kamail.cpp --- old/kdepim-16.04.2/kalarm/kamail.cpp 2016-06-06 14:12:06.000000000 +0200 +++ new/kdepim-16.04.3/kalarm/kamail.cpp 2016-06-30 20:42:32.000000000 +0200 @@ -1,7 +1,7 @@ /* * kamail.cpp - email functions * Program: kalarm - * Copyright © 2002-2015 by David Jarvie <[email protected]> + * Copyright © 2002-2016 by David Jarvie <[email protected]> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -107,9 +107,9 @@ { QString err; KIdentityManagement::Identity identity; - if (!jobdata.event.emailFromId()) - jobdata.from = Preferences::emailAddress(); - else + jobdata.from = Preferences::emailAddress(); + if (jobdata.event.emailFromId() + && Preferences::emailFrom() == Preferences::MAIL_FROM_KMAIL) { identity = Identities::identityManager()->identityForUoid(jobdata.event.emailFromId()); if (identity.isNull()) @@ -445,7 +445,7 @@ contents = f.readAll(); } - QByteArray coded = KCodecs::base64Encode(contents, true); + QByteArray coded = KCodecs::base64Encode(contents); KMime::Content* content = new KMime::Content(); content->setBody(coded + "\n\n"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-16.04.2/kmail/kmkernel.cpp new/kdepim-16.04.3/kmail/kmkernel.cpp --- old/kdepim-16.04.2/kmail/kmkernel.cpp 2016-06-06 14:12:06.000000000 +0200 +++ new/kdepim-16.04.3/kmail/kmkernel.cpp 2016-06-30 20:42:32.000000000 +0200 @@ -1413,12 +1413,7 @@ Akonadi::Collection trashCollection = CommonKernel->trashCollectionFolder(); if (trashCollection.isValid()) { if (KMailSettings::self()->emptyTrashOnExit()) { - Akonadi::CollectionStatisticsJob *jobStatistics = new Akonadi::CollectionStatisticsJob(trashCollection); - if (jobStatistics->exec()) { - if (jobStatistics->statistics().count() > 0) { - mFolderCollectionMonitor->expunge(trashCollection, true /*sync*/); - } - } + mFolderCollectionMonitor->expunge(trashCollection, true /*sync*/); } } delete mConfigureDialog; ++++++ korgac-autostart-default.patch ++++++ From: Fabian Vogt <[email protected]> Subject: Change korgac autostart default To prevent korgac from being started on the first login and thus potentially firing up akonadi, change the default to false. After KOrganizer was run at least once, the config file sets it to true again. --- korgac/org.kde.korgac.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: kdepim-16.04.2/korgac/org.kde.korgac.desktop =================================================================== --- kdepim-16.04.2.orig/korgac/org.kde.korgac.desktop +++ kdepim-16.04.2/korgac/org.kde.korgac.desktop @@ -122,7 +122,7 @@ GenericName[zh_TW]=KOrganizr 提醒守�� Terminal=false X-KDE-autostart-phase=2 -X-KDE-autostart-condition=korgacrc:General:Autostart:true +X-KDE-autostart-condition=korgacrc:General:Autostart:false X-DBUS-StartupType=Unique X-DBUS-ServiceName=org.kde.korgac
