Hello community, here is the log from the commit of package kdepim4 for openSUSE:12.1:Update:Test checked in at 2011-12-09 16:46:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.1:Update:Test/kdepim4 (Old) and /work/SRC/openSUSE:12.1:Update:Test/.kdepim4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdepim4", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:12.1:Update:Test/kdepim4/kdepim4.changes 2011-12-09 16:46:53.000000000 +0100 +++ /work/SRC/openSUSE:12.1:Update:Test/.kdepim4.new/kdepim4.changes 2011-12-09 16:46:53.000000000 +0100 @@ -1,0 +2,13 @@ +Mon Nov 21 19:39:11 UTC 2011 - [email protected] + +- Fix KOrganizer showing events starting the previous month + (bnc#731187) +- Don't show Time Tracker kontact plugin unless the ktimetracker + package is installed (bnc#731268) + +------------------------------------------------------------------- +Sun Nov 13 09:17:14 UTC 2011 - [email protected] + +- fix crash when closing kontact (bnc#730047) + +------------------------------------------------------------------- New: ---- bnc730047_fix_kontact_crash_on_exit.diff bnc731187-69554e88-korganizer-month-boundary-spanning-events.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepim4.spec ++++++ --- /var/tmp/diff_new_pack.CMCp3k/_old 2011-12-09 16:46:53.000000000 +0100 +++ /var/tmp/diff_new_pack.CMCp3k/_new 2011-12-09 16:46:53.000000000 +0100 @@ -30,6 +30,8 @@ Patch2: desktop-files.diff Patch3: knode-kontact-default.diff Patch4: make-kmail-faster.patch +Patch5: bnc730047_fix_kontact_crash_on_exit.diff +Patch6: bnc731187-69554e88-korganizer-month-boundary-spanning-events.diff BuildRequires: fdupes BuildRequires: gpgme-devel BuildRequires: grantlee-devel @@ -66,6 +68,8 @@ %patch2 %patch3 %patch4 -p1 +%patch5 -p1 +%patch6 -p1 %build %ifarch ppc64 @@ -106,7 +110,8 @@ knodeplugin="%{_kde4_modulesdir}/kontact_knodeplugin.so %{_kde4_servicesdir}/kontact/knodeplugin.desktop" knotesplugin="%{_kde4_modulesdir}/kontact_knotesplugin.so %{_kde4_servicesdir}/kontact/knotesplugin.desktop" korganizerplugins="%{_kde4_modulesdir}/kontact_journalplugin.so %{_kde4_modulesdir}/kontact_korganizerplugin.so %{_kde4_modulesdir}/kontact_todoplugin.so %{_kde4_servicesdir}/kontact/korganizerplugin.desktop %{_kde4_servicesdir}/kontact/journalplugin.desktop %{_kde4_servicesdir}/kontact/todoplugin.desktop" - for i in $akregatorplugins $kaddressbookplugin $kjotsplugin $kmailplugin $knodeplugin $knotesplugin $korganizerplugins + ktimetrackerplugin="%{_kde4_modulesdir}/kontact_ktimetrackerplugin.so %{_kde4_servicesdir}/kontact/ktimetracker_plugin.desktop" + for i in $akregatorplugins $kaddressbookplugin $kjotsplugin $kmailplugin $knodeplugin $knotesplugin $korganizerplugins $ktimetrackerplugin do sed -ri s,$i,, filelists/kontact done @@ -138,6 +143,11 @@ do echo $i >> filelists/korganizer done + for i in $ktimetrackerplugin + do + echo $i >> filelists/ktimetracker + done + sed -ri s,.*/usr/%{_lib}/libkabcommon.so.*,, filelists/kaddressbook ++++++ bnc730047_fix_kontact_crash_on_exit.diff ++++++ Subject: Fix kontact crash on exit From: Allen Winter <[email protected]> Signed-Off-By: Christian Trippe <[email protected]> Bug: bnc#730047 Patch-upstream: kde >= 4.7.4 commit c0659da0186a637ba62ff0449e0d0f77d84b4170 Author: Allen Winter <[email protected]> Date: Sat Nov 12 09:36:57 2011 -0500 Backport: In slotSendQueued() and slotSendQueuedVia(), make sure msgSender() is non-empty to prevent crashes. In slotSendQueuedVia(), make sure the availTransports list isn't empty to prevent crashes. CCBUG: 280649 FIXED-IN: 4.7.4 diff --git a/kmail/kmmainwidget.cpp b/kmail/kmmainwidget.cpp index faff305..877d92a 100644 --- a/kmail/kmmainwidget.cpp +++ b/kmail/kmmainwidget.cpp @@ -2476,7 +2476,9 @@ void KMMainWidget::slotSendQueued() return; } - kmkernel->msgSender()->sendQueued(); + if ( kmkernel->msgSender() ) { + kmkernel->msgSender()->sendQueued(); + } } //----------------------------------------------------------------------------- @@ -2487,8 +2489,11 @@ void KMMainWidget::slotSendQueuedVia( QAction* item ) } const QStringList availTransports= MailTransport::TransportManager::self()->transportNames(); - if (availTransports.contains(item->text())) - kmkernel->msgSender()->sendQueued( item->text() ); + if ( !availTransports.isEmpty() && availTransports.contains( item->text() ) ) { + if ( kmkernel->msgSender() ) { + kmkernel->msgSender()->sendQueued( item->text() ); + } + } } //----------------------------------------------------------------------------- ++++++ bnc731187-69554e88-korganizer-month-boundary-spanning-events.diff ++++++ Patch-upstream: yes commit 69554e88f51faa7c02d6453286790542a39b7ed8 Author: Sergio Martins <[email protected]> Date: Sat Nov 19 14:58:53 2011 +0000 Event crossing month bounderies wasn't being shown. Patch by Reimar Imhof. I changed it a bit and replaced downcasts with date roles. BUG: 286876 BUG: 286984 (cherry picked from commit 4fbd25490042b4994d410b54c901078e31e61994) diff --git a/calendarviews/eventviews/month/monthview.cpp b/calendarviews/eventviews/month/monthview.cpp index 4efd80b..7012cfe 100644 --- a/calendarviews/eventviews/month/monthview.cpp +++ b/calendarviews/eventviews/month/monthview.cpp @@ -527,21 +527,12 @@ void MonthView::reloadIncidences() removeFilteredOccurrences( todo, dateTimeList ); } } else { - KDateTime dateToAdd; + const KDateTime dtStart = incidence->dateTime( KCalCore::Incidence::RoleDisplayStart ); + const KDateTime dtEnd = incidence->dateTime( KCalCore::Incidence::RoleDisplayEnd ); - if ( KCalCore::Todo::Ptr todo = CalendarSupport::todo( aitem ) ) { - if ( todo->hasDueDate() ) { - dateToAdd = todo->dtDue(); - } - } else { - dateToAdd = incidence->dtStart(); + if ( dtEnd >= actualStartDateTime() && dtStart <= actualEndDateTime() ) { + dateTimeList += dtStart; } - - if ( dateToAdd >= actualStartDateTime() && - dateToAdd <= actualEndDateTime() ) { - dateTimeList += dateToAdd; - } - } KCalCore::DateTimeList::const_iterator t; const bool busyDay = colorMonthBusyDays && makesWholeDayBusy( incidence ); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
