Hello community, here is the log from the commit of package kdepimlibs4 for openSUSE:Factory checked in at 2013-06-11 06:11:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdepimlibs4 (Old) and /work/SRC/openSUSE:Factory/.kdepimlibs4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdepimlibs4" Changes: -------- --- /work/SRC/openSUSE:Factory/kdepimlibs4/kdepimlibs4.changes 2013-05-16 16:49:38.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdepimlibs4.new/kdepimlibs4.changes 2013-06-11 09:31:39.000000000 +0200 @@ -1,0 +2,8 @@ +Sat Jun 1 09:14:41 UTC 2013 - [email protected] + +- Update to 4.10.4 + * Bugfix release + * See http://www.kde.org/announcements/announce-4.10.4.php + * resolves bnc#8122760 + +------------------------------------------------------------------- Old: ---- kdepimlibs-4.10.3.tar.xz New: ---- kdepimlibs-4.10.4.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepimlibs4.spec ++++++ --- /var/tmp/diff_new_pack.nVKoVW/_old 2013-06-11 09:31:40.000000000 +0200 +++ /var/tmp/diff_new_pack.nVKoVW/_new 2013-06-11 09:31:40.000000000 +0200 @@ -17,7 +17,7 @@ Name: kdepimlibs4 -Version: 4.10.3 +Version: 4.10.4 Release: 0 Summary: KDE PIM Libraries License: LGPL-2.1+ ++++++ kdepimlibs-4.10.3.tar.xz -> kdepimlibs-4.10.4.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.10.3/CMakeLists.txt new/kdepimlibs-4.10.4/CMakeLists.txt --- old/kdepimlibs-4.10.3/CMakeLists.txt 2013-05-03 06:42:06.000000000 +0200 +++ new/kdepimlibs-4.10.4/CMakeLists.txt 2013-05-28 21:26:23.000000000 +0200 @@ -11,7 +11,7 @@ ############### The kdepimlibs version (used e.g. in KdepimLibsConfig.cmake) ############### set(KDEPIMLIBS_VERSION_MAJOR 4) set(KDEPIMLIBS_VERSION_MINOR 10) -set(KDEPIMLIBS_VERSION_PATCH 3) +set(KDEPIMLIBS_VERSION_PATCH 4) set(KDEPIMLIBS_VERSION ${KDEPIMLIBS_VERSION_MAJOR}.${KDEPIMLIBS_VERSION_MINOR}.${KDEPIMLIBS_VERSION_PATCH}) @@ -51,6 +51,7 @@ cmake_dependent_option(KDEPIM_MOBILE_UI "Build UI for mobile devices instead of for desktops" TRUE "_default_mobile_ui" FALSE) option(STATIC_LIBRARY "Build kdepimlibs as static libraries." FALSE) #option(KDEPIM_ENTERPRISE_BUILD "Enable features specific to the enterprise branch, which are normally disabled." FALSE) +option(KDEPIMLIBS_RUN_ISOLATED_TESTS "Run the isolated tests." FALSE) ############### Load the CTest options ############### # Setting DART_TESTING_TIMEOUT has no effect on the tests timeout, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.10.3/akonadi/calendar/tests/CMakeLists.txt new/kdepimlibs-4.10.4/akonadi/calendar/tests/CMakeLists.txt --- old/kdepimlibs-4.10.3/akonadi/calendar/tests/CMakeLists.txt 2013-05-03 06:42:01.000000000 +0200 +++ new/kdepimlibs-4.10.4/akonadi/calendar/tests/CMakeLists.txt 2013-05-28 21:26:23.000000000 +0200 @@ -31,11 +31,13 @@ find_program(_testrunner akonaditest) - add_test( libakonadi-${_name} - ${_testrunner} -c - ${CMAKE_CURRENT_SOURCE_DIR}/unittestenv/config.xml - ${_executable} - ) + if (KDEPIMLIBS_RUN_ISOLATED_TESTS) + add_test( libakonadi-${_name} + ${_testrunner} -c + ${CMAKE_CURRENT_SOURCE_DIR}/unittestenv/config.xml + ${_executable} + ) + endif () endmacro(add_akonadi_isolated_test) #add_akonadi_isolated_test( historytest.cpp ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.10.3/akonadi/contact/editor/im/protocols/googletalkprotocol.desktop new/kdepimlibs-4.10.4/akonadi/contact/editor/im/protocols/googletalkprotocol.desktop --- old/kdepimlibs-4.10.3/akonadi/contact/editor/im/protocols/googletalkprotocol.desktop 2013-05-03 06:42:01.000000000 +0200 +++ new/kdepimlibs-4.10.4/akonadi/contact/editor/im/protocols/googletalkprotocol.desktop 2013-05-29 09:15:53.000000000 +0200 @@ -26,6 +26,7 @@ Comment[pt]=Google Talk Comment[pt_BR]=Google Talk Comment[ro]=Google Talk +Comment[ru]=Google Talk Comment[sk]=Google Talk Comment[sl]=Google Talk Comment[sr]=Гугл‑разговор @@ -60,6 +61,7 @@ Name[pt]=Google Talk Name[pt_BR]=Google Talk Name[ro]=Google Talk +Name[ru]=Google Talk Name[sk]=Google Talk Name[sl]=Google Talk Name[sr]=Гугл‑разговор diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.10.3/akonadi/contact/kcm/akonadicontact_actions.desktop new/kdepimlibs-4.10.4/akonadi/contact/kcm/akonadicontact_actions.desktop --- old/kdepimlibs-4.10.3/akonadi/contact/kcm/akonadicontact_actions.desktop 2013-05-03 06:42:01.000000000 +0200 +++ new/kdepimlibs-4.10.4/akonadi/contact/kcm/akonadicontact_actions.desktop 2013-05-29 09:15:53.000000000 +0200 @@ -133,6 +133,7 @@ X-KDE-Keywords[pl]=kaddressbook, konfiguruj, ustawienia, kontakt, działania X-KDE-Keywords[pt]=kaddressbook, configurar, configuração, contacto, acções X-KDE-Keywords[pt_BR]=kaddressbook,configurar,configurações,contato,ações +X-KDE-Keywords[ru]=kaddressbook, configure, settings, contact, actions, адресная книга, настройка, настройки, контакт, контакты, действия X-KDE-Keywords[sk]=kaddressbook, nastaviť, nastavenia, kontakt, akcie X-KDE-Keywords[sl]=kaddressbook, nastavitve, nastavi, stiki, dejanja X-KDE-Keywords[sr]=kaddressbook,configure,settings,contact,actions,К‑адресар,подесити,подешавање,поставке,контакт,радње diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.10.3/akonadi/kmime/standardmailactionmanager.cpp new/kdepimlibs-4.10.4/akonadi/kmime/standardmailactionmanager.cpp --- old/kdepimlibs-4.10.3/akonadi/kmime/standardmailactionmanager.cpp 2013-05-03 06:42:01.000000000 +0200 +++ new/kdepimlibs-4.10.4/akonadi/kmime/standardmailactionmanager.cpp 2013-05-30 20:42:19.000000000 +0200 @@ -696,6 +696,7 @@ d->mActions.insert( MarkMailAsRead, action ); d->mActionCollection->addAction( QString::fromLatin1( "akonadi_mark_as_read" ), action ); action->setData( QByteArray( "R" ) ); + action->setShortcut( Qt::CTRL+Qt::Key_R ); connect( action, SIGNAL(triggered(bool)), this, SLOT(slotMarkAs()) ); break; case MarkMailAsUnread: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.10.3/akonadi/session.cpp new/kdepimlibs-4.10.4/akonadi/session.cpp --- old/kdepimlibs-4.10.3/akonadi/session.cpp 2013-05-03 06:42:01.000000000 +0200 +++ new/kdepimlibs-4.10.4/akonadi/session.cpp 2013-05-28 21:26:23.000000000 +0200 @@ -430,6 +430,11 @@ instances.setLocalData( new Session( sessionId ) ); } +void SessionPrivate::setDefaultSession( Session *session ) +{ + instances.setLocalData( session ); +} + Session* Session::defaultSession() { if ( !instances.hasLocalData() ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.10.3/akonadi/session.h new/kdepimlibs-4.10.4/akonadi/session.h --- old/kdepimlibs-4.10.3/akonadi/session.h 2013-05-03 06:42:01.000000000 +0200 +++ new/kdepimlibs-4.10.4/akonadi/session.h 2013-05-28 21:26:23.000000000 +0200 @@ -24,6 +24,7 @@ #include <QtCore/QObject> class KJob; +class FakeSession; namespace Akonadi { @@ -120,6 +121,7 @@ private: //@cond PRIVATE SessionPrivate* const d; + friend class ::FakeSession; Q_PRIVATE_SLOT( d, void reconnect() ) Q_PRIVATE_SLOT( d, void socketError( QLocalSocket::LocalSocketError ) ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.10.3/akonadi/session_p.h new/kdepimlibs-4.10.4/akonadi/session_p.h --- old/kdepimlibs-4.10.3/akonadi/session_p.h 2013-05-03 06:42:01.000000000 +0200 +++ new/kdepimlibs-4.10.4/akonadi/session_p.h 2013-05-28 21:26:23.000000000 +0200 @@ -86,6 +86,12 @@ static void createDefaultSession( const QByteArray &sessionId ); /** + * Sets the default session. + * @internal Only for unit tests. + */ + static void setDefaultSession( Session *session ); + + /** Associates the given Job object with this session. */ virtual void addJob( Job* job ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.10.3/akonadi/socialutils/serializer/akonadi_serializer_socialfeeditem.desktop new/kdepimlibs-4.10.4/akonadi/socialutils/serializer/akonadi_serializer_socialfeeditem.desktop --- old/kdepimlibs-4.10.3/akonadi/socialutils/serializer/akonadi_serializer_socialfeeditem.desktop 2013-05-03 06:42:01.000000000 +0200 +++ new/kdepimlibs-4.10.4/akonadi/socialutils/serializer/akonadi_serializer_socialfeeditem.desktop 2013-05-29 09:15:53.000000000 +0200 @@ -21,6 +21,7 @@ Name[pl]=Program szeregujący SocialFeedItem Name[pt]=Serialização de Fontes Sociais Name[pt_BR]=Serializador de Fontes Sociais +Name[ru]=Сохранение данных соцсетей Name[sk]=Serializátor SocialFeedItem Name[sl]=Razvrščevalnik SocialFeedItem v zaporedje Name[sr]=Серијализатор SocialFeedItem @@ -54,6 +55,7 @@ Comment[pl]=Wtyczka programu szeregującego Akonadi dla SocialFeedItem Comment[pt]=Um 'plugin' de serialização do Akonadi de itens de fontes sociais Comment[pt_BR]=Um plugin de serialização do Akonadi de itens de fontes sociais +Comment[ru]=Модуль сохранения данных соцсетей для Akonadi Comment[sk]=Plugin serializátora Akonadi pre SocialFeedItem Comment[sl]=Akonadijev vstavek za razvrščanje predmetov SocialFeedItem v zaporedje Comment[sr]=Аконадијев прикључак серијализатора за SocialFeedItem diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.10.3/akonadi/tests/CMakeLists.txt new/kdepimlibs-4.10.4/akonadi/tests/CMakeLists.txt --- old/kdepimlibs-4.10.3/akonadi/tests/CMakeLists.txt 2013-05-03 06:42:01.000000000 +0200 +++ new/kdepimlibs-4.10.4/akonadi/tests/CMakeLists.txt 2013-05-28 21:26:23.000000000 +0200 @@ -7,7 +7,6 @@ set( TEST_RESULT_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/testresults ) file(MAKE_DIRECTORY ${TEST_RESULT_OUTPUT_PATH}) -option(KDEPIMLIBS_RUN_ISOLATED_TESTS "Run the isolated tests." FALSE) option(KDEPIMLIBS_TESTS_XML "Use XML files for the test results, instead of plain text." FALSE) option(KDEPIMLIBS_TESTS_SQLITE "Run all isolated tests with sqlite3 as backend in addition to the default backends" FALSE) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.10.3/akonadi/tests/entitytreemodeltest.cpp new/kdepimlibs-4.10.4/akonadi/tests/entitytreemodeltest.cpp --- old/kdepimlibs-4.10.3/akonadi/tests/entitytreemodeltest.cpp 2013-05-03 06:42:01.000000000 +0200 +++ new/kdepimlibs-4.10.4/akonadi/tests/entitytreemodeltest.cpp 2013-05-28 21:26:23.000000000 +0200 @@ -150,7 +150,8 @@ void EntityTreeModelTest::initTestCase() { m_sessionName = "EntityTreeModelTest fake session"; - m_fakeSession = new FakeSession( m_sessionName, FakeSession::EndJobsImmediately, this); + m_fakeSession = new FakeSession( m_sessionName, FakeSession::EndJobsImmediately); + m_fakeSession->setAsDefaultSession(); qRegisterMetaType<QModelIndex>("QModelIndex"); } @@ -455,8 +456,13 @@ QList<ExpectedSignal> expectedSignals; - expectedSignals << getExpectedSignal( RowsAboutToBeMoved, sourceRow, sourceRow, sourceCollection, targetRow, targetCollection, QVariantList() << movedItem ); - expectedSignals << getExpectedSignal( RowsMoved, sourceRow, sourceRow, sourceCollection, targetRow, targetCollection, QVariantList() << movedItem ); + //Currently moves are implemented as remove + insert in the ETM. + expectedSignals << getExpectedSignal( RowsAboutToBeRemoved, sourceRow, sourceRow, sourceCollection, QVariantList() << movedItem ); + expectedSignals << getExpectedSignal( RowsRemoved, sourceRow, sourceRow, sourceCollection, QVariantList() << movedItem ); + expectedSignals << getExpectedSignal( RowsAboutToBeInserted, targetRow, targetRow, targetCollection, QVariantList() << movedItem ); + expectedSignals << getExpectedSignal( RowsInserted, targetRow, targetRow, targetCollection, QVariantList() << movedItem ); +// expectedSignals << getExpectedSignal( RowsAboutToBeMoved, sourceRow, sourceRow, sourceCollection, targetRow, targetCollection, QVariantList() << movedItem ); +// expectedSignals << getExpectedSignal( RowsMoved, sourceRow, sourceRow, sourceCollection, targetRow, targetCollection, QVariantList() << movedItem ); m_modelSpy->setExpectedSignals( expectedSignals ); serverData->processNotifications(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.10.3/akonadi/tests/fakesession.cpp new/kdepimlibs-4.10.4/akonadi/tests/fakesession.cpp --- old/kdepimlibs-4.10.3/akonadi/tests/fakesession.cpp 2013-05-03 06:42:01.000000000 +0200 +++ new/kdepimlibs-4.10.4/akonadi/tests/fakesession.cpp 2013-05-28 21:26:23.000000000 +0200 @@ -84,3 +84,8 @@ { } + +void FakeSession::setAsDefaultSession() +{ + d->setDefaultSession(this); +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.10.3/akonadi/tests/fakesession.h new/kdepimlibs-4.10.4/akonadi/tests/fakesession.h --- old/kdepimlibs-4.10.3/akonadi/tests/fakesession.h 2013-05-03 06:42:01.000000000 +0200 +++ new/kdepimlibs-4.10.4/akonadi/tests/fakesession.h 2013-05-28 21:26:23.000000000 +0200 @@ -37,6 +37,11 @@ explicit FakeSession(const QByteArray& sessionId = QByteArray(), Mode mode = EndJobsImmediately, QObject* parent = 0); + /** Make this the default session returned by Akonadi::Session::defaultSession(). + * Note that ownership is taken over by the thread-local storage. + */ + void setAsDefaultSession(); + signals: void jobAdded( Akonadi::Job* ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.10.3/akonadi/tests/monitornotificationtest.cpp new/kdepimlibs-4.10.4/akonadi/tests/monitornotificationtest.cpp --- old/kdepimlibs-4.10.3/akonadi/tests/monitornotificationtest.cpp 2013-05-03 06:42:01.000000000 +0200 +++ new/kdepimlibs-4.10.4/akonadi/tests/monitornotificationtest.cpp 2013-05-28 21:26:23.000000000 +0200 @@ -36,7 +36,8 @@ : QObject(parent) { m_sessionName = "MonitorNotificationTest fake session"; - m_fakeSession = new FakeSession( m_sessionName, FakeSession::EndJobsImmediately, this); + m_fakeSession = new FakeSession( m_sessionName, FakeSession::EndJobsImmediately); + m_fakeSession->setAsDefaultSession(); } private Q_SLOTS: Files old/kdepimlibs-4.10.3/doc/kcontrol/kresources/index.cache.bz2 and new/kdepimlibs-4.10.4/doc/kcontrol/kresources/index.cache.bz2 differ Files old/kdepimlibs-4.10.3/doc/kioslave/imap/index.cache.bz2 and new/kdepimlibs-4.10.4/doc/kioslave/imap/index.cache.bz2 differ Files old/kdepimlibs-4.10.3/doc/kioslave/ldap/index.cache.bz2 and new/kdepimlibs-4.10.4/doc/kioslave/ldap/index.cache.bz2 differ Files old/kdepimlibs-4.10.3/doc/kioslave/mbox/index.cache.bz2 and new/kdepimlibs-4.10.4/doc/kioslave/mbox/index.cache.bz2 differ Files old/kdepimlibs-4.10.3/doc/kioslave/nntp/index.cache.bz2 and new/kdepimlibs-4.10.4/doc/kioslave/nntp/index.cache.bz2 differ Files old/kdepimlibs-4.10.3/doc/kioslave/pop3/index.cache.bz2 and new/kdepimlibs-4.10.4/doc/kioslave/pop3/index.cache.bz2 differ Files old/kdepimlibs-4.10.3/doc/kioslave/sieve/index.cache.bz2 and new/kdepimlibs-4.10.4/doc/kioslave/sieve/index.cache.bz2 differ Files old/kdepimlibs-4.10.3/doc/kioslave/smtp/index.cache.bz2 and new/kdepimlibs-4.10.4/doc/kioslave/smtp/index.cache.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.10.3/gpgme++/ConfigureChecks.cmake new/kdepimlibs-4.10.4/gpgme++/ConfigureChecks.cmake --- old/kdepimlibs-4.10.3/gpgme++/ConfigureChecks.cmake 2013-05-03 06:42:01.000000000 +0200 +++ new/kdepimlibs-4.10.4/gpgme++/ConfigureChecks.cmake 2013-05-28 21:26:23.000000000 +0200 @@ -1,5 +1,6 @@ # gpgme configure checks include(CheckFunctionExists) +include(CheckTypeSize) if ( GPGME_FOUND ) @@ -428,6 +429,12 @@ } " HAVE_GPGME_CONF_ARG_NEW_WITH_CONST_VALUE ) +set(CMAKE_EXTRA_INCLUDE_FILES gpgme.h) +# defined in gpgme versions >= 1.4.2 +check_type_size(gpgme_ssize_t GPGME_SSIZE_T) +check_type_size(gpgme_off_t GPGME_OFF_T) +set(CMAKE_EXTRA_INCLUDE_FILES) + set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES_SAVE}) set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES_SAVE}) set(CMAKE_REQUIRED_INCLUDES_SAVE) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.10.3/gpgme++/callbacks.cpp new/kdepimlibs-4.10.4/gpgme++/callbacks.cpp --- old/kdepimlibs-4.10.3/gpgme++/callbacks.cpp 2013-05-03 06:42:01.000000000 +0200 +++ new/kdepimlibs-4.10.4/gpgme++/callbacks.cpp 2013-05-28 21:26:23.000000000 +0200 @@ -39,6 +39,15 @@ #include <unistd.h> #include <stdlib.h> +#ifndef HAVE_GPGME_SSIZE_T +# define gpgme_ssize_t ssize_t +#endif + +#ifndef HAVE_GPGME_OFF_T +# define gpgme_off_t off_t +#endif + + static inline gpgme_error_t make_err_from_syserror() { #ifdef HAVE_GPGME_GPG_ERROR_WRAPPERS return gpgme_error_from_syserror(); @@ -59,11 +68,14 @@ } } -static void wipe( char * buf, size_t len ) { - for ( size_t i = 0 ; i < len ; ++i ) { - buf[i] = '\0'; - } -} +/* To avoid that a compiler optimizes certain memset calls away, these + macros may be used instead. */ +#define wipememory2(_ptr,_set,_len) do { \ + volatile char *_vptr=(volatile char *)(_ptr); \ + size_t _vlen=(_len); \ + while(_vlen) { *_vptr=(_set); _vptr++; _vlen--; } \ + } while(0) +#define wipememory(_ptr,_len) wipememory2(_ptr,0,_len) gpgme_error_t passphrase_callback( void * opaque, const char * uid_hint, const char * desc, int prev_was_bad, int fd ) { @@ -93,7 +105,7 @@ } if ( passphrase && *passphrase ) { - wipe( passphrase, std::strlen( passphrase ) ); + wipememory( passphrase, std::strlen( passphrase ) ); } free( passphrase ); #ifdef HAVE_GPGME_IO_READWRITE @@ -106,7 +118,7 @@ -static ssize_t +static gpgme_ssize_t data_read_callback( void * opaque, void * buf, size_t buflen ) { DataProvider * provider = static_cast<DataProvider*>( opaque ); if ( !provider ) { @@ -117,10 +129,10 @@ #endif return -1; } - return provider->read( buf, buflen ); + return (gpgme_ssize_t)provider->read( buf, buflen ); } -static ssize_t +static gpgme_ssize_t data_write_callback( void * opaque, const void * buf, size_t buflen ) { DataProvider * provider = static_cast<DataProvider*>( opaque ); if ( !provider ) { @@ -131,11 +143,11 @@ #endif return -1; } - return provider->write( buf, buflen ); + return (gpgme_ssize_t)provider->write( buf, buflen ); } -static off_t -data_seek_callback( void * opaque, off_t offset, int whence ) { +static gpgme_off_t +data_seek_callback( void * opaque, gpgme_off_t offset, int whence ) { DataProvider * provider = static_cast<DataProvider*>( opaque ); if ( !provider ) { #ifdef HAVE_GPGME_GPG_ERROR_WRAPPERS @@ -153,7 +165,7 @@ #endif return -1; } - return provider->seek( offset, whence ); + return provider->seek( (off_t)offset, whence ); } static void data_release_callback( void * opaque ) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.10.3/gpgme++/config-gpgme++.h.cmake new/kdepimlibs-4.10.4/gpgme++/config-gpgme++.h.cmake --- old/kdepimlibs-4.10.3/gpgme++/config-gpgme++.h.cmake 2013-05-03 06:42:01.000000000 +0200 +++ new/kdepimlibs-4.10.4/gpgme++/config-gpgme++.h.cmake 2013-05-28 21:26:23.000000000 +0200 @@ -108,6 +108,12 @@ /* Define to 1 if your gpgme has gpgme_err_set_errno(int) and friends */ #cmakedefine HAVE_GPGME_GPG_ERROR_WRAPPERS 1 +/* Define to 1 if your gpgme defines gpgme_ssize_t */ +#cmakedefine HAVE_GPGME_SSIZE_T 1 + +/* Define to 1 if your gpgme defines gpgme_off_t */ +#cmakedefine HAVE_GPGME_OFF_T 1 + #ifndef HAVE_GPGME_GPG_ERROR_WRAPPERS # ifndef HAVE_GPG_ERR_SET_ERRNO # include <errno.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.10.3/kabc/plugins/ldapkio/ldapkio.desktop new/kdepimlibs-4.10.4/kabc/plugins/ldapkio/ldapkio.desktop --- old/kdepimlibs-4.10.3/kabc/plugins/ldapkio/ldapkio.desktop 2013-05-03 06:42:01.000000000 +0200 +++ new/kdepimlibs-4.10.4/kabc/plugins/ldapkio/ldapkio.desktop 2013-05-29 09:15:53.000000000 +0200 @@ -87,7 +87,7 @@ Comment[pt]=Oferece o acesso aos contactos guardados num servidor de directório LDAP Comment[pt_BR]=Fornece acesso aos contatos armazenados em um servidor de pastas LDAP Comment[ro]=Oferă acces la contactele stocate în dosarele unui server LDAP -Comment[ru]=Хранение контактов на сервере каталогов LDAP +Comment[ru]=Предоставляет доступ к контактам на сервере каталогов LDAP Comment[sk]=Poskytuje prístup ku kontaktom uloženým na LDAP adresárovom serveri. Comment[sl]=Nudi dostop do stikov, ki so shranjeni na imeniškem strežniku LDAP Comment[sr]=Пружа приступ контактима складиштеним на серверу ЛДАП именика diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.10.3/kabc/vcardparser/testroundtrip.cpp new/kdepimlibs-4.10.4/kabc/vcardparser/testroundtrip.cpp --- old/kdepimlibs-4.10.3/kabc/vcardparser/testroundtrip.cpp 2013-05-03 06:42:01.000000000 +0200 +++ new/kdepimlibs-4.10.4/kabc/vcardparser/testroundtrip.cpp 2013-05-28 21:26:23.000000000 +0200 @@ -152,9 +152,9 @@ if ( actual != expect ) { qCritical() << "Mismatch in v3.0 output line" << ( i + 1 ); - QCOMPARE( actual.count(), expect.count() ); qCritical() << "\nActual:" << actual << "\nExpect:" << expect; + QCOMPARE( actual.count(), expect.count() ); QCOMPARE( actual, expect ); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.10.3/kabc/vcardparser/tests/vcard1.vcf.ref new/kdepimlibs-4.10.4/kabc/vcardparser/tests/vcard1.vcf.ref --- old/kdepimlibs-4.10.3/kabc/vcardparser/tests/vcard1.vcf.ref 2013-05-03 06:42:01.000000000 +0200 +++ new/kdepimlibs-4.10.4/kabc/vcardparser/tests/vcard1.vcf.ref 2013-05-28 21:26:23.000000000 +0200 @@ -1,7 +1,7 @@ BEGIN:VCARD ADR;TYPE=parcel;TYPE=postal;TYPE=work:;;6544 Battleford Drive;Raleigh;NC;27 613-3502;U.S.A. -EMAIL;TYPE=PREF:[email protected] +EMAIL;TYPE=PREF:[email protected] EMAIL:[email protected] FN:Frank Dawson N:;;;; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.10.3/kabc/vcardparser/tests/vcard5.vcf.ref new/kdepimlibs-4.10.4/kabc/vcardparser/tests/vcard5.vcf.ref --- old/kdepimlibs-4.10.3/kabc/vcardparser/tests/vcard5.vcf.ref 2013-05-03 06:42:01.000000000 +0200 +++ new/kdepimlibs-4.10.4/kabc/vcardparser/tests/vcard5.vcf.ref 2013-05-28 21:26:23.000000000 +0200 @@ -7,7 +7,7 @@ CLASS:CONFIDENTIAL EMAIL;TYPE=PREF:[email protected] EMAIL:[email protected] -FN:Mustermann\, Heiko +FN:Mustermann\, Heiko GEO:19.283333;166.616669 LOGO;ENCODING=b;TYPE=image/png:iVBORw0KGgoAAAANSUhEUgAAAGQAAABkCAYAAABw4pVU AAAOW0lEQVR4nO1df2hb1xX+OlyQwQEJXJAgBQlaiEwDsdqO2l1H47RjMe2gbjOoszG2dozG7aC @@ -78,7 +78,7 @@ xczH20lidTXe3AixDLCwsLCwsviX4P68/8cprSSqmAAAAAElFTkSuQmCC N:Mustermann;Heiko;;; NICKNAME:clown -NOTE:I'm a friendly note text\,\nplease copy me to your address book... +NOTE:I'm a friendly note text\,\nplease copy me to your address book... ORG:KDE PHOTO;ENCODING=b;TYPE=image/png:iVBORw0KGgoAAAANSUhEUgAAAGQAAABkCAYAAABw4pV UAAAOW0lEQVR4nO1df2hb1xX+OlyQwQEJXJAgBQlaiEwDsdqO2l1H47RjMe2gbjOoszG2dozG7a diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.10.3/kblog/tests/CMakeLists.txt new/kdepimlibs-4.10.4/kblog/tests/CMakeLists.txt --- old/kdepimlibs-4.10.3/kblog/tests/CMakeLists.txt 2013-05-03 06:42:01.000000000 +0200 +++ new/kdepimlibs-4.10.4/kblog/tests/CMakeLists.txt 2013-05-28 21:26:23.000000000 +0200 @@ -15,8 +15,8 @@ set(testgdata_SRCS testgdata.cpp ) - -kde4_add_unit_test(testgdata TESTNAME kblog-testgdata ${testgdata_SRCS}) +# FIXME: disabled as unit test, www.blogger.com apparently changed their API +kde4_add_executable(testgdata ${testgdata_SRCS}) target_link_libraries(testgdata ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY} kblog) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.10.3/kcal/localdir.desktop new/kdepimlibs-4.10.4/kcal/localdir.desktop --- old/kdepimlibs-4.10.3/kcal/localdir.desktop 2013-05-03 06:42:01.000000000 +0200 +++ new/kdepimlibs-4.10.4/kcal/localdir.desktop 2013-05-29 09:15:53.000000000 +0200 @@ -58,7 +58,7 @@ Comment[cs]=Poskytuje přístup k položkám kalendáře, každé uložené v jednom souboru v daném adresáři Comment[da]=Giver adgang til kalenderelementer, hver lagret i en enkelt fil, i en given mappe Comment[de]=Ermöglicht Zugriff auf Kalender, die jeweils in einzelnen Dateien in einem vorgegebenen Ordner gespeichert sind -Comment[el]=Προσφέρει πρόσβαση σε αντικείμενα ημερολογίου, αποθηκευμένα σε ξεχωριστά αρχεία, σε ένα δοσμένο κατάλογο +Comment[el]=Προσφέρει πρόσβαση σε αντικείμενα ημερολογίου, αποθηκευμένα σε ξεχωριστά αρχεία, σε ένα δοσμένο κατάλογο Comment[en_GB]=Provides access to calendar items, each stored in a single file, in a given directory Comment[es]=Provee acceso a elementos de un calendario, cada uno almacenado en un archivo diferente, dentro de un directorio determinado Comment[et]=Võimaldab kasutada eraldi failidesse salvestatud kalendrielemente määratud kataloogis @@ -83,7 +83,7 @@ Comment[pt]=Oferece o acesso aos itens do calendário, estando cada um guardado num único ficheiro de uma dada pasta Comment[pt_BR]=Fornece acesso aos itens do calendário, cada um armazenado em um único arquivo na pasta indicada Comment[ro]=Oferă acces la elemente de calendar, fiecare stocat într-un singur fișier, într-un anumit director -Comment[ru]=Хранение каждого события или задачи в отдельных файлах в указанной локальной папке. +Comment[ru]=Предоставляет доступ к элементам календаря, хранящимся в отдельных файлах в указанном каталоге. Comment[se]=Dáinna beasat kaleandarmerkošidda, vurkejuvvon okta fiilan, dihto katalogas Comment[sk]=Poskytuje prístup do položiek adresára, každá uložená v jednoduchom súbore v danom adresári. Comment[sl]=Nudi dostop do koledarskih vnosov, ki so shranjeni vsak posebej v svoji datoteki, v dani mapi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.10.3/kholidays/holidays/plan2/holiday_ch_it new/kdepimlibs-4.10.4/kholidays/holidays/plan2/holiday_ch_it --- old/kdepimlibs-4.10.3/kholidays/holidays/plan2/holiday_ch_it 2013-05-03 06:42:01.000000000 +0200 +++ new/kdepimlibs-4.10.4/kholidays/holidays/plan2/holiday_ch_it 2013-05-29 21:09:22.000000000 +0200 @@ -47,4 +47,4 @@ :: Seasons -:: Name Days \ No newline at end of file +:: Name Days diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.10.3/kholidays/holidays/plan2/holiday_pt_pt new/kdepimlibs-4.10.4/kholidays/holidays/plan2/holiday_pt_pt --- old/kdepimlibs-4.10.3/kholidays/holidays/plan2/holiday_pt_pt 2013-05-03 06:42:01.000000000 +0200 +++ new/kdepimlibs-4.10.4/kholidays/holidays/plan2/holiday_pt_pt 2013-05-30 11:15:20.000000000 +0200 @@ -17,18 +17,14 @@ :description "(please add description in source language) National holiday file for Portugal" :: Public Holidays -"Ano Novo" on january 1 -"6ª feira santa" on easter minus 2 days -"25 de Abril" on april 25 -"1º de Maio" on may 1 -"Corpo de Deus" on easter plus 60 days -"10 de Junho" on june 10 -"Assunção" on august 15 -"República" on october 5 -"Todos os Santos" on november 1 -"Restauração" on december 1 -"Nª Senhora Conceição" on december 8 -"Natal" on december 25 +"Ano Novo" weekend on january 1 +"6ª feira santa" weekend on easter minus 2 days +"25 de Abril" weekend on april 25 +"1º de Maio" weekend on may 1 +"10 de Junho" weekend on june 10 +"Assunção" weekend on august 15 +"Nª Senhora Conceição" weekend on december 8 +"Natal" weekend on december 25 :: Religious "Carnaval" on easter minus 50 days length 4 days @@ -52,6 +48,14 @@ "Outono" on september 22 "Inverno" on december 22 + +:: Removed holidays +:: "Corpo de Deus" weekend on easter plus 60 days +:: "República" weekend on october 5 +:: "Todos os Santos" weekend on november 1 +:: "Restauração" weekend on december 1 + + :: Name Days diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.10.3/kpimidentities/tests/CMakeLists.txt new/kdepimlibs-4.10.4/kpimidentities/tests/CMakeLists.txt --- old/kdepimlibs-4.10.3/kpimidentities/tests/CMakeLists.txt 2013-05-03 06:42:01.000000000 +0200 +++ new/kdepimlibs-4.10.4/kpimidentities/tests/CMakeLists.txt 2013-05-28 21:26:23.000000000 +0200 @@ -1,5 +1,5 @@ set (identitytest_SRCS identitytest.cpp ) -kde4_add_unit_test (identitytest TESTNAME identitytest ${identitytest_SRCS}) +kde4_add_unit_test (identitytest TESTNAME kpimidentities-identitytest ${identitytest_SRCS}) target_link_libraries ( identitytest ${QT_QTTEST_LIBRARY} @@ -9,7 +9,7 @@ ) set (signaturetest_SRCS signaturetest.cpp ) -kde4_add_unit_test (signaturetest TESTNAME signaturetest ${signaturetest_SRCS}) +kde4_add_unit_test (signaturetest TESTNAME kpimidentities-signaturetest ${signaturetest_SRCS}) target_link_libraries ( signaturetest ${QT_QTTEST_LIBRARY} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.10.3/kpimidentities/tests/signaturetest.cpp new/kdepimlibs-4.10.4/kpimidentities/tests/signaturetest.cpp --- old/kdepimlibs-4.10.3/kpimidentities/tests/signaturetest.cpp 2013-05-03 06:42:01.000000000 +0200 +++ new/kdepimlibs-4.10.4/kpimidentities/tests/signaturetest.cpp 2013-05-28 21:26:23.000000000 +0200 @@ -87,6 +87,7 @@ { TextEdit edit; Signature sig; + sig.setEnabledSignature( true ); sig.setText( "Hello World" ); // Test inserting signature at start, with seperators @@ -148,6 +149,7 @@ { TextEdit edit; Signature sig; + sig.setEnabledSignature( true ); sig.setText( "BLA" ); // Test that the cursor is still at the start when appending a sig into @@ -183,6 +185,7 @@ KConfigGroup group1 = config.group( "Signature1" ); MySignature sig; + sig.setEnabledSignature( true ); sig.setImageLocation( path ); sig.setInlinedHtml( true ); sig.setText( "Bla<img src=\"folder-new.png\">Bla" ); @@ -240,6 +243,7 @@ void SignatureTester::testLinebreaks() { Signature sig; + sig.setEnabledSignature( true ); sig.setType( Signature::Inlined ); sig.setInlinedHtml( true ); sig.setText( "Hans Mustermann<br>Musterstr. 42" ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.10.3/kpimutils/tests/testlinklocator.cpp new/kdepimlibs-4.10.4/kpimutils/tests/testlinklocator.cpp --- old/kdepimlibs-4.10.3/kpimutils/tests/testlinklocator.cpp 2013-05-03 06:42:01.000000000 +0200 +++ new/kdepimlibs-4.10.4/kpimutils/tests/testlinklocator.cpp 2013-05-28 21:26:23.000000000 +0200 @@ -111,7 +111,6 @@ { QStringList brackets; brackets << "" << ""; // no brackets - brackets << "(" << ")"; brackets << "<" << ">"; brackets << "[" << "]"; brackets << "\"" << "\""; @@ -296,19 +295,19 @@ // Test highlighting with *, / and _ QTest::newRow( "" ) << "Ce paragraphe _contient_ des mots ou des _groupes de mots_ à mettre en" - " forme…" << 0x09 << "Ce paragraphe <u>contient</u> des mots ou des" - " <u>groupes de mots</u> à mettre en forme…"; + " forme…" << 0x09 << "Ce paragraphe <u>_contient_</u> des mots ou des" + " <u>_groupes de mots_</u> à mettre en forme…"; QTest::newRow( "punctation-bug" ) << "Ce texte *a l'air* de _fonctionner_, à condition" " d’utiliser le guillemet ASCII." << 0x09 - << "Ce texte <b>a l'air</b> de <u>fonctionner</u>, à" + << "Ce texte <b>*a l'air*</b> de <u>_fonctionner_</u>, à" " condition d’utiliser le guillemet ASCII."; QTest::newRow( "punctation-bug" ) << "Un répertoire /est/ un *dossier* où on peut mettre des" - " *fichiers*." << 0x09 << "Un répertoire <i>est</i> un" - " <b>dossier</b> où on peut mettre des <b>fichiers</b>."; + " *fichiers*." << 0x09 << "Un répertoire <i>/est/</i> un" + " <b>*dossier*</b> où on peut mettre des <b>*fichiers*</b>."; QTest::newRow( "punctation-bug" ) << "*BLA BLA BLA BLA*." << 0x09 << "<b>BLA BLA BLA BLA</b>."; QTest::newRow( "" ) << "Je vais tenter de repérer des faux positif*" << 0x09 << "Je vais tenter de repérer des faux positif*"; - QTest::newRow( "" ) << "*Ouais !* *Yes!*" << 0x09 << "<b>Ouais !</b> <b>Yes!</b>"; + QTest::newRow( "" ) << "*Ouais !* *Yes!*" << 0x09 << "<b>*Ouais !*</b> <b>*Yes!*</b>"; QTest::newRow( "" ) << "the /etc/{rsyslog.d,syslog-ng.d}/package.rpmnew file" << 0x09 << "the /etc/{rsyslog.d,syslog-ng.d}/package.rpmnew file"; @@ -338,6 +337,14 @@ QTest::newRow( "dotAtEnd" ) << "Look at this file: www.example.com/test.cpp." << 0x01 << "Look at this file: <a href=\"http://www.example.com/test.cpp\";>" "www.example.com/test.cpp</a>."; + + // Bug 313719 - URL in parenthesis + QTest::newRow("url-in-parenthesis-1") << "KDE (website http://www.kde.org)" << 0x01 + << "KDE (website <a href=\"http://www.kde.org\";>http://www.kde.org</a>)"; + QTest::newRow("url-in-parenthesis-2") << "KDE website (http://www.kde.org)" << 0x01 + << "KDE website (<a href=\"http://www.kde.org\";>http://www.kde.org</a>)"; + QTest::newRow("url-in-parenthesis-3") << "bla (http://www.kde.org - section 5.2)" << 0x01 + << "bla (<a href=\"http://www.kde.org\";>http://www.kde.org</a> - section 5.2)"; } void LinkLocatorTest::testHtmlConvert() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.10.3/kresources/kresources.desktop new/kdepimlibs-4.10.4/kresources/kresources.desktop --- old/kdepimlibs-4.10.3/kresources/kresources.desktop 2013-05-03 06:42:01.000000000 +0200 +++ new/kdepimlibs-4.10.4/kresources/kresources.desktop 2013-05-29 09:15:53.000000000 +0200 @@ -139,6 +139,7 @@ X-KDE-Keywords[pl]=zasoby,zasoby konnector,zasoby kontaktu,zasoby kalendarz,zasoby notatek,zasoby alarmu,imap X-KDE-Keywords[pt]=recursos,recurso do konector,recurso de contacto,recurso de calendário,recurso de notas,recurso de alarme,IMAP X-KDE-Keywords[pt_BR]=recursos,recurso do konnector,recurso do contato,recurso do calendário, recurso de notas, recurso do alarme,imap +X-KDE-Keywords[ru]=resources,konnector resource,contact resource,calendar resource,notes resource,alarm resource,imap,ресурсы,контакт,контакты,календарь,заметка,заметки,уведомление,оповещение X-KDE-Keywords[sk]=zdroje,zdroje konnector,zdroje kontaktov,zdroje kalendára,zdroje poznámok,zdroje výstrah,imap X-KDE-Keywords[sl]=viri,vir konnector,vir stikov,vir koledarjev,vir notic,vir alarmov,imap X-KDE-Keywords[sr]=resources,konnector resource,contact resource,calendar resource,notes resource,alarm resource,imap,ресурси,ресурс конектора,ресурс контаката,ресурс календара,ресурс белешки,ресурс аларма,ИМАП diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.10.3/mailtransport/tests/CMakeLists.txt new/kdepimlibs-4.10.4/mailtransport/tests/CMakeLists.txt --- old/kdepimlibs-4.10.3/mailtransport/tests/CMakeLists.txt 2013-05-03 06:42:01.000000000 +0200 +++ new/kdepimlibs-4.10.4/mailtransport/tests/CMakeLists.txt 2013-05-28 21:26:23.000000000 +0200 @@ -29,7 +29,9 @@ find_program(_testrunner akonaditest) - add_test( mailtransport-${_targetName} ${_testrunner} -c ${CMAKE_CURRENT_SOURCE_DIR}/${_path}/config.xml ${_executable} ) + if (KDEPIMLIBS_RUN_ISOLATED_TESTS) + add_test( mailtransport-${_targetName} ${_testrunner} -c ${CMAKE_CURRENT_SOURCE_DIR}/${_path}/config.xml ${_executable} ) + endif() endmacro(add_akonadi_isolated_test) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
