Hello community, here is the log from the commit of package attica-qt5 for openSUSE:Factory checked in at 2014-08-16 15:41:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-07-10 09:31:15.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.attica-qt5.new/attica-qt5.changes 2014-08-16 15:41:34.000000000 +0200 @@ -1,0 +2,12 @@ +Sat Aug 2 10:19:55 UTC 2014 - [email protected] + +- Update to 5.1.0 + * For more details please see: + http://www.kde.org/announcements/kde-frameworks-5.1.php + +------------------------------------------------------------------- +Sun Jul 27 18:20:05 UTC 2014 - [email protected] + +- Harden required Qt5 libs versions + +------------------------------------------------------------------- Old: ---- attica-5.0.0.tar.xz New: ---- attica-5.1.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ attica-qt5.spec ++++++ --- /var/tmp/diff_new_pack.Mt2lgL/_old 2014-08-16 15:41:35.000000000 +0200 +++ /var/tmp/diff_new_pack.Mt2lgL/_new 2014-08-16 15:41:35.000000000 +0200 @@ -21,7 +21,7 @@ %define _libname KF5Attica Name: attica-qt5 -Version: 5.0.0 +Version: 5.1.0 Release: 0 Summary: Open Collaboration Service client library License: LGPL-2.1+ @@ -30,7 +30,7 @@ Source: %{rname}-%{version}.tar.xz Source99: baselibs.conf BuildRequires: cmake >= 2.8.12 -BuildRequires: extra-cmake-modules >= 1.0.0 +BuildRequires: extra-cmake-modules >= 1.1.0 BuildRequires: fdupes BuildRequires: kf5-filesystem BuildRequires: pkgconfig(Qt5Core) >= 5.2.0 @@ -43,6 +43,8 @@ %package -n lib%{_libname}%{sonum} Summary: Open Collaboration Service client library - development files Group: System/GUI/KDE +%requires_ge libQt5Core5 +%requires_ge libQt5Network5 %description -n lib%{_libname}%{sonum} Attica is a library to access Open Collaboration Service servers. @@ -81,9 +83,7 @@ %{_kf5_libdir}/cmake/KF5Attica/ %{_libqt5_libdir}/lib%{_libname}*.so %{_libqt5_libdir}/pkgconfig/libKF5Attica.pc -%dir %{_kf5_includedir}/Attica -%{_kf5_includedir}/Attica/ -%{_kf5_includedir}/*.h +%{_kf5_includedir}/ %{_kf5_mkspecsdir}/qt_Attica.pri %changelog ++++++ attica-5.0.0.tar.xz -> attica-5.1.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.0.0/CMakeLists.txt new/attica-5.1.0/CMakeLists.txt --- old/attica-5.0.0/CMakeLists.txt 2014-07-01 20:13:07.000000000 +0200 +++ new/attica-5.1.0/CMakeLists.txt 2014-08-02 10:11:03.000000000 +0200 @@ -3,7 +3,7 @@ project(Attica) # ECM setup -find_package(ECM 1.0.0 REQUIRED NO_MODULE) +find_package(ECM 1.1.0 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) include(FeatureSummary) @@ -15,7 +15,7 @@ include(KDEFrameworkCompilerSettings) include(KDECMakeSettings) -set(KF5_VERSION "5.0.0") # handled by release scripts +set(KF5_VERSION "5.1.0") # handled by release scripts ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX ATTICA @@ -40,7 +40,6 @@ #endif(NOT MSVC) add_definitions( -DQT_NO_CAST_FROM_ASCII ) -add_definitions( -DQT_NO_CAST_TO_ASCII ) add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS) # Enable static build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.0.0/src/CMakeLists.txt new/attica-5.1.0/src/CMakeLists.txt --- old/attica-5.0.0/src/CMakeLists.txt 2014-07-01 20:13:07.000000000 +0200 +++ new/attica-5.1.0/src/CMakeLists.txt 2014-08-02 10:11:03.000000000 +0200 @@ -100,9 +100,6 @@ add_library(KF5::Attica ALIAS KF5Attica) -# OUCH? -set_property(TARGET KF5Attica APPEND PROPERTY COMPILE_DEFINITIONS QT_DISABLE_DEPRECATED_BEFORE=0) - target_link_libraries(KF5Attica PUBLIC Qt5::Core diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.0.0/src/provider.cpp new/attica-5.1.0/src/provider.cpp --- old/attica-5.0.0/src/provider.cpp 2014-07-01 20:13:07.000000000 +0200 +++ new/attica-5.1.0/src/provider.cpp 2014-08-02 10:11:03.000000000 +0200 @@ -85,6 +85,7 @@ #include <QNetworkAccessManager> #include <QDebug> #include <QUrl> +#include <QUrlQuery> #include <QNetworkReply> #include <QtCore/QFile> @@ -357,8 +358,10 @@ return 0; } - QUrl url = createUrl(QLatin1String("person/data")); - url.addQueryItem(QLatin1String("name"), name); + QUrl url = createUrl(QStringLiteral("person/data")); + QUrlQuery q(url); + q.addQueryItem(QStringLiteral("name"), name); + url.setQuery(q); return doRequestPersonList(url); } @@ -368,14 +371,16 @@ return 0; } - QUrl url = createUrl(QLatin1String("person/data")); - url.addQueryItem(QLatin1String("latitude"), QString::number(latitude)); - url.addQueryItem(QLatin1String("longitude"), QString::number(longitude)); + QUrl url = createUrl(QStringLiteral("person/data")); + QUrlQuery q(url); + q.addQueryItem(QStringLiteral("latitude"), QString::number(latitude)); + q.addQueryItem(QStringLiteral("longitude"), QString::number(longitude)); if (distance > 0.0) { - url.addQueryItem(QLatin1String("distance"), QString::number(distance)); + q.addQueryItem(QStringLiteral("distance"), QString::number(distance)); } - url.addQueryItem(QLatin1String("page"), QString::number(page)); - url.addQueryItem(QLatin1String("pagesize"), QString::number(pageSize)); + q.addQueryItem(QStringLiteral("page"), QString::number(page)); + q.addQueryItem(QStringLiteral("pagesize"), QString::number(pageSize)); + url.setQuery(q); return doRequestPersonList(url); } @@ -387,8 +392,10 @@ } QUrl url = createUrl(QLatin1String("friend/data/") + id); - url.addQueryItem(QLatin1String("page"), QString::number(page)); - url.addQueryItem(QLatin1String("pagesize"), QString::number(pageSize)); + QUrlQuery q(url); + q.addQueryItem(QLatin1String("page"), QString::number(page)); + q.addQueryItem(QLatin1String("pagesize"), QString::number(pageSize)); + url.setQuery(q); return doRequestPersonList(url); } @@ -399,9 +406,11 @@ return 0; } - QUrl url = createUrl(QLatin1String("friend/sentinvitations")); - url.addQueryItem(QLatin1String("page"), QString::number(page)); - url.addQueryItem(QLatin1String("pagesize"), QString::number(pageSize)); + QUrl url = createUrl(QStringLiteral("friend/sentinvitations")); + QUrlQuery q(url); + q.addQueryItem(QStringLiteral("page"), QString::number(page)); + q.addQueryItem(QStringLiteral("pagesize"), QString::number(pageSize)); + url.setQuery(q); return doRequestPersonList(url); } @@ -412,9 +421,11 @@ return 0; } - QUrl url = createUrl(QLatin1String("friend/receivedinvitations")); - url.addQueryItem(QLatin1String("page"), QString::number(page)); - url.addQueryItem(QLatin1String("pagesize"), QString::number(pageSize)); + QUrl url = createUrl(QStringLiteral("friend/receivedinvitations")); + QUrlQuery q(url); + q.addQueryItem(QStringLiteral("page"), QString::number(page)); + q.addQueryItem(QStringLiteral("pagesize"), QString::number(pageSize)); + url.setQuery(q); return doRequestPersonList(url); } @@ -425,8 +436,10 @@ return 0; } - QUrl url = createUrl(QLatin1String("achievements/content/") + contentId + achievementId); - url.addQueryItem(QLatin1String("user_id"), userId); + QUrl url = createUrl(QStringLiteral("achievements/content/") + contentId + achievementId); + QUrlQuery q(url); + q.addQueryItem(QStringLiteral("user_id"), userId); + url.setQuery(q); return doRequestAchievementList(url); } @@ -968,8 +981,10 @@ return 0; } - QUrl url = createUrl(QLatin1String("message/") + folder.id()); - url.addQueryItem(QLatin1String("status"), QString::number(status)); + QUrl url = createUrl(QStringLiteral("message/") + folder.id()); + QUrlQuery q(url); + q.addQueryItem(QStringLiteral("status"), QString::number(status)); + url.setQuery(q); return doRequestMessageList(url); } @@ -1055,31 +1070,31 @@ return 0; } - QUrl url = createUrl(QLatin1String("content/data")); - + QUrl url = createUrl(QStringLiteral("content/data")); + QUrlQuery q(url); QStringList categoryIds; foreach (const Category &category, categories) { categoryIds.append(category.id()); } - url.addQueryItem(QLatin1String("categories"), categoryIds.join(QLatin1String("x"))); + q.addQueryItem(QStringLiteral("categories"), categoryIds.join(QLatin1String("x"))); QStringList distributionIds; foreach (const Distribution &distribution, distributions) { distributionIds.append(QString(distribution.id())); } - url.addQueryItem(QLatin1String("distribution"), distributionIds.join(QLatin1String(","))); + q.addQueryItem(QStringLiteral("distribution"), distributionIds.join(QLatin1String(","))); QStringList licenseIds; foreach (const License &license, licenses) { licenseIds.append(QString(license.id())); } - url.addQueryItem(QLatin1String("license"), licenseIds.join(QLatin1String(","))); + q.addQueryItem(QStringLiteral("license"), licenseIds.join(QLatin1String(","))); if (!person.isEmpty()) { - url.addQueryItem(QLatin1String("user"), person); + q.addQueryItem(QStringLiteral("user"), person); } - url.addQueryItem(QLatin1String("search"), search); + q.addQueryItem(QStringLiteral("search"), search); QString sortModeString; switch (sortMode) { case Newest: @@ -1097,12 +1112,13 @@ } if (!sortModeString.isEmpty()) { - url.addQueryItem(QLatin1String("sortmode"), sortModeString); + q.addQueryItem(QStringLiteral("sortmode"), sortModeString); } - url.addQueryItem(QLatin1String("page"), QString::number(page)); - url.addQueryItem(QLatin1String("pagesize"), QString::number(pageSize)); + q.addQueryItem(QStringLiteral("page"), QString::number(page)); + q.addQueryItem(QStringLiteral("pagesize"), QString::number(pageSize)); + url.setQuery(q); ListJob<Content> *job = new ListJob<Content>(d->m_internals, createRequest(url)); return job; } @@ -1281,10 +1297,12 @@ return 0; } - QUrl url = createUrl(QLatin1String("fan/data/") + contentId); - url.addQueryItem(QLatin1String("contentid"), contentId); - url.addQueryItem(QLatin1String("page"), QString::number(page)); - url.addQueryItem(QLatin1String("pagesize"), QString::number(pageSize)); + QUrl url = createUrl(QStringLiteral("fan/data/") + contentId); + QUrlQuery q(url); + q.addQueryItem(QStringLiteral("contentid"), contentId); + q.addQueryItem(QStringLiteral("page"), QString::number(page)); + q.addQueryItem(QStringLiteral("pagesize"), QString::number(pageSize)); + url.setQuery(q); ListJob<Person> *job = new ListJob<Person>(d->m_internals, createRequest(url)); return job; } @@ -1295,9 +1313,11 @@ return 0; } - QUrl url = createUrl(QLatin1String("forum/list")); - url.addQueryItem(QLatin1String("page"), QString::number(page)); - url.addQueryItem(QLatin1String("pagesize"), QString::number(pageSize)); + QUrl url = createUrl(QStringLiteral("forum/list")); + QUrlQuery q(url); + q.addQueryItem(QStringLiteral("page"), QString::number(page)); + q.addQueryItem(QStringLiteral("pagesize"), QString::number(pageSize)); + url.setQuery(q); return doRequestForumList(url); } @@ -1308,10 +1328,11 @@ return 0; } - QUrl url = createUrl(QLatin1String("forum/topics/list")); - url.addQueryItem(QLatin1String("forum"), forum); - url.addQueryItem(QLatin1String("search"), search); - url.addQueryItem(QLatin1String("description"), description); + QUrl url = createUrl(QStringLiteral("forum/topics/list")); + QUrlQuery q(url); + q.addQueryItem(QStringLiteral("forum"), forum); + q.addQueryItem(QStringLiteral("search"), search); + q.addQueryItem(QStringLiteral("description"), description); QString sortModeString; switch (mode) { case Newest: @@ -1324,10 +1345,11 @@ break; } if (!sortModeString.isEmpty()) { - url.addQueryItem(QLatin1String("sortmode"), sortModeString); + q.addQueryItem(QStringLiteral("sortmode"), sortModeString); } - url.addQueryItem(QLatin1String("page"), QString::number(page)); - url.addQueryItem(QLatin1String("pagesize"), QString::number(pageSize)); + q.addQueryItem(QStringLiteral("page"), QString::number(page)); + q.addQueryItem(QStringLiteral("pagesize"), QString::number(pageSize)); + url.setQuery(q); return doRequestTopicList(url); } @@ -1373,12 +1395,13 @@ return 0; } - QUrl url = createUrl(QLatin1String("knowledgebase/data")); + QUrl url = createUrl(QStringLiteral("knowledgebase/data")); + QUrlQuery q(url); if (content.isValid()) { - url.addQueryItem(QLatin1String("content"), content.id()); + q.addQueryItem(QStringLiteral("content"), content.id()); } - url.addQueryItem(QLatin1String("search"), search); + q.addQueryItem(QStringLiteral("search"), search); QString sortModeString; switch (sortMode) { case Newest: @@ -1396,11 +1419,12 @@ break; } if (!sortModeString.isEmpty()) { - url.addQueryItem(QLatin1String("sortmode"), sortModeString); + q.addQueryItem(QStringLiteral("sortmode"), sortModeString); } - url.addQueryItem(QLatin1String("page"), QString::number(page)); - url.addQueryItem(QLatin1String("pagesize"), QString::number(pageSize)); + q.addQueryItem(QStringLiteral("page"), QString::number(page)); + q.addQueryItem(QStringLiteral("pagesize"), QString::number(pageSize)); + url.setQuery(q); ListJob<KnowledgeBaseEntry> *job = new ListJob<KnowledgeBaseEntry>(d->m_internals, createRequest(url)); return job; @@ -1422,10 +1446,11 @@ return 0; } - QUrl url = createUrl(QLatin1String("event/data")); + QUrl url = createUrl(QStringLiteral("event/data")); + QUrlQuery q(url); if (!search.isEmpty()) { - url.addQueryItem(QLatin1String("search"), search); + q.addQueryItem(QStringLiteral("search"), search); } QString sortModeString; @@ -1440,17 +1465,18 @@ break; } if (!sortModeString.isEmpty()) { - url.addQueryItem(QLatin1String("sortmode"), sortModeString); + q.addQueryItem(QStringLiteral("sortmode"), sortModeString); } if (!country.isEmpty()) { - url.addQueryItem(QLatin1String("country"), country); + q.addQueryItem(QStringLiteral("country"), country); } - url.addQueryItem(QLatin1String("startat"), startAt.toString(Qt::ISODate)); + q.addQueryItem(QStringLiteral("startat"), startAt.toString(Qt::ISODate)); - url.addQueryItem(QLatin1String("page"), QString::number(page)); - url.addQueryItem(QLatin1String("pagesize"), QString::number(pageSize)); + q.addQueryItem(QStringLiteral("page"), QString::number(page)); + q.addQueryItem(QStringLiteral("pagesize"), QString::number(pageSize)); + url.setQuery(q); ListJob<Event> *job = new ListJob<Event>(d->m_internals, createRequest(url)); return job; @@ -1470,8 +1496,10 @@ QUrl url = createUrl(QLatin1String("comments/data/") + commentTypeString + QLatin1String("/") + id + QLatin1String("/") + id2); - url.addQueryItem(QLatin1String("page"), QString::number(page)); - url.addQueryItem(QLatin1String("pagesize"), QString::number(pageSize)); + QUrlQuery q(url); + q.addQueryItem(QStringLiteral("page"), QString::number(page)); + q.addQueryItem(QStringLiteral("pagesize"), QString::number(pageSize)); + url.setQuery(q); ListJob<Comment> *job = new ListJob<Comment>(d->m_internals, createRequest(url)); return job; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
