Hello community, here is the log from the commit of package kdepimlibs4 for openSUSE:Factory checked in at Mon Jun 21 18:03:13 CEST 2010. -------- --- KDE/kdepimlibs4/kdepimlibs4.changes 2010-06-15 14:13:26.000000000 +0200 +++ kdepimlibs4/kdepimlibs4.changes 2010-06-18 17:18:17.000000000 +0200 @@ -1,0 +2,8 @@ +Fri Jun 18 17:11:41 CEST 2010 - dmueller@suse.de + +- update to 4.4.4 + * bugfixes over 4.4.3 + * see http://kde.org/announcements/changelogs/changelog4_4_3to4_4_ 4.php for details + * for most modules only version number as a change (4_4_BRANCH.diff already contained the diff + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- kdepimlibs-4.4.3.tar.bz2 r1129209-imap-start.diff r1131007-bko#238945-kcal-invitation-format-crash.diff r1135440-bko#236538-akonadi-race-self-test-false-negative.diff New: ---- kdepimlibs-4.4.4.tar.bz2 r1135440-akonadi-race-self-test-false-negative.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepimlibs4.spec ++++++ --- /var/tmp/diff_new_pack.6a9gGi/_old 2010-06-21 18:02:38.000000000 +0200 +++ /var/tmp/diff_new_pack.6a9gGi/_new 2010-06-21 18:02:38.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdepimlibs4 (Version 4.4.3) +# spec file for package kdepimlibs4 (Version 4.4.4) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -23,16 +23,14 @@ Group: System/GUI/KDE Summary: KDE PIM Libraries Url: http://www.kde.org -Version: 4.4.3 -Release: 4 +Version: 4.4.4 +Release: 1 Source0: kdepimlibs-%version.tar.bz2 Patch0: 4_4_BRANCH.diff Patch1: kres-migrate-only-when-resources-present.diff -Patch2: r1129209-imap-start.diff -Patch3: r1131007-bko#238945-kcal-invitation-format-crash.diff -Patch4: r1135440-bko#236538-akonadi-race-self-test-false-negative.diff -Patch5: r1135935-bko240617-kaddressbook-skype-dial-fix.diff -Patch6: akonadi-longer-selftest-timeout.diff +Patch2: r1135440-akonadi-race-self-test-false-negative.diff +Patch3: r1135935-bko240617-kaddressbook-skype-dial-fix.diff +Patch4: akonadi-longer-selftest-timeout.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: libkdepimlibs4 = %version Requires: kdelibs4 >= %( echo `rpm -q --queryformat '%{VERSION}' libkde4-devel`) @@ -55,8 +53,6 @@ %patch2 %patch3 %patch4 -%patch5 -%patch6 %build %cmake_kde4 -d build -- -DKDE4_ENABLE_FINAL=1 ++++++ 4_4_BRANCH.diff ++++++ --- /var/tmp/diff_new_pack.6a9gGi/_old 2010-06-21 18:02:38.000000000 +0200 +++ /var/tmp/diff_new_pack.6a9gGi/_new 2010-06-21 18:02:38.000000000 +0200 @@ -5,80 +5,3 @@ @@ -0,0 +1,2 @@ +current HEAD: 1127686 +svn di between //tags/KDE/4.4.3/kdepimlibs and //branches/KDE/4.4/kdepimlibs ---- kpimutils/tests/testlinklocator.cpp -+++ kpimutils/tests/testlinklocator.cpp -@@ -302,6 +302,18 @@ - // Bug: 211128 - plain text emails should not replace ampersand & with & - QTest::newRow( "bug211128" ) << "https://green-site/?Ticket=85&Page=next" << 0x01 - << "https://green-site/?Ticket=85&Page=next\">https://green-site/?Ticket=85&Page=next</a>"; -+ -+ QTest::newRow( "dotBeforeEnd" ) << "Look at this file: www.example.com/example.h" << 0x01 -+ << "Look at this file: http://www.example.com/example.h\">" -+ "www.example.com/example.h</a>"; -+ QTest::newRow( "dotInMiddle" ) << "Look at this file: www.example.com/.bashrc" << 0x01 -+ << "Look at this file: http://www.example.com/.bashrc\">" -+ "www.example.com/.bashrc</a>"; -+ -+ // A dot at the end of an URL is explicitly ignored -+ QTest::newRow( "dotAtEnd" ) << "Look at this file: www.example.com/test.cpp." << 0x01 -+ << "Look at this file: http://www.example.com/test.cpp\">" -+ "www.example.com/test.cpp</a>."; - } - - void LinkLocatorTest::testHtmlConvert() ---- kpimutils/linklocator.cpp -+++ kpimutils/linklocator.cpp -@@ -160,6 +160,22 @@ - --mPos; - } - } -+ -+ -+ // HACK: This is actually against the RFC. However, most people don't properly escape the URL in -+ // their text with "" or <>. That leads to people writing an url, followed immediatley by -+ // a dot to finish the sentence. That would lead the parser to include the dot in the url, -+ // even though that is not wanted. So work around that here. -+ // Most real-life URLs hopefully don't end with dots or commas. -+ if ( url.length() > 1 ) { -+ QList<QChar> wordBoundaries; -+ wordBoundaries << '.' << ',' << ':' << '!' << '?'; -+ if ( wordBoundaries.contains( url.at( url.length() - 1 ) ) ) { -+ url.chop( 1 ); -+ --mPos; -+ } -+ } -+ - return url; - } - ---- kcal/recurrencerule.cpp -+++ kcal/recurrencerule.cpp -@@ -1727,7 +1727,7 @@ - if ( d->mDuration >= 0 ) { - KDateTime endRecur = endDt(); - if ( endRecur.isValid() ) { -- if ( start >= endRecur ) { -+ if ( start > endRecur ) { - return result; // beyond end of recurrence - } - if ( end > endRecur ) { -@@ -1757,7 +1757,7 @@ - if ( !d->mCached ) { - d->buildCache(); - } -- if ( d->mCachedDateEnd.isValid() && start >= d->mCachedDateEnd ) { -+ if ( d->mCachedDateEnd.isValid() && start > d->mCachedDateEnd ) { - return result; // beyond end of recurrence - } - int i = d->mCachedDates.findGE( start ); ---- kabc/plugins/dir/dir.desktop -+++ kabc/plugins/dir/dir.desktop -@@ -74,7 +74,7 @@ - Comment[sr@ijekavianlatin]=Pruža pristup kontaktima skladištenim u pojedinačnim fajlovima u datoj fascikli. Podržava standardne vCard fajlove i druge formate, prema raspoloživim priključcima. - Comment[sr@latin]=Pruža pristup kontaktima skladištenim u pojedinačnim fajlovima u datoj fascikli. Podržava standardne vCard fajlove i druge formate, prema raspoloživim priključcima. - Comment[sv]=Ger tillgång till kontakter, var och en lagrad i en enstaka fil, i en given katalog. Stöder vCard-standardfiler och andra format, beroende på tillgängliga insticksprogram. --Comment[tr]=Verilen bir dizin içerisindeki herbiri bir dosya içerisinde bulunan kişilere erişmeyi sağlar. VCard dosyalarını ve eklentilere uygun diğer biçimleri destekler. -+Comment[tr]=Verilen bir dizin içerisindeki her biri bir dosya içerisinde bulunan kişilere erişmeyi sağlar. VCard dosyalarını ve eklentilere uygun diğer biçimleri destekler. - Comment[uk]=Надає доступ до контактів, кожен з яких зберігається у окремому файлі у вказаній теці. Підтримує стандартні файли VCard та файли у інших форматах, залежно від наявності відповідних додатків. - Comment[x-test]=xxProvides access to contacts, each stored in a single file, in a given folder. Supports standard VCard file and other formats depending on availability of plugins.xx - Comment[zh_CN]=提供对被存储在指定目录下的单独一个文件中的联系人的访问支持。支持标准 VCard 文件和其它插件所允许的格式。 ++++++ akonadi-longer-selftest-timeout.diff ++++++ --- /var/tmp/diff_new_pack.6a9gGi/_old 2010-06-21 18:02:38.000000000 +0200 +++ /var/tmp/diff_new_pack.6a9gGi/_new 2010-06-21 18:02:38.000000000 +0200 @@ -1,9 +1,7 @@ From: wstephenson@suse.de Subject: On average systems, a first start of Akonadi takes longer than 10s due to mysql initial table setup. This patch prevents a false startup failure error. -Index: akonadi/control.cpp -=================================================================== ---- akonadi/control.cpp (revision 1138522) -+++ akonadi/control.cpp (working copy) +--- akonadi/control.cpp ++++ akonadi/control.cpp @@ -133,7 +133,7 @@ kDebug() << "Starting Akonadi (using an event loop)."; mEventLoop = new QEventLoop( mParent ); ++++++ kdepimlibs-4.4.3.tar.bz2 -> kdepimlibs-4.4.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.4.3/CMakeLists.txt new/kdepimlibs-4.4.4/CMakeLists.txt --- old/kdepimlibs-4.4.3/CMakeLists.txt 2010-04-29 21:52:45.000000000 +0200 +++ new/kdepimlibs-4.4.4/CMakeLists.txt 2010-05-28 12:09:16.000000000 +0200 @@ -11,14 +11,14 @@ ############### The kdepimlibs version (used e.g. in KdepimLibsConfig.cmake) ############### set(KDEPIMLIBS_VERSION_MAJOR 4) set(KDEPIMLIBS_VERSION_MINOR 4) -set(KDEPIMLIBS_VERSION_PATCH 3) +set(KDEPIMLIBS_VERSION_PATCH 4) set(KDEPIMLIBS_VERSION ${KDEPIMLIBS_VERSION_MAJOR}.${KDEPIMLIBS_VERSION_MINOR}.${KDEPIMLIBS_VERSION_PATCH}) ############### search packages used by KDE ############### set (QT_MIN_VERSION "4.6.0") -find_package(KDE4 4.4.3 REQUIRED) +find_package(KDE4 4.4.4 REQUIRED) include(KDE4Defaults) include(MacroLibrary) Files old/kdepimlibs-4.4.3/doc/kcontrol/kresources/index.cache.bz2 and new/kdepimlibs-4.4.4/doc/kcontrol/kresources/index.cache.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.4.3/kabc/plugins/dir/dir.desktop new/kdepimlibs-4.4.4/kabc/plugins/dir/dir.desktop --- old/kdepimlibs-4.4.3/kabc/plugins/dir/dir.desktop 2010-03-26 18:25:03.000000000 +0100 +++ new/kdepimlibs-4.4.4/kabc/plugins/dir/dir.desktop 2010-05-28 11:42:28.000000000 +0200 @@ -74,7 +74,7 @@ Comment[sr@ijekavianlatin]=Pruža pristup kontaktima skladištenim u pojedinačnim fajlovima u datoj fascikli. Podržava standardne vCard fajlove i druge formate, prema raspoloživim priključcima. Comment[sr@latin]=Pruža pristup kontaktima skladištenim u pojedinačnim fajlovima u datoj fascikli. Podržava standardne vCard fajlove i druge formate, prema raspoloživim priključcima. Comment[sv]=Ger tillgång till kontakter, var och en lagrad i en enstaka fil, i en given katalog. Stöder vCard-standardfiler och andra format, beroende på tillgängliga insticksprogram. -Comment[tr]=Verilen bir dizin içerisindeki herbiri bir dosya içerisinde bulunan kişilere erişmeyi sağlar. VCard dosyalarını ve eklentilere uygun diğer biçimleri destekler. +Comment[tr]=Verilen bir dizin içerisindeki her biri bir dosya içerisinde bulunan kişilere erişmeyi sağlar. VCard dosyalarını ve eklentilere uygun diğer biçimleri destekler. Comment[uk]=Надає доступ до контактів, кожен з яких зберігається у окремому файлі у вказаній теці. Підтримує стандартні файли VCard та файли у інших форматах, залежно від наявності відповідних додатків. Comment[x-test]=xxProvides access to contacts, each stored in a single file, in a given folder. Supports standard VCard file and other formats depending on availability of plugins.xx Comment[zh_CN]=提供对被存储在指定目录下的单独一个文件中的联系人的访问支持。支持标准 VCard 文件和其它插件所允许的格式。 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.4.3/kcal/incidenceformatter.cpp new/kdepimlibs-4.4.4/kcal/incidenceformatter.cpp --- old/kdepimlibs-4.4.3/kcal/incidenceformatter.cpp 2010-02-04 10:24:44.000000000 +0100 +++ new/kdepimlibs-4.4.4/kcal/incidenceformatter.cpp 2010-05-28 11:42:24.000000000 +0200 @@ -2174,15 +2174,17 @@ case iTIPCancel: // Remove invitation - html += tdOpen; - if ( inc->type() == "Todo" ) { - html += helper->makeLink( "cancel", - i18n( "Remove invitation from my to-do list" ) ); - } else { - html += helper->makeLink( "cancel", - i18n( "Remove invitation from my calendar" ) ); + if ( inc ) { + html += tdOpen; + if ( inc->type() == "Todo" ) { + html += helper->makeLink( "cancel", + i18n( "Remove invitation from my to-do list" ) ); + } else { + html += helper->makeLink( "cancel", + i18n( "Remove invitation from my calendar" ) ); + } + html += tdClose; } - html += tdClose; break; case iTIPReply: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.4.3/kcal/recurrencerule.cpp new/kdepimlibs-4.4.4/kcal/recurrencerule.cpp --- old/kdepimlibs-4.4.3/kcal/recurrencerule.cpp 2009-12-17 17:33:58.000000000 +0100 +++ new/kdepimlibs-4.4.4/kcal/recurrencerule.cpp 2010-05-28 11:42:24.000000000 +0200 @@ -1727,7 +1727,7 @@ if ( d->mDuration >= 0 ) { KDateTime endRecur = endDt(); if ( endRecur.isValid() ) { - if ( start >= endRecur ) { + if ( start > endRecur ) { return result; // beyond end of recurrence } if ( end > endRecur ) { @@ -1757,7 +1757,7 @@ if ( !d->mCached ) { d->buildCache(); } - if ( d->mCachedDateEnd.isValid() && start >= d->mCachedDateEnd ) { + if ( d->mCachedDateEnd.isValid() && start > d->mCachedDateEnd ) { return result; // beyond end of recurrence } int i = d->mCachedDates.findGE( start ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.4.3/kioslave/imap4/imap4.cpp new/kdepimlibs-4.4.4/kioslave/imap4/imap4.cpp --- old/kdepimlibs-4.4.3/kioslave/imap4/imap4.cpp 2009-10-26 10:14:11.000000000 +0100 +++ new/kdepimlibs-4.4.4/kioslave/imap4/imap4.cpp 2010-05-28 11:42:24.000000000 +0200 @@ -107,9 +107,9 @@ int kdemain (int argc, char **argv) { + KComponentData instance ("kio_imap4"); kDebug(7116) <<"IMAP4::kdemain"; - KComponentData instance ("kio_imap4"); if (argc != 4) { fprintf(stderr, "Usage: kio_imap4 protocol domain-socket1 domain-socket2\n"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.4.3/kpimutils/linklocator.cpp new/kdepimlibs-4.4.4/kpimutils/linklocator.cpp --- old/kdepimlibs-4.4.3/kpimutils/linklocator.cpp 2010-02-26 19:30:43.000000000 +0100 +++ new/kdepimlibs-4.4.4/kpimutils/linklocator.cpp 2010-05-28 11:42:24.000000000 +0200 @@ -160,6 +160,22 @@ --mPos; } } + + + // HACK: This is actually against the RFC. However, most people don't properly escape the URL in + // their text with "" or <>. That leads to people writing an url, followed immediatley by + // a dot to finish the sentence. That would lead the parser to include the dot in the url, + // even though that is not wanted. So work around that here. + // Most real-life URLs hopefully don't end with dots or commas. + if ( url.length() > 1 ) { + QList<QChar> wordBoundaries; + wordBoundaries << '.' << ',' << ':' << '!' << '?'; + if ( wordBoundaries.contains( url.at( url.length() - 1 ) ) ) { + url.chop( 1 ); + --mPos; + } + } + return url; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.4.3/kpimutils/tests/testlinklocator.cpp new/kdepimlibs-4.4.4/kpimutils/tests/testlinklocator.cpp --- old/kdepimlibs-4.4.3/kpimutils/tests/testlinklocator.cpp 2010-02-26 19:30:43.000000000 +0100 +++ new/kdepimlibs-4.4.4/kpimutils/tests/testlinklocator.cpp 2010-05-28 11:42:24.000000000 +0200 @@ -302,6 +302,18 @@ // Bug: 211128 - plain text emails should not replace ampersand & with & QTest::newRow( "bug211128" ) << "https://green-site/?Ticket=85&Page=next" << 0x01 << "https://green-site/?Ticket=85&Page=next\">https://green-site/?Ticket=85&Page=next</a>"; + + QTest::newRow( "dotBeforeEnd" ) << "Look at this file: www.example.com/example.h" << 0x01 + << "Look at this file: http://www.example.com/example.h\">" + "www.example.com/example.h</a>"; + QTest::newRow( "dotInMiddle" ) << "Look at this file: www.example.com/.bashrc" << 0x01 + << "Look at this file: http://www.example.com/.bashrc\">" + "www.example.com/.bashrc</a>"; + + // A dot at the end of an URL is explicitly ignored + QTest::newRow( "dotAtEnd" ) << "Look at this file: www.example.com/test.cpp." << 0x01 + << "Look at this file: http://www.example.com/test.cpp\">" + "www.example.com/test.cpp</a>."; } void LinkLocatorTest::testHtmlConvert() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.4.3/kresources/kresources.desktop new/kdepimlibs-4.4.4/kresources/kresources.desktop --- old/kdepimlibs-4.4.3/kresources/kresources.desktop 2010-04-29 21:52:45.000000000 +0200 +++ new/kdepimlibs-4.4.4/kresources/kresources.desktop 2010-05-28 11:42:24.000000000 +0200 @@ -6,6 +6,7 @@ X-KDE-Library=kcm_kresources X-KDE-FactoryName=kcm_kresources X-KDE-System-Settings-Parent-Category=advanced-user-settings +X-KDE-System-Settings-Parent-Category-V2=personal-information X-DocPath=kcontrol/kresources/index.html Name=KDE Resources ++++++ r1135440-bko#236538-akonadi-race-self-test-false-negative.diff -> r1135440-akonadi-race-self-test-false-negative.diff ++++++ --- KDE/kdepimlibs4/r1135440-bko#236538-akonadi-race-self-test-false-negative.diff 2010-06-15 14:13:27.000000000 +0200 +++ kdepimlibs4/r1135440-akonadi-race-self-test-false-negative.diff 2010-06-18 17:18:18.000000000 +0200 @@ -1,7 +1,5 @@ -Index: akonadi/agentmanager_p.h -=================================================================== ---- akonadi/agentmanager_p.h (revision 1135439) -+++ akonadi/agentmanager_p.h (revision 1135440) +--- akonadi/agentmanager_p.h ++++ akonadi/agentmanager_p.h @@ -40,7 +40,7 @@ public: @@ -28,10 +26,8 @@ static AgentManager *mSelf; AgentManager *mParent; -Index: akonadi/agentmanager.cpp -=================================================================== ---- akonadi/agentmanager.cpp (revision 1135439) -+++ akonadi/agentmanager.cpp (revision 1135440) +--- akonadi/agentmanager.cpp ++++ akonadi/agentmanager.cpp @@ -33,6 +33,7 @@ using namespace Akonadi; @@ -165,10 +161,8 @@ // @endcond AgentManager::~AgentManager() -Index: akonadi/agentmanager.h -=================================================================== ---- akonadi/agentmanager.h (revision 1135439) -+++ akonadi/agentmanager.h (revision 1135440) +--- akonadi/agentmanager.h ++++ akonadi/agentmanager.h @@ -198,6 +198,7 @@ Q_PRIVATE_SLOT( d, void agentInstanceWarning( const QString&, const QString& ) ) Q_PRIVATE_SLOT( d, void agentInstanceError( const QString&, const QString& ) ) ++++++ r1135935-bko240617-kaddressbook-skype-dial-fix.diff ++++++ --- /var/tmp/diff_new_pack.6a9gGi/_old 2010-06-21 18:02:39.000000000 +0200 +++ /var/tmp/diff_new_pack.6a9gGi/_new 2010-06-21 18:02:39.000000000 +0200 @@ -1,7 +1,5 @@ -Index: akonadi/contact/actions/dialphonenumberaction.cpp -=================================================================== ---- akonadi/contact/actions/dialphonenumberaction.cpp (revision 1135934) -+++ akonadi/contact/actions/dialphonenumberaction.cpp (revision 1135935) +--- akonadi/contact/actions/dialphonenumberaction.cpp ++++ akonadi/contact/actions/dialphonenumberaction.cpp @@ -51,13 +51,6 @@ // synchronize ContactActionsSettings::self()->readConfig(); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org