Hello community, here is the log from the commit of package krunner for openSUSE:Factory checked in at 2014-05-14 20:27:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/krunner (Old) and /work/SRC/openSUSE:Factory/.krunner.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "krunner" Changes: -------- --- /work/SRC/openSUSE:Factory/krunner/krunner.changes 2014-04-02 17:22:35.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.krunner.new/krunner.changes 2014-05-14 20:27:56.000000000 +0200 @@ -1,0 +2,9 @@ +Sun May 4 01:41:22 UTC 2014 - [email protected] + +- Update to 4.99.0 + * API improvements and cleanups + * Buildsystem fixes + * For more details please see: + http://www.kde.org/announcements/announce-frameworks5-beta2.php + +------------------------------------------------------------------- Old: ---- krunner-4.98.0.tar.xz New: ---- krunner-4.99.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ krunner.spec ++++++ --- /var/tmp/diff_new_pack.EAfbfz/_old 2014-05-14 20:27:57.000000000 +0200 +++ /var/tmp/diff_new_pack.EAfbfz/_new 2014-05-14 20:27:57.000000000 +0200 @@ -18,10 +18,10 @@ %define lname libKF5Runner5 Name: krunner -Version: 4.98.0 +Version: 4.99.0 Release: 0 BuildRequires: cmake >= 2.8.12 -BuildRequires: extra-cmake-modules >= 0.0.9 +BuildRequires: extra-cmake-modules >= 0.0.13 BuildRequires: fdupes BuildRequires: kconfig-devel >= %{_kf5_version} BuildRequires: kcoreaddons-devel >= %{_kf5_version} ++++++ krunner-4.98.0.tar.xz -> krunner-4.99.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-4.98.0/CMakeLists.txt new/krunner-4.99.0/CMakeLists.txt --- old/krunner-4.98.0/CMakeLists.txt 2014-03-29 16:49:09.000000000 +0100 +++ new/krunner-4.99.0/CMakeLists.txt 2014-05-04 21:01:40.000000000 +0200 @@ -3,7 +3,7 @@ project(KRunner) # ECM setup -find_package(ECM 0.0.12 REQUIRED NO_MODULE) +find_package(ECM 0.0.13 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) include(FeatureSummary) @@ -15,7 +15,8 @@ include(KDECompilerSettings) include(KDECMakeSettings) -set(KF5_VERSION "4.98.0") +set(KF5_VERSION "4.99.0") # handled by release scripts +set(KF5_DEP_VERSION "4.99.0") # handled by release scripts ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KRUNNER @@ -28,14 +29,14 @@ find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED Gui Quick) -find_package(KF5Config ${KF5_VERSION} REQUIRED) -find_package(KF5CoreAddons ${KF5_VERSION} REQUIRED) -find_package(KF5I18n ${KF5_VERSION} REQUIRED) -find_package(KF5KIO ${KF5_VERSION} REQUIRED) -find_package(KF5Service ${KF5_VERSION} REQUIRED) -find_package(KF5Plasma ${KF5_VERSION} REQUIRED) -find_package(KF5Solid ${KF5_VERSION} REQUIRED) -find_package(KF5ThreadWeaver ${KF5_VERSION} REQUIRED) +find_package(KF5Config ${KF5_DEP_VERSION} REQUIRED) +find_package(KF5CoreAddons ${KF5_DEP_VERSION} REQUIRED) +find_package(KF5I18n ${KF5_DEP_VERSION} REQUIRED) +find_package(KF5KIO ${KF5_DEP_VERSION} REQUIRED) +find_package(KF5Service ${KF5_DEP_VERSION} REQUIRED) +find_package(KF5Plasma ${KF5_DEP_VERSION} REQUIRED) +find_package(KF5Solid ${KF5_DEP_VERSION} REQUIRED) +find_package(KF5ThreadWeaver ${KF5_DEP_VERSION} REQUIRED) # Subdirectories add_subdirectory(src) @@ -63,7 +64,7 @@ NAMESPACE KF5::) install(FILES "${CMAKE_CURRENT_BINARY_DIR}/krunner_version.h" - DESTINATION "${INCLUDE_INSTALL_DIR}" + DESTINATION "${KF5_INCLUDE_INSTALL_DIR}" COMPONENT Devel) feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-4.98.0/KF5RunnerConfig.cmake.in new/krunner-4.99.0/KF5RunnerConfig.cmake.in --- old/krunner-4.98.0/KF5RunnerConfig.cmake.in 2014-03-29 16:49:09.000000000 +0100 +++ new/krunner-4.99.0/KF5RunnerConfig.cmake.in 2014-05-04 21:01:40.000000000 +0200 @@ -1,7 +1,7 @@ @PACKAGE_INIT@ find_dependency(Qt5Core "@REQUIRED_QT_VERSION@") -find_dependency(KF5Plasma "@KF5_VERSION@") +find_dependency(KF5Plasma "@KF5_DEP_VERSION@") include("${CMAKE_CURRENT_LIST_DIR}/KF5RunnerTargets.cmake") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-4.98.0/examples/runner/plasma-runner-example-homefiles.desktop new/krunner-4.99.0/examples/runner/plasma-runner-example-homefiles.desktop --- old/krunner-4.98.0/examples/runner/plasma-runner-example-homefiles.desktop 2014-03-29 16:49:09.000000000 +0100 +++ new/krunner-4.99.0/examples/runner/plasma-runner-example-homefiles.desktop 2014-05-04 21:01:40.000000000 +0200 @@ -11,6 +11,7 @@ Name[fr]=Fichiers personnels Name[hu]=Saját fájlok Name[ia]=Files de domo +Name[it]=File della home Name[ko]=홈 파일 Name[nds]=Tohuus-Dateien Name[nl]=Persoonlijke bestanden @@ -38,6 +39,7 @@ Comment[fr]=Éléments d'un tutoriel montrant comment créer des modules « Runner » Comment[hu]=Egy ismertető része, amely bemutatja, hogyan hozzunk létre Runner bővítményeket Comment[ia]=Parte de un tutorial demonstrante como crear Plugin de Runner +Comment[it]=Partedi una guida che dimostra come creare estensioni di KRunner Comment[ko]=실행기 플러그인을 만드는 튜토리얼의 일부 Comment[nds]=Deel vun en Lehrprogramm dat wiest, wodennig een KRunner-Modulen schrifft. Comment[nl]=Deel van een inleiding die demonstreert hoe Runner-plug-ins te maken diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-4.98.0/krunner.yaml new/krunner-4.99.0/krunner.yaml --- old/krunner-4.98.0/krunner.yaml 2014-03-29 16:49:09.000000000 +0100 +++ new/krunner-4.99.0/krunner.yaml 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -tier: 3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-4.98.0/metainfo.yaml new/krunner-4.99.0/metainfo.yaml --- old/krunner-4.98.0/metainfo.yaml 1970-01-01 01:00:00.000000000 +0100 +++ new/krunner-4.99.0/metainfo.yaml 2014-05-04 21:01:40.000000000 +0200 @@ -0,0 +1,9 @@ +maintainer: vhanda +description: Parallelized query system +tier: 3 +type: solution +platforms: + - name: All +portingAid: true +deprecated: true +release: true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-4.98.0/src/CMakeLists.txt new/krunner-4.99.0/src/CMakeLists.txt --- old/krunner-4.98.0/src/CMakeLists.txt 2014-03-29 16:49:09.000000000 +0100 +++ new/krunner-4.99.0/src/CMakeLists.txt 2014-05-04 21:01:40.000000000 +0200 @@ -12,7 +12,7 @@ generate_export_header(KF5Runner BASE_NAME KRunner) add_library(KF5::Runner ALIAS KF5Runner) -target_include_directories(KF5Runner INTERFACE "$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}/KRunner>") +target_include_directories(KF5Runner INTERFACE "$<INSTALL_INTERFACE:${KF5_INCLUDE_INSTALL_DIR}/KRunner>") target_include_directories(KF5Runner PUBLIC "$<BUILD_INTERFACE:${KRunner_BINARY_DIR};${CMAKE_CURRENT_BINARY_DIR}>") @@ -53,16 +53,16 @@ install(TARGETS KF5Runner EXPORT KF5RunnerTargets - ${INSTALL_TARGETS_DEFAULT_ARGS}) + ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) install(FILES ${KRunner_CamelCase_HEADERS} - DESTINATION ${INCLUDE_INSTALL_DIR}/KRunner/KRunner + DESTINATION ${KF5_INCLUDE_INSTALL_DIR}/KRunner/KRunner COMPONENT Devel) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/krunner_export.h ${KRunner_HEADERS} - DESTINATION ${INCLUDE_INSTALL_DIR}/KRunner/krunner + DESTINATION ${KF5_INCLUDE_INSTALL_DIR}/KRunner/krunner COMPONENT Devel) install(FILES @@ -70,11 +70,6 @@ DESTINATION ${SERVICETYPES_INSTALL_DIR}) include(ECMGeneratePriFile) -ecm_generate_pri_file( - BASE_NAME KRunner - LIB_NAME KF5Runner - DEPS "core" - FILENAME_VAR PRI_FILENAME -) +ecm_generate_pri_file(BASE_NAME KRunner LIB_NAME KF5Runner DEPS "core" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KF5_INCLUDE_INSTALL_DIR}/KRunner) install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-4.98.0/src/data/servicetypes/plasma-runner.desktop new/krunner-4.99.0/src/data/servicetypes/plasma-runner.desktop --- old/krunner-4.98.0/src/data/servicetypes/plasma-runner.desktop 2014-03-29 16:49:09.000000000 +0100 +++ new/krunner-4.99.0/src/data/servicetypes/plasma-runner.desktop 2014-05-04 21:01:40.000000000 +0200 @@ -14,6 +14,7 @@ Comment[fr]=Module externe de KRunner Comment[hu]=KRunner bővítmény Comment[ia]=Plugin de KRunner +Comment[it]=Estensione di KRunner Comment[ko]=KRunner 플러그인 Comment[mr]=KRunner प्लगइन Comment[nds]=KRunner-Moduul diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-4.98.0/src/querymatch.cpp new/krunner-4.99.0/src/querymatch.cpp --- old/krunner-4.98.0/src/querymatch.cpp 2014-03-29 16:49:09.000000000 +0100 +++ new/krunner-4.99.0/src/querymatch.cpp 2014-05-04 21:01:40.000000000 +0200 @@ -77,6 +77,7 @@ QReadWriteLock *lock; QPointer<AbstractRunner> runner; QueryMatch::Type type; + QString matchCategory; QString id; QString text; QString subtext; @@ -129,6 +130,19 @@ return d->type; } +void QueryMatch::setMatchCategory(const QString &category) +{ + d->matchCategory = category; +} + +QString QueryMatch::matchCategory() const +{ + if (d->matchCategory.isEmpty()) { + return d->runner->name(); + } + return d->matchCategory; +} + void QueryMatch::setRelevance(qreal relevance) { d->relevance = qMax(qreal(0.0), relevance); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-4.98.0/src/querymatch.h new/krunner-4.99.0/src/querymatch.h --- old/krunner-4.98.0/src/querymatch.h 2014-03-29 16:49:09.000000000 +0100 +++ new/krunner-4.99.0/src/querymatch.h 2014-05-04 21:01:40.000000000 +0200 @@ -119,6 +119,24 @@ Type type() const; /** + * Sets information about the type of the match which can + * be used to categorize the match. + * + * This string should be translated as it can be displayed + * in an UI + */ + void setMatchCategory(const QString& category); + + /** + * Extra information about the match which can be used + * to categorize the type. + * + * By default this returns the internal name of the runner + * which returned this result + */ + QString matchCategory() const; + + /** * Sets the relevance of this action for the search * it was created for. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-4.98.0/src/runnermanager.cpp new/krunner-4.99.0/src/runnermanager.cpp --- old/krunner-4.98.0/src/runnermanager.cpp 2014-03-29 16:49:09.000000000 +0100 +++ new/krunner-4.99.0/src/runnermanager.cpp 2014-05-04 21:01:40.000000000 +0200 @@ -271,29 +271,25 @@ return 0; } - AbstractRunner *runner = PluginLoader::self()->loadRunner(service->property("X-KDE-PluginInfo-Name", QVariant::String).toString()); + AbstractRunner *runner = 0; - if (runner) { - runner->setParent(q); - } else { - const QString api = service->property("X-Plasma-API").toString(); + const QString api = service->property("X-Plasma-API").toString(); - if (api.isEmpty()) { - QVariantList args; - args << service->storageId(); - if (Plasma::isPluginVersionCompatible(KPluginLoader(*service).pluginVersion())) { - QString error; - runner = service->createInstance<AbstractRunner>(q, args, &error); - if (!runner) { + if (api.isEmpty()) { + QVariantList args; + args << service->storageId(); + if (Plasma::isPluginVersionCompatible(KPluginLoader(*service).pluginVersion())) { + QString error; + runner = service->createInstance<AbstractRunner>(q, args, &error); + if (!runner) { #ifndef NDEBUG - // qDebug() << "Failed to load runner:" << service->name() << ". error reported:" << error; + // qDebug() << "Failed to load runner:" << service->name() << ". error reported:" << error; #endif - } } - } else { - //qDebug() << "got a script runner known as" << api; - runner = new AbstractRunner(service, q); } + } else { + //qDebug() << "got a script runner known as" << api; + runner = new AbstractRunner(service, q); } if (runner) { @@ -654,7 +650,17 @@ KPluginInfo::List RunnerManager::listRunnerInfo(const QString &parentApp) { - return PluginLoader::self()->listRunnerInfo(parentApp); + KPluginInfo::List list; + + QString constraint; + if (parentApp.isEmpty()) { + constraint.append("not exist [X-KDE-ParentApp]"); + } else { + constraint.append("[X-KDE-ParentApp] == '").append(parentApp).append("'"); + } + + KService::List offers = KServiceTypeTrader::self()->query("Plasma/Runner", constraint); + return list + KPluginInfo::fromServices(offers); } void RunnerManager::setupMatchSession() -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
