Hello community, here is the log from the commit of package attica-qt5 for openSUSE:Factory checked in at 2016-02-24 18:52:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/attica-qt5 (Old) and /work/SRC/openSUSE:Factory/.attica-qt5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "attica-qt5" Changes: -------- --- /work/SRC/openSUSE:Factory/attica-qt5/attica-qt5.changes 2016-01-20 09:39:59.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.attica-qt5.new/attica-qt5.changes 2016-02-24 18:52:36.000000000 +0100 @@ -1,0 +2,8 @@ +Sat Feb 6 17:57:48 UTC 2016 - [email protected] + +- Update to 5.19.0 (boo#967668) + * Simplify attica plugin look-up and initialization + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.19.0.php + +------------------------------------------------------------------- Old: ---- attica-5.18.0.tar.xz New: ---- attica-5.19.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ attica-qt5.spec ++++++ --- /var/tmp/diff_new_pack.L1ThDH/_old 2016-02-24 18:52:37.000000000 +0100 +++ /var/tmp/diff_new_pack.L1ThDH/_new 2016-02-24 18:52:37.000000000 +0100 @@ -19,9 +19,9 @@ %define sonum 5 %define rname attica %define _libname KF5Attica -%define _tar_path 5.18 +%define _tar_path 5.19 Name: attica-qt5 -Version: 5.18.0 +Version: 5.19.0 Release: 0 Summary: Open Collaboration Service client library License: LGPL-2.1+ ++++++ attica-5.18.0.tar.xz -> attica-5.19.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.18.0/CMakeLists.txt new/attica-5.19.0/CMakeLists.txt --- old/attica-5.18.0/CMakeLists.txt 2016-01-01 20:46:30.000000000 +0100 +++ new/attica-5.19.0/CMakeLists.txt 2016-02-06 10:27:29.000000000 +0100 @@ -4,7 +4,7 @@ # ECM setup include(FeatureSummary) -find_package(ECM 5.18.0 NO_MODULE) +find_package(ECM 5.19.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) @@ -15,10 +15,10 @@ include(ECMGenerateHeaders) include(ECMPackageConfigHelpers) # Used to create CMake config files include(KDEInstallDirs) # Used to set installation paths -include(KDEFrameworkCompilerSettings) +include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) include(KDECMakeSettings) -set(KF5_VERSION "5.18.0") # handled by release scripts +set(KF5_VERSION "5.19.0") # handled by release scripts ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX ATTICA @@ -33,14 +33,6 @@ find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED Core Network) set(ATTICA_LIB_SONAME KF5Attica) -set(ATTICA_LIB_SONAME_CAMEL KF5Attica) -set(ATTICA_LIB_NAMESPACE KF5) - -#if(NOT MSVC) - #set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS} -Wall -Wno-switch -O2 -g") - #set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS} -Wall -Wno-switch -O2") - #set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS} -Wall -Wno-switch -g3 -ggdb -O0" CACHE STRING "Debug options." FORCE) -#endif(NOT MSVC) add_definitions( -DQT_NO_CAST_FROM_ASCII ) add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.18.0/autotests/CMakeLists.txt new/attica-5.19.0/autotests/CMakeLists.txt --- old/attica-5.18.0/autotests/CMakeLists.txt 2016-01-01 20:46:30.000000000 +0100 +++ new/attica-5.19.0/autotests/CMakeLists.txt 2016-02-06 10:27:29.000000000 +0100 @@ -5,5 +5,5 @@ ecm_add_tests( persontest.cpp - LINK_LIBRARIES Qt5::Test ${ATTICA_LIB_SONAME} + LINK_LIBRARIES Qt5::Test KF5::Attica ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.18.0/src/accountbalanceparser.cpp new/attica-5.19.0/src/accountbalanceparser.cpp --- old/attica-5.18.0/src/accountbalanceparser.cpp 2016-01-01 20:46:30.000000000 +0100 +++ new/attica-5.19.0/src/accountbalanceparser.cpp 2016-02-06 10:27:29.000000000 +0100 @@ -23,11 +23,7 @@ #include "accountbalanceparser.h" -#if QT_VERSION >= 0x050000 #include <QtCore/QXmlStreamReader> -#else -#include <QtXml/QXmlStreamReader> -#endif // QT_VERSION using namespace Attica; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.18.0/src/downloaditemparser.cpp new/attica-5.19.0/src/downloaditemparser.cpp --- old/attica-5.18.0/src/downloaditemparser.cpp 2016-01-01 20:46:30.000000000 +0100 +++ new/attica-5.19.0/src/downloaditemparser.cpp 2016-02-06 10:27:29.000000000 +0100 @@ -23,11 +23,7 @@ #include "downloaditemparser.h" -#if QT_VERSION >= 0x050000 #include <QtCore/QXmlStreamReader> -#else -#include <QtXml/QXmlStreamReader> -#endif // QT_VERSION using namespace Attica; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.18.0/src/messageparser.h new/attica-5.19.0/src/messageparser.h --- old/attica-5.18.0/src/messageparser.h 2016-01-01 20:46:30.000000000 +0100 +++ new/attica-5.19.0/src/messageparser.h 2016-02-06 10:27:29.000000000 +0100 @@ -24,15 +24,7 @@ #ifndef ATTICA_MESSAGEPARSER_H #define ATTICA_MESSAGEPARSER_H -#ifndef QT_VERSION -#include <QtCore/qglobal.h> -#endif - -#if QT_VERSION >= 0x050000 #include <QtCore/QXmlStreamReader> -#else -#include <QtXml/QXmlStreamReader> -#endif // QT_VERSION #include "message.h" #include "parser.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.18.0/src/providermanager.cpp new/attica-5.19.0/src/providermanager.cpp --- old/attica-5.18.0/src/providermanager.cpp 2016-01-01 20:46:30.000000000 +0100 +++ new/attica-5.19.0/src/providermanager.cpp 2016-02-06 10:27:29.000000000 +0100 @@ -35,11 +35,7 @@ #include <QtNetwork/QAuthenticator> #include <QtNetwork/QNetworkReply> #include <QtNetwork/QNetworkProxy> -#if QT_VERSION >= 0x050000 #include <QtCore/QXmlStreamReader> -#else -#include <QtXml/QXmlStreamReader> -#endif // QT_VERSION #include "platformdependent.h" #include "qtplatformdependent_p.h" @@ -47,13 +43,6 @@ using namespace Attica; -#if QT_VERSION < 0x040700 -uint qHash(const QUrl &key) -{ - return qHash(key.toString()); -} -#endif - class ProviderManager::Private { public: @@ -62,7 +51,6 @@ QHash<QUrl, QList<QString> > m_providerFiles; QSignalMapper m_downloadMapping; QHash<QString, QNetworkReply *> m_downloads; - QPluginLoader m_pluginLoader; bool m_authenticationSuppressed; Private() @@ -78,56 +66,14 @@ PlatformDependent *ProviderManager::loadPlatformDependent(const ProviderFlags &flags) { - // OS specific stuff -#if defined Q_WS_WIN -#define PATH_SEPARATOR ';' -#define LIB_EXTENSION "dll" -#else -#define PATH_SEPARATOR ':' -#define LIB_EXTENSION "so" -#endif - if (flags & ProviderManager::DisablePlugins) { - //qDebug() << "Disabling provider plugins per application request"; return new QtPlatformDependent; } - // use qt plugin dir, if that is not found, fall back to kde plugin path (the old way) - QStringList paths; - paths.append(QCoreApplication::libraryPaths()); - - // old plugin location, required for attica < 0.1.5 - QString program(QLatin1String("kde4-config")); - QStringList arguments; - arguments << QLatin1String("--path") << QLatin1String("lib"); - - QProcess process; - process.start(program, arguments); - process.waitForFinished(); - - /* Try to find the KDE plugin. This can be extended to include other platform specific plugins. */ - paths.append(QString(QLatin1String(process.readAllStandardOutput())).trimmed().split(QLatin1Char(PATH_SEPARATOR))); - //qDebug() << "Plugin paths: " << paths; - - QString pluginName(QLatin1String("attica_kde")); - - foreach (const QString &path, paths) { - QString libraryPath(path + QLatin1Char('/') + pluginName + QLatin1Char('.') + QLatin1String(LIB_EXTENSION)); - //qDebug() << "Trying to load Attica plugin: " << libraryPath; - if (QFile::exists(libraryPath)) { - d->m_pluginLoader.setFileName(libraryPath); - QObject *plugin = d->m_pluginLoader.instance(); - if (plugin) { - PlatformDependent *platformDependent = qobject_cast<PlatformDependent *>(plugin); - if (platformDependent) { - //qDebug() << "Using Attica with KDE support"; - return platformDependent; - } - } - } - } - //qDebug() << "Using Attica without KDE support"; - return new QtPlatformDependent; + QPluginLoader loader(QStringLiteral("attica_kde")); + PlatformDependent * ret = qobject_cast<PlatformDependent *>(loader.instance()); + + return ret ? ret : new QtPlatformDependent; } ProviderManager::ProviderManager(const ProviderFlags &flags) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.18.0/tests/projecttest/CMakeLists.txt new/attica-5.19.0/tests/projecttest/CMakeLists.txt --- old/attica-5.18.0/tests/projecttest/CMakeLists.txt 2016-01-01 20:46:30.000000000 +0100 +++ new/attica-5.19.0/tests/projecttest/CMakeLists.txt 2016-02-06 10:27:29.000000000 +0100 @@ -14,4 +14,4 @@ add_executable(projecttest ${projecttest_SRCS} ${editproject_UI_H}) ecm_mark_as_test(projecttest) -target_link_libraries(projecttest Qt5::Widgets ${ATTICA_LIB_SONAME}) +target_link_libraries(projecttest Qt5::Widgets KF5::Attica)
