Hello community, here is the log from the commit of package kontactinterface for openSUSE:Factory checked in at 2016-01-10 13:05:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kontactinterface (Old) and /work/SRC/openSUSE:Factory/.kontactinterface.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kontactinterface" Changes: -------- --- /work/SRC/openSUSE:Factory/kontactinterface/kontactinterface.changes 2015-11-15 12:38:34.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kontactinterface.new/kontactinterface.changes 2016-01-10 13:05:58.000000000 +0100 @@ -1,0 +2,14 @@ +Sun Dec 13 13:24:17 UTC 2015 - [email protected] + +- Update to KDE Applications 15.12.0 + * KDE Applications 15.12.0 + * https://www.kde.org/announcements/announce-applications-15.12.0.php + * boo#958887 + + +------------------------------------------------------------------- +Fri Dec 11 01:35:22 UTC 2015 - [email protected] + +- Remove superfluous libpth-devel dependency + +------------------------------------------------------------------- Old: ---- kontactinterface-15.08.3.tar.xz New: ---- kontactinterface-15.12.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kontactinterface.spec ++++++ --- /var/tmp/diff_new_pack.m0xyAf/_old 2016-01-10 13:05:59.000000000 +0100 +++ /var/tmp/diff_new_pack.m0xyAf/_new 2016-01-10 13:05:59.000000000 +0100 @@ -17,7 +17,7 @@ Name: kontactinterface -Version: 15.08.3 +Version: 15.12.0 Release: 0 %define kf5_version 5.1.0 Summary: KDE PIM Libraries: Interface to Contacts @@ -50,7 +50,6 @@ BuildRequires: libKF5AkonadiPrivate-devel >= 1.72.43 BuildRequires: libassuan-devel BuildRequires: libical-devel >= 0.42 -BuildRequires: libpth-devel BuildRequires: libxslt-devel BuildRequires: openldap2-devel BuildRequires: phonon4qt5-devel ++++++ kontactinterface-15.08.3.tar.xz -> kontactinterface-15.12.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kontactinterface-15.08.3/CMakeLists.txt new/kontactinterface-15.12.0/CMakeLists.txt --- old/kontactinterface-15.08.3/CMakeLists.txt 2015-08-31 11:24:03.000000000 +0200 +++ new/kontactinterface-15.12.0/CMakeLists.txt 2015-11-07 13:17:10.000000000 +0100 @@ -3,7 +3,7 @@ project(KontactInterface) # ECM setup -find_package(ECM 5.12.0 CONFIG REQUIRED) +find_package(ECM 5.14.0 CONFIG REQUIRED) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) include(GenerateExportHeader) @@ -15,11 +15,12 @@ include(KDEInstallDirs) include(KDECMakeSettings) include(KDEFrameworkCompilerSettings) +include(ECMQtDeclareLoggingCategory) add_definitions(-DTRANSLATION_DOMAIN=\"kontactinterfaces5\") -set(KF5_VERSION "5.12.0") -set(KONTACTINTERFACE_LIB_VERSION "4.81.0") +set(KF5_VERSION "5.14.0") +set(KONTACTINTERFACE_LIB_VERSION "4.82.0") set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5KontactInterface") ecm_setup_version(${KONTACTINTERFACE_LIB_VERSION} VARIABLE_PREFIX KONTACTINTERFACE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kontactinterface-15.08.3/KF5KontactInterfaceConfig.cmake.in new/kontactinterface-15.12.0/KF5KontactInterfaceConfig.cmake.in --- old/kontactinterface-15.08.3/KF5KontactInterfaceConfig.cmake.in 2015-08-31 11:24:03.000000000 +0200 +++ new/kontactinterface-15.12.0/KF5KontactInterfaceConfig.cmake.in 2015-11-07 13:17:10.000000000 +0100 @@ -1,6 +1,5 @@ @PACKAGE_INIT@ -find_dependency(KF5KDELibs4Support "@KF5_VERSION@") find_dependency(KF5Parts "@KF5_VERSION@") include("${CMAKE_CURRENT_LIST_DIR}/KF5KontactInterfaceTargets.cmake") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kontactinterface-15.08.3/src/CMakeLists.txt new/kontactinterface-15.12.0/src/CMakeLists.txt --- old/kontactinterface-15.08.3/src/CMakeLists.txt 2015-08-31 11:24:03.000000000 +0200 +++ new/kontactinterface-15.12.0/src/CMakeLists.txt 2015-11-07 13:17:10.000000000 +0100 @@ -1,5 +1,4 @@ set(kontactinterface_LIB_SRCS - kontactinterface_debug.cpp core.cpp plugin.cpp summary.cpp @@ -7,6 +6,8 @@ uniqueapphandler.cpp pimuniqueapplication.cpp) +ecm_qt_declare_logging_category(kontactinterface_LIB_SRCS HEADER kontactinterface_debug.h IDENTIFIER KONTACTINTERFACE_LOG CATEGORY_NAME log_kontactinterface) + add_library(KF5KontactInterface ${kontactinterface_LIB_SRCS}) generate_export_header(KF5KontactInterface BASE_NAME kontactinterface) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kontactinterface-15.08.3/src/core.cpp new/kontactinterface-15.12.0/src/core.cpp --- old/kontactinterface-15.08.3/src/core.cpp 2015-08-31 11:24:03.000000000 +0200 +++ new/kontactinterface-15.12.0/src/core.cpp 2015-11-07 13:17:10.000000000 +0100 @@ -35,7 +35,7 @@ using namespace KontactInterface; //@cond PRIVATE -class KontactInterface::Core::Private +class Q_DECL_HIDDEN KontactInterface::Core::Private { Core *const q; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kontactinterface-15.08.3/src/kontactinterface_debug.cpp new/kontactinterface-15.12.0/src/kontactinterface_debug.cpp --- old/kontactinterface-15.08.3/src/kontactinterface_debug.cpp 2015-08-31 11:24:03.000000000 +0200 +++ new/kontactinterface-15.12.0/src/kontactinterface_debug.cpp 1970-01-01 01:00:00.000000000 +0100 @@ -1,22 +0,0 @@ -/* This file is part of the KDE project - Copyright (C) 2014 Laurent Montel <[email protected]> - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#include "kontactinterface_debug.h" -Q_LOGGING_CATEGORY(KONTACTINTERFACE_LOG, "log_kontactinterface") - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kontactinterface-15.08.3/src/kontactinterface_debug.h new/kontactinterface-15.12.0/src/kontactinterface_debug.h --- old/kontactinterface-15.08.3/src/kontactinterface_debug.h 2015-08-31 11:24:03.000000000 +0200 +++ new/kontactinterface-15.12.0/src/kontactinterface_debug.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,27 +0,0 @@ -/* This file is part of the KDE project - Copyright (C) 2014 Laurent Montel <[email protected]> - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#ifndef KONTACTINTERFACE_DEBUG_H -#define KONTACTINTERFACE_DEBUG_H - -#include <QLoggingCategory> -Q_DECLARE_LOGGING_CATEGORY(KONTACTINTERFACE_LOG) - -#endif - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kontactinterface-15.08.3/src/pimuniqueapplication.cpp new/kontactinterface-15.12.0/src/pimuniqueapplication.cpp --- old/kontactinterface-15.08.3/src/pimuniqueapplication.cpp 2015-08-31 11:24:03.000000000 +0200 +++ new/kontactinterface-15.12.0/src/pimuniqueapplication.cpp 2015-11-07 13:17:10.000000000 +0100 @@ -29,6 +29,7 @@ #include <QCommandLineParser> #include <QLoggingCategory> +#include <QDir> #include <QWidget> #include <QMainWindow> @@ -39,11 +40,11 @@ using namespace KontactInterface; //@cond PRIVATE -class KontactInterface::PimUniqueApplication::Private +class Q_DECL_HIDDEN KontactInterface::PimUniqueApplication::Private { public: Private() - : cmdArgs(Q_NULLPTR) + : cmdArgs(new QCommandLineParser()) {} ~Private() @@ -51,17 +52,14 @@ delete cmdArgs; } - QCommandLineParser *cmdArgs; + QCommandLineParser *const cmdArgs; }; //@endcond -PimUniqueApplication::PimUniqueApplication(int &argc, char **argv[] - ) +PimUniqueApplication::PimUniqueApplication(int &argc, char **argv[]) : QApplication(argc, *argv) , d(new Private()) { - d->cmdArgs = new QCommandLineParser(); - } PimUniqueApplication::~PimUniqueApplication() @@ -120,7 +118,8 @@ if (iface.isValid()) { QDBusReply<int> reply = iface.call(QStringLiteral("newInstance"), new_asn_id, - arguments); + arguments, + QDir::currentPath()); if (reply.isValid()) { return false; // success means that main() can exist now. } @@ -133,19 +132,20 @@ QDBusConnection::sessionBus().registerService(serviceName); } - static_cast<PimUniqueApplication*>(qApp)->activate(arguments); + static_cast<PimUniqueApplication*>(qApp)->activate(arguments, QDir::currentPath()); return true; } int PimUniqueApplication::newInstance() { - return newInstance(KStartupInfo::startupId(), QStringList() << QApplication::applicationName()); + return newInstance(KStartupInfo::startupId(), QStringList() << QApplication::applicationName(), QDir::currentPath()); } // This is called via DBus either by another instance that has just been // started or by Kontact when the module is activated int PimUniqueApplication::newInstance(const QByteArray &startupId, - const QStringList &arguments) + const QStringList &arguments, + const QString &workingDirectory) { KStartupInfo::setStartupId(startupId); @@ -161,14 +161,15 @@ } } - activate(arguments); + activate(arguments, workingDirectory); return 0; } -int PimUniqueApplication::activate(const QStringList &arguments) +int PimUniqueApplication::activate(const QStringList &arguments, const QString &workingDirectory) { Q_UNUSED(arguments); + Q_UNUSED(workingDirectory); return 0; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kontactinterface-15.08.3/src/pimuniqueapplication.h new/kontactinterface-15.12.0/src/pimuniqueapplication.h --- old/kontactinterface-15.08.3/src/pimuniqueapplication.h 2015-08-31 11:24:03.000000000 +0200 +++ new/kontactinterface-15.12.0/src/pimuniqueapplication.h 2015-11-07 13:17:10.000000000 +0100 @@ -56,10 +56,10 @@ public Q_SLOTS: Q_SCRIPTABLE int newInstance(); - Q_SCRIPTABLE int newInstance(const QByteArray &startupId, const QStringList &arguments); + Q_SCRIPTABLE int newInstance(const QByteArray &startupId, const QStringList &arguments, const QString &workingDirectory); protected: - virtual int activate(const QStringList &arguments); + virtual int activate(const QStringList &arguments, const QString &workingDirectory); private: //@cond PRIVATE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kontactinterface-15.08.3/src/plugin.cpp new/kontactinterface-15.12.0/src/plugin.cpp --- old/kontactinterface-15.08.3/src/plugin.cpp 2015-08-31 11:24:03.000000000 +0200 +++ new/kontactinterface-15.12.0/src/plugin.cpp 2015-11-07 13:17:10.000000000 +0100 @@ -47,7 +47,7 @@ @internal */ //@cond PRIVATE -class Plugin::Private +class Q_DECL_HIDDEN Plugin::Private { public: @@ -169,11 +169,6 @@ return d->part; } -QString Plugin::tipFile() const -{ - return QString(); -} - QString Plugin::registerClient() { if (d->serviceName.isEmpty()) { @@ -287,7 +282,7 @@ QDomElement nextActionElem = actionElem.nextSiblingElement(); if (QString::compare(actionElem.tagName(), QLatin1String("Action"), Qt::CaseInsensitive) == 0) { //qCDebug(KONTACTINTERFACE_LOG) << "Looking at action" << actionElem.attribute("name"); - if (hideActions.contains(actionElem.attribute(QLatin1String("name")))) { + if (hideActions.contains(actionElem.attribute(QStringLiteral("name")))) { //qCDebug(KONTACTINTERFACE_LOG) << "REMOVING"; containerElem.removeChild(actionElem); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kontactinterface-15.08.3/src/plugin.h new/kontactinterface-15.12.0/src/plugin.h --- old/kontactinterface-15.08.3/src/plugin.h 2015-08-31 11:24:03.000000000 +0200 +++ new/kontactinterface-15.12.0/src/plugin.h 2015-11-07 13:17:10.000000000 +0100 @@ -177,13 +177,6 @@ KParts::ReadOnlyPart *part(); /** - * Reimplement this method and return the a path relative to "data" to the tips file. - * The tips file contains hints/tips that are displayed at the beginning of the program - * as "tip of the day". It has nothing to do with tooltips. - */ - virtual QString tipFile() const; - - /** * This function is called when the plugin is selected by the user before the * widget of the KPart belonging to the plugin is raised. */ @@ -330,7 +323,7 @@ /** * Virtual hook for BC extension. */ - virtual void virtual_hook(int id, void *data); + void virtual_hook(int id, void *data) Q_DECL_OVERRIDE; private: //@cond PRIVATE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kontactinterface-15.08.3/src/summary.cpp new/kontactinterface-15.12.0/src/summary.cpp --- old/kontactinterface-15.08.3/src/summary.cpp 2015-08-31 11:24:03.000000000 +0200 +++ new/kontactinterface-15.12.0/src/summary.cpp 2015-11-07 13:17:10.000000000 +0100 @@ -45,7 +45,7 @@ class SummaryMimeData : public QMimeData { public: - virtual bool hasFormat(const QString &format) const + bool hasFormat(const QString &format) const Q_DECL_OVERRIDE { if (format == QLatin1String("application/x-kontact-summary")) { return true; @@ -57,7 +57,7 @@ //@endcond //@cond PRIVATE -class Summary::Private +class Q_DECL_HIDDEN Summary::Private { public: QPoint mDragStartPoint; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kontactinterface-15.08.3/src/uniqueapphandler.cpp new/kontactinterface-15.12.0/src/uniqueapphandler.cpp --- old/kontactinterface-15.08.3/src/uniqueapphandler.cpp 2015-08-31 11:24:03.000000000 +0200 +++ new/kontactinterface-15.12.0/src/uniqueapphandler.cpp 2015-11-07 13:17:10.000000000 +0100 @@ -110,7 +110,7 @@ } // DBUS call -int UniqueAppHandler::newInstance(const QByteArray &asn_id, const QStringList &args) +int UniqueAppHandler::newInstance(const QByteArray &asn_id, const QStringList &args, const QString &workingDirectory) { if (!asn_id.isEmpty()) { KStartupInfo::setStartupId(asn_id); @@ -120,15 +120,16 @@ loadCommandLineOptions(&parser); // implemented by plugin parser.process(args); - return activate(args); + return activate(args, workingDirectory); } static QWidget *s_mainWidget = 0; // Plugin-specific newInstance implementation, called by above method -int KontactInterface::UniqueAppHandler::activate(const QStringList &args) +int KontactInterface::UniqueAppHandler::activate(const QStringList &args, const QString &workingDirectory) { Q_UNUSED(args); + Q_UNUSED(workingDirectory); if (s_mainWidget) { s_mainWidget->show(); @@ -155,7 +156,7 @@ } //@cond PRIVATE -class UniqueAppWatcher::Private +class Q_DECL_HIDDEN UniqueAppWatcher::Private { public: UniqueAppHandlerFactoryBase *mFactory; @@ -204,8 +205,8 @@ if (d->mRunningStandalone) { QObject::connect(QDBusConnection::sessionBus().interface(), - SIGNAL(serviceOwnerChanged(QString,QString,QString)), - this, SLOT(slotApplicationRemoved(QString,QString,QString))); + &QDBusConnectionInterface::serviceOwnerChanged, + this, &UniqueAppWatcher::slotApplicationRemoved); } else { d->mFactory->createHandler(d->mPlugin); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kontactinterface-15.08.3/src/uniqueapphandler.h new/kontactinterface-15.12.0/src/uniqueapphandler.h --- old/kontactinterface-15.08.3/src/uniqueapphandler.h 2015-08-31 11:24:03.000000000 +0200 +++ new/kontactinterface-15.12.0/src/uniqueapphandler.h 2015-11-07 13:17:10.000000000 +0100 @@ -65,11 +65,11 @@ QWidget *mainWidget(); public Q_SLOTS: // DBUS methods - int newInstance(const QByteArray &asn_id, const QStringList &args); + int newInstance(const QByteArray &asn_id, const QStringList &args, const QString &workingDirectory); bool load(); protected: - virtual int activate(const QStringList &args); + virtual int activate(const QStringList &args, const QString &workingDirectory); private: class Private; @@ -93,7 +93,7 @@ template <class T> class UniqueAppHandlerFactory : public UniqueAppHandlerFactoryBase { public: - virtual UniqueAppHandler *createHandler(Plugin *plugin) + UniqueAppHandler *createHandler(Plugin *plugin) Q_DECL_OVERRIDE { plugin->registerClient(); return new T(plugin);
