commit kdepimlibs for openSUSE:Factory

Hello community, here is the log from the commit of package kdepimlibs for openSUSE:Factory checked in at 2016-01-23 01:06:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdepimlibs (Old) and /work/SRC/openSUSE:Factory/.kdepimlibs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdepimlibs" Changes: -------- --- /work/SRC/openSUSE:Factory/kdepimlibs/kdepimlibs.changes 2016-01-10 13:09:23.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdepimlibs.new/kdepimlibs.changes 2016-01-23 01:06:59.000000000 +0100 @@ -1,0 +2,10 @@ +Sat Jan 9 18:17:51 UTC 2016 - tittiatcoke@gmail.com + +- Update to KDE Applications 15.12.1 + * KDE Applications 15.12.1 + * https://www.kde.org/announcements/announce-applications-15.12.1.php + * boo#961265 + + +- Drop upstream patch fix-kmail-crash-on-exit.patch +------------------------------------------------------------------- Old: ---- fix-kmail-crash-on-exit.patch kdepimlibs-15.12.0.tar.xz New: ---- kdepimlibs-15.12.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepimlibs.spec ++++++ --- /var/tmp/diff_new_pack.dMitD6/_old 2016-01-23 01:07:00.000000000 +0100 +++ /var/tmp/diff_new_pack.dMitD6/_new 2016-01-23 01:07:00.000000000 +0100 @@ -17,7 +17,7 @@ Name: kdepimlibs -Version: 15.12.0 +Version: 15.12.1 Release: 0 %define kf5_version 5.1.0 Summary: KDE PIM Libraries @@ -54,7 +54,7 @@ BuildRequires: kwallet-devel >= %{kf5_version} BuildRequires: kwidgetsaddons-devel >= %{kf5_version} BuildRequires: kxmlgui-devel >= %{kf5_version} -BuildRequires: libKF5AkonadiPrivate-devel >= 15.12.0 +BuildRequires: libKF5AkonadiPrivate-devel >= 15.12.1 BuildRequires: libassuan-devel BuildRequires: libical-devel >= 0.42 BuildRequires: libxslt-devel @@ -68,8 +68,6 @@ BuildRequires: pkgconfig(Qt5Test) >= 5.2.0 BuildRequires: pkgconfig(Qt5WebKitWidgets) >= 5.2.0 BuildRequires: pkgconfig(Qt5Widgets) >= 5.2.0 -#PATCH-FIX-UPSTREAM: fix-kmail-crash-on-exit.patch - Fix PIM applications crash on exit (boo#960473) -Patch0: fix-kmail-crash-on-exit.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -188,7 +186,6 @@ %prep %setup -q -n kdepimlibs-%{version} -%patch0 -p1 %build %cmake_kf5 -d build -- -DKF5_INCLUDE_INSTALL_DIR=%_kf5_includedir ++++++ kdepimlibs-15.12.0.tar.xz -> kdepimlibs-15.12.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-15.12.0/akonadi/src/core/models/agentinstancemodel.cpp new/kdepimlibs-15.12.1/akonadi/src/core/models/agentinstancemodel.cpp --- old/kdepimlibs-15.12.0/akonadi/src/core/models/agentinstancemodel.cpp 2015-12-09 13:01:13.000000000 +0100 +++ new/kdepimlibs-15.12.1/akonadi/src/core/models/agentinstancemodel.cpp 2016-01-04 21:31:11.000000000 +0100 @@ -117,14 +117,14 @@ return roles; } -int AgentInstanceModel::columnCount(const QModelIndex &) const +int AgentInstanceModel::columnCount(const QModelIndex &index) const { - return 1; + return index.isValid() ? 0 : 1; } -int AgentInstanceModel::rowCount(const QModelIndex &) const +int AgentInstanceModel::rowCount(const QModelIndex &index) const { - return d->mInstances.count(); + return index.isValid() ? 0 : d->mInstances.count(); } QVariant AgentInstanceModel::data(const QModelIndex &index, int role) const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-15.12.0/akonadi/src/core/session.cpp new/kdepimlibs-15.12.1/akonadi/src/core/session.cpp --- old/kdepimlibs-15.12.0/akonadi/src/core/session.cpp 2015-12-09 13:01:13.000000000 +0100 +++ new/kdepimlibs-15.12.1/akonadi/src/core/session.cpp 2016-01-04 21:31:11.000000000 +0100 @@ -301,15 +301,16 @@ // Shutdown the thread before QApplication event loop quits - the // thread()->wait() mechanism in ConnectionThread dtor crashes sometimes // when called from QApplication destructor - QObject::connect(qApp, &QCoreApplication::aboutToQuit, - [this]() { - delete connThread; - connThread = Q_NULLPTR; - }); + connThreadCleanUp = QObject::connect(qApp, &QCoreApplication::aboutToQuit, + [this]() { + delete connThread; + connThread = Q_NULLPTR; + }); } SessionPrivate::~SessionPrivate() { + QObject::disconnect(connThreadCleanUp); delete connThread; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-15.12.0/akonadi/src/core/session_p.h new/kdepimlibs-15.12.1/akonadi/src/core/session_p.h --- old/kdepimlibs-15.12.0/akonadi/src/core/session_p.h 2015-12-09 13:01:13.000000000 +0100 +++ new/kdepimlibs-15.12.1/akonadi/src/core/session_p.h 2016-01-04 21:31:11.000000000 +0100 @@ -29,6 +29,7 @@ #include #include +#include #include <QFile> class QIODevice; @@ -125,6 +126,7 @@ Session *mParent; QThread *thread; ConnectionThread *connThread; + QMetaObject::Connection connThreadCleanUp; QByteArray sessionId; bool connected; qint64 theNextTag; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-15.12.0/akonadi-contact/src/editor/im/protocols/facebookprotocol.desktop new/kdepimlibs-15.12.1/akonadi-contact/src/editor/im/protocols/facebookprotocol.desktop --- old/kdepimlibs-15.12.0/akonadi-contact/src/editor/im/protocols/facebookprotocol.desktop 2015-12-09 13:01:13.000000000 +0100 +++ new/kdepimlibs-15.12.1/akonadi-contact/src/editor/im/protocols/facebookprotocol.desktop 2016-01-04 21:31:11.000000000 +0100 @@ -33,6 +33,7 @@ Comment[uk]=Протокол Facebook Comment[x-test]=xxFacebook Protocolxx Comment[zh_CN]=Facebook 协议 +Comment[zh_TW]=Facebook 協定 Name=Facebook Name[ast]=Facebook Name[ca]=Facebook @@ -62,4 +63,5 @@ Name[uk]=Facebook Name[x-test]=xxFacebookxx Name[zh_CN]=Facebook +Name[zh_TW]=Facebook diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-15.12.0/akonadi-contact/src/editor/im/protocols/twitterprotocol.desktop new/kdepimlibs-15.12.1/akonadi-contact/src/editor/im/protocols/twitterprotocol.desktop --- old/kdepimlibs-15.12.0/akonadi-contact/src/editor/im/protocols/twitterprotocol.desktop 2015-12-09 13:01:13.000000000 +0100 +++ new/kdepimlibs-15.12.1/akonadi-contact/src/editor/im/protocols/twitterprotocol.desktop 2016-01-04 21:31:11.000000000 +0100 @@ -33,6 +33,7 @@ Comment[uk]=Протокол Twitter Comment[x-test]=xxTwitter Protocolxx Comment[zh_CN]=Twitter 协议 +Comment[zh_TW]=Twitter 協定 Name=Twitter Name[ast]=Twitter Name[ca]=Twitter @@ -63,4 +64,5 @@ Name[uk]=Twitter Name[x-test]=xxTwitterxx Name[zh_CN]=Twitter +Name[zh_TW]=Twitter diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-15.12.0/kioslave/src/pop3/CMakeLists.txt new/kdepimlibs-15.12.1/kioslave/src/pop3/CMakeLists.txt --- old/kdepimlibs-15.12.0/kioslave/src/pop3/CMakeLists.txt 2015-12-09 13:01:13.000000000 +0100 +++ new/kdepimlibs-15.12.1/kioslave/src/pop3/CMakeLists.txt 2016-01-04 21:31:11.000000000 +0100 @@ -4,7 +4,7 @@ set(pop3_optional_libs) if(Sasl2_FOUND) - set(pop3_optional_includes ${pop3_optional_includes} ${Sasl2_INCLUDE_DIR}) + set(pop3_optional_includes ${pop3_optional_includes} ${Sasl2_INCLUDE_DIRS}) set(pop3_optional_libs ${pop3_optional_libs} ${Sasl2_LIBRARIES}) set(HAVE_LIBSASL2 1) else() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-15.12.0/kioslave/src/smtp/CMakeLists.txt new/kdepimlibs-15.12.1/kioslave/src/smtp/CMakeLists.txt --- old/kdepimlibs-15.12.0/kioslave/src/smtp/CMakeLists.txt 2015-12-09 13:01:13.000000000 +0100 +++ new/kdepimlibs-15.12.1/kioslave/src/smtp/CMakeLists.txt 2016-01-04 21:31:11.000000000 +0100 @@ -7,7 +7,7 @@ set(smtp_optional_libs) if (Sasl2_FOUND) - set(smtp_optional_includes ${smtp_optional_includes} ${Sasl2_INCLUDE_DIR}) + set(smtp_optional_includes ${smtp_optional_includes} ${Sasl2_INCLUDE_DIRS}) set(smtp_optional_libs ${smtp_optional_libs} ${Sasl2_LIBRARIES}) endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-15.12.0/kioslave/src/smtp/tests/CMakeLists.txt new/kdepimlibs-15.12.1/kioslave/src/smtp/tests/CMakeLists.txt --- old/kdepimlibs-15.12.0/kioslave/src/smtp/tests/CMakeLists.txt 2015-12-09 13:01:13.000000000 +0100 +++ new/kdepimlibs-15.12.1/kioslave/src/smtp/tests/CMakeLists.txt 2016-01-04 21:31:11.000000000 +0100 @@ -30,7 +30,7 @@ set(test_commands_SRCS test_commands.cpp ) ecm_qt_declare_logging_category(test_commands_SRCS HEADER smtp_debug.h IDENTIFIER SMTP_LOG CATEGORY_NAME log_smtp) -include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/.. ${Sasl2_INCLUDE_DIR} ${kioslave_SOURCE_DIR}/src/) +include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/.. ${Sasl2_INCLUDE_DIRS} ${kioslave_SOURCE_DIR}/src/) add_executable( test_commands ${test_commands_SRCS} ) add_test( test_commands test_commands )