Hello community, here is the log from the commit of package kservice for openSUSE:Factory checked in at 2017-04-30 21:20:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kservice (Old) and /work/SRC/openSUSE:Factory/.kservice.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kservice" Sun Apr 30 21:20:54 2017 rev:45 rq:492087 version:5.33.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kservice/kservice.changes 2017-03-28 15:12:20.045600799 +0200 +++ /work/SRC/openSUSE:Factory/.kservice.new/kservice.changes 2017-04-30 21:20:58.133478681 +0200 @@ -1,0 +2,15 @@ +Sat Apr 15 10:11:55 CEST 2017 - [email protected] + +- Update to 5.33.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.33.0.php +- Changes since 5.32.0: + * Upgrade ECM and KF5 version requirements for 5.33.0 release. + * Fix 'Not found: ""' terminal messages + * Upgrade KF5 version to 5.33.0. + * [autotest] Fix the workaround for inotify-on-overlay-fs so it actually works + * [autotest] test s-m-i requirement + * [autotests] add tests for the KService constructors + +------------------------------------------------------------------- Old: ---- kservice-5.32.0.tar.xz New: ---- kservice-5.33.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kservice.spec ++++++ --- /var/tmp/diff_new_pack.HAxLy1/_old 2017-04-30 21:20:59.509284695 +0200 +++ /var/tmp/diff_new_pack.HAxLy1/_new 2017-04-30 21:20:59.513284131 +0200 @@ -17,9 +17,9 @@ %bcond_without lang -%define _tar_path 5.32 +%define _tar_path 5.33 Name: kservice -Version: 5.32.0 +Version: 5.33.0 Release: 0 %define kf5_version %{version} BuildRequires: bison ++++++ kservice-5.32.0.tar.xz -> kservice-5.33.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.32.0/CMakeLists.txt new/kservice-5.33.0/CMakeLists.txt --- old/kservice-5.32.0/CMakeLists.txt 2017-03-04 17:19:56.000000000 +0100 +++ new/kservice-5.33.0/CMakeLists.txt 2017-04-01 21:40:57.000000000 +0200 @@ -1,13 +1,13 @@ cmake_minimum_required(VERSION 3.0) -set(KF5_VERSION "5.32.0") # handled by release scripts -set(KF5_DEP_VERSION "5.32.0") # handled by release scripts +set(KF5_VERSION "5.33.0") # handled by release scripts +set(KF5_DEP_VERSION "5.33.0") # handled by release scripts project(KService VERSION ${KF5_VERSION}) # ECM setup include(FeatureSummary) -find_package(ECM 5.32.0 NO_MODULE) +find_package(ECM 5.33.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) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.32.0/autotests/kservicetest.cpp new/kservice-5.33.0/autotests/kservicetest.cpp --- old/kservice-5.32.0/autotests/kservicetest.cpp 2017-03-04 17:19:56.000000000 +0100 +++ new/kservice-5.33.0/autotests/kservicetest.cpp 2017-04-01 21:40:57.000000000 +0200 @@ -44,6 +44,7 @@ #include <QTimer> #include <QDebug> #include <QLoggingCategory> +#include <QMimeDatabase> QTEST_MAIN(KServiceTest) @@ -271,6 +272,33 @@ QCOMPARE(myService->name(), QStringLiteral("FakePart")); } +void KServiceTest::testConstructorFullPath() +{ + // Requirement: text/html must be a known mimetype + QVERIFY(QMimeDatabase().mimeTypeForName("text/html").isValid()); + const QString fakePart = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QLatin1String("/kservices5/") + "fakepart.desktop"; + QVERIFY(QFile::exists(fakePart)); + KService service(fakePart); + QVERIFY(service.isValid()); + QCOMPARE(service.mimeTypes(), QStringList() << "text/plain" << "text/html"); +} + +void KServiceTest::testConstructorKDesktopFileFullPath() +{ + const QString fakePart = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QLatin1String("/kservices5/") + "fakepart.desktop"; + QVERIFY(QFile::exists(fakePart)); + KDesktopFile desktopFile(fakePart); + KService service(&desktopFile); + QVERIFY(service.isValid()); + QCOMPARE(service.mimeTypes(), QStringList() << "text/plain" << "text/html"); +} + +void KServiceTest::testConstructorKDesktopFile() // as happens inside kbuildsycoca.cpp +{ + KDesktopFile desktopFile(QStandardPaths::GenericDataLocation, "kservices5/fakepart.desktop"); + QCOMPARE(KService(&desktopFile, "kservices5/fakepart.desktop").mimeTypes(), QStringList() << "text/plain" << "text/html"); +} + void KServiceTest::testProperty() { ksycoca_ms_between_checks = 0; @@ -666,6 +694,9 @@ void KServiceTest::testDeletingService() { + // workaround unexplained inotify issue (in CI only...) + QTest::qWait(1000); + const QString serviceName = QStringLiteral("fakeservice_deleteme.desktop"); KService::Ptr fakeService = KService::serviceByDesktopPath(serviceName); QVERIFY(fakeService); // see initTestCase; it should be found. @@ -684,19 +715,11 @@ QVERIFY(fakeService); // the whole point of refcounting is that this KService instance is still valid. QVERIFY(!QFile::exists(servPath)); - // workaround inotify issue (in CI only...) - QTest::qWait(1000); - // Recreate it, for future tests createFakeService(serviceName, QString()); QVERIFY(QFile::exists(servPath)); qDebug() << "executing kbuildsycoca (2)"; -#ifdef Q_OS_UNIX - // Find out filesystem type - system(QByteArray(QByteArray("df -T ") + QFile::encodeName(KSycoca::absoluteFilePath())).constData()); -#endif - runKBuildSycoca(); if (QThread::currentThread() != QCoreApplication::instance()->thread()) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.32.0/autotests/kservicetest.h new/kservice-5.33.0/autotests/kservicetest.h --- old/kservice-5.32.0/autotests/kservicetest.h 2017-03-04 17:19:56.000000000 +0100 +++ new/kservice-5.33.0/autotests/kservicetest.h 2017-04-01 21:40:57.000000000 +0200 @@ -31,6 +31,9 @@ void testKPluginMetaData(); void cleanupTestCase(); void testByName(); + void testConstructorFullPath(); + void testConstructorKDesktopFileFullPath(); + void testConstructorKDesktopFile(); void testProperty(); void testAllServiceTypes(); void testAllServices(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.32.0/src/sycoca/kbuildservicefactory.cpp new/kservice-5.33.0/src/sycoca/kbuildservicefactory.cpp --- old/kservice-5.32.0/src/sycoca/kbuildservicefactory.cpp 2017-03-04 17:19:56.000000000 +0100 +++ new/kservice-5.33.0/src/sycoca/kbuildservicefactory.cpp 2017-04-01 21:40:57.000000000 +0200 @@ -352,7 +352,11 @@ entry->setServiceOffersOffset(offersOffset); offersOffset += offerEntrySize * numOffers; } else { - qWarning() << "Not found:" << stName; + if (stName.isEmpty()) { + qCDebug(SYCOCA) << "Empty service type"; + } else { + qCWarning(SYCOCA) << "Service type not found:" << stName; + } } } }
