Hello community, here is the log from the commit of package krunner for openSUSE:Factory checked in at 2015-01-29 12:49:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-12-21 11:57:09.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.krunner.new/krunner.changes 2015-01-29 12:49:13.000000000 +0100 @@ -1,0 +2,9 @@ +Sat Jan 3 18:03:07 UTC 2015 - hrvoje.sen...@gmail.com + +- Update to 5.6.0 + * Do not detect anything with a '.' as a NetworkLocation + (kde#340140) + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.6.0.php + +------------------------------------------------------------------- Old: ---- krunner-5.5.0.tar.xz New: ---- krunner-5.6.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ krunner.spec ++++++ --- /var/tmp/diff_new_pack.2ZDDpB/_old 2015-01-29 12:49:14.000000000 +0100 +++ /var/tmp/diff_new_pack.2ZDDpB/_new 2015-01-29 12:49:14.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package krunner # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,11 +18,11 @@ %define lname libKF5Runner5 Name: krunner -Version: 5.5.0 +Version: 5.6.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 2.8.12 -BuildRequires: extra-cmake-modules >= 1.5.0 +BuildRequires: extra-cmake-modules >= 1.6.0 BuildRequires: fdupes BuildRequires: kconfig-devel >= %{kf5_version} BuildRequires: kcoreaddons-devel >= %{kf5_version} @@ -40,7 +40,7 @@ License: LGPL-2.1+ Group: System/GUI/KDE Url: http://www.kde.org -Source: http://download.kde.org/stable/frameworks/5.5/portingAids/%{name}-%{version}.tar.xz +Source: http://download.kde.org/stable/frameworks/5.6/portingAids/%{name}-%{version}.tar.xz Source1: baselibs.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ krunner-5.5.0.tar.xz -> krunner-5.6.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.5.0/CMakeLists.txt new/krunner-5.6.0/CMakeLists.txt --- old/krunner-5.5.0/CMakeLists.txt 2014-12-06 13:44:15.000000000 +0100 +++ new/krunner-5.6.0/CMakeLists.txt 2015-01-03 13:13:27.000000000 +0100 @@ -3,7 +3,7 @@ project(KRunner) # ECM setup -find_package(ECM 1.5.0 REQUIRED NO_MODULE) +find_package(ECM 1.6.0 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) include(FeatureSummary) @@ -15,8 +15,8 @@ include(KDECompilerSettings) include(KDECMakeSettings) -set(KF5_VERSION "5.5.0") # handled by release scripts -set(KF5_DEP_VERSION "5.5.0") # handled by release scripts +set(KF5_VERSION "5.6.0") # handled by release scripts +set(KF5_DEP_VERSION "5.6.0") # handled by release scripts ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KRUNNER diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.5.0/autotests/runnercontexttest.cpp new/krunner-5.6.0/autotests/runnercontexttest.cpp --- old/krunner-5.5.0/autotests/runnercontexttest.cpp 2014-12-06 13:44:15.000000000 +0100 +++ new/krunner-5.6.0/autotests/runnercontexttest.cpp 2015-01-03 13:13:27.000000000 +0100 @@ -34,7 +34,8 @@ QTest::newRow("ls man page listing") << "man://ls" << Plasma::RunnerContext::NetworkLocation; } QTest::newRow("http without host") << "http://"; << Plasma::RunnerContext::UnknownType; - QTest::newRow("http with host") << "http://kde.org"; << Plasma::RunnerContext::NetworkLocation; + QTest::newRow("http without host") << "http://"; << Plasma::RunnerContext::UnknownType; + QTest::newRow("ftp with host") << "ftp://kde.org"; << Plasma::RunnerContext::NetworkLocation; QTest::newRow("file double slash") << "file://home" << Plasma::RunnerContext::Directory; QTest::newRow("file triple slash") << "file:///home" << Plasma::RunnerContext::Directory; QTest::newRow("file single slash") << "file:/home" << Plasma::RunnerContext::Directory; @@ -46,6 +47,8 @@ QTest::newRow("full path executable with params") << "/bin/ls -R" << Plasma::RunnerContext::ShellCommand; QTest::newRow("protocol-less path") << "/home" << Plasma::RunnerContext::Directory; QTest::newRow("invalid protocol-less path") << "/bad/path" << Plasma::RunnerContext::UnknownType; + QTest::newRow("calculation") << "5*4" << Plasma::RunnerContext::UnknownType; + QTest::newRow("calculation (float)") << "5.2*4" << Plasma::RunnerContext::UnknownType; } void RunnerContextTest::typeDetection() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.5.0/examples/runner/plasma-runner-example-homefiles.desktop new/krunner-5.6.0/examples/runner/plasma-runner-example-homefiles.desktop --- old/krunner-5.5.0/examples/runner/plasma-runner-example-homefiles.desktop 2014-12-06 13:44:15.000000000 +0100 +++ new/krunner-5.6.0/examples/runner/plasma-runner-example-homefiles.desktop 2015-01-03 13:13:27.000000000 +0100 @@ -11,6 +11,7 @@ Name[es]=Archivos personales Name[fi]=Kodin tiedostot Name[fr]=Fichiers personnels +Name[gd]=Faidhlichean dachaigh Name[gl]=Ficheiros persoais Name[hu]=Saját fájlok Name[ia]=Files de domo @@ -48,6 +49,7 @@ Comment[es]=Parte de un tutorial que demuestra cómo crear complementos de Runner Comment[fi]=Osa tutoriaalia, joka näyttää, miten Runner-liitännäisiä tehdään Comment[fr]=Éléments d'un tutoriel montrant comment créer des modules « Runner » +Comment[gd]=Seo pàirt dhe dh'oideachadh gus sealltainn dhut mar a chruthaicheas tu plugan Runner Comment[gl]=Parte dun tutorial que demostra como crear complementos de 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.5.0/po/ca/plasma_runner_example_homefiles.po new/krunner-5.6.0/po/ca/plasma_runner_example_homefiles.po --- old/krunner-5.5.0/po/ca/plasma_runner_example_homefiles.po 2014-12-06 13:44:15.000000000 +0100 +++ new/krunner-5.6.0/po/ca/plasma_runner_example_homefiles.po 2015-01-03 13:13:27.000000000 +0100 @@ -4,14 +4,14 @@ # version 3 or later versions approved by the membership of KDE e.V. # # Josep Ma. Ferrer <txe...@gmail.com>, 2014. -# Antoni Bella Pérez <antonibel...@orange.es>, 2014. +# Antoni Bella Pérez <antonibel...@yahoo.com>, 2014. msgid "" msgstr "" "Project-Id-Version: plasma_runner_example_homefiles\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2014-04-27 20:56+0000\n" "PO-Revision-Date: 2014-07-28 22:58+0200\n" -"Last-Translator: Antoni Bella Pérez <antonibel...@orange.es>\n" +"Last-Translator: Antoni Bella Pérez <antonibel...@yahoo.com>\n" "Language-Team: Catalan <kde-i18n...@kde.org>\n" "Language: ca\n" "MIME-Version: 1.0\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.5.0/po/gd/plasma_runner_example_homefiles.po new/krunner-5.6.0/po/gd/plasma_runner_example_homefiles.po --- old/krunner-5.5.0/po/gd/plasma_runner_example_homefiles.po 1970-01-01 01:00:00.000000000 +0100 +++ new/krunner-5.6.0/po/gd/plasma_runner_example_homefiles.po 2015-01-03 13:13:27.000000000 +0100 @@ -0,0 +1,34 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR This_file_is_part_of_KDE +# This file is distributed under the same license as the PACKAGE package. +# GunChleoc <f...@foramnagaidhlig.net>, 2014. +msgid "" +msgstr "" +"Project-Id-Version: plasma_runner_example_homefiles\n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n"; +"POT-Creation-Date: 2014-04-27 20:56+0000\n" +"PO-Revision-Date: 2014-12-09 12:16+0100\n" +"Last-Translator: GunChleoc <f...@foramnagaidhlig.net>\n" +"Language-Team: Fòram na Gàidhlig\n" +"Language: gd\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=4; plural=(n==1 || n==11) ? 0 : (n==2 || n==12) ? 1 : " +"(n > 2 && n < 20) ? 2 : 3;\n" +"X-Generator: Virtaal 0.7.1\n" +"X-Project-Style: kde\n" + +#: homefilesrunner.cpp:71 +#, kde-format +msgid "Finds files matching :q: in the %1 folder" +msgstr "Lorg faidhlichean a cho-fhreagras ri :q: sa phasgan %1" + +#: homefilesrunner.cpp:116 +#, kde-format +msgid "Open %1" +msgstr "Fosgail %1" + +#: homefilesrunner.cpp:157 +msgid "This is just for show" +msgstr "Chan e ach taisbeanadh a th' ann" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.5.0/po/zh_CN/plasma_runner_example_homefiles.po new/krunner-5.6.0/po/zh_CN/plasma_runner_example_homefiles.po --- old/krunner-5.5.0/po/zh_CN/plasma_runner_example_homefiles.po 2014-12-06 13:44:15.000000000 +0100 +++ new/krunner-5.6.0/po/zh_CN/plasma_runner_example_homefiles.po 2015-01-03 13:13:27.000000000 +0100 @@ -7,7 +7,7 @@ "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2014-04-27 20:56+0000\n" -"PO-Revision-Date: 2014-07-16 15:20-0400\n" +"PO-Revision-Date: 2014-12-18 17:05-0800\n" "Last-Translator: Weng Xuetian <wen...@gmail.com>\n" "Language-Team: Chinese Simplified <kde-i18n-...@kde.org>\n" "Language: zh_CN\n" @@ -20,7 +20,7 @@ #: homefilesrunner.cpp:71 #, kde-format msgid "Finds files matching :q: in the %1 folder" -msgstr "" +msgstr "查找匹配 %1 文件夹中匹配 :q: 的文件" #: homefilesrunner.cpp:116 #, kde-format @@ -29,4 +29,4 @@ #: homefilesrunner.cpp:157 msgid "This is just for show" -msgstr "" +msgstr "仅用于显示" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.5.0/src/abstractrunner.cpp new/krunner-5.6.0/src/abstractrunner.cpp --- old/krunner-5.5.0/src/abstractrunner.cpp 2014-12-06 13:44:15.000000000 +0100 +++ new/krunner-5.6.0/src/abstractrunner.cpp 2015-01-03 13:13:27.000000000 +0100 @@ -217,6 +217,7 @@ void AbstractRunner::createRunOptions(QWidget *parent) { + Q_UNUSED(parent); } AbstractRunner::Speed AbstractRunner::speed() const @@ -262,6 +263,8 @@ void AbstractRunner::run(const Plasma::RunnerContext &search, const Plasma::QueryMatch &action) { + Q_UNUSED(search); + Q_UNUSED(action); } QStringList AbstractRunner::categories() const @@ -274,7 +277,7 @@ return icon(); } -void AbstractRunner::match(Plasma::RunnerContext &search) +void AbstractRunner::match(Plasma::RunnerContext &) { } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.5.0/src/data/servicetypes/plasma-runner.desktop new/krunner-5.6.0/src/data/servicetypes/plasma-runner.desktop --- old/krunner-5.5.0/src/data/servicetypes/plasma-runner.desktop 2014-12-06 13:44:15.000000000 +0100 +++ new/krunner-5.6.0/src/data/servicetypes/plasma-runner.desktop 2015-01-03 13:13:27.000000000 +0100 @@ -13,6 +13,7 @@ Comment[es]=Complemento para KRunner Comment[fi]=KRunner-liitännäinen Comment[fr]=Module externe de KRunner +Comment[gd]=Plugan KRunner Comment[gl]=Complemento KRunner Comment[hu]=KRunner bővítmény Comment[ia]=Plugin de KRunner diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.5.0/src/querymatch.cpp new/krunner-5.6.0/src/querymatch.cpp --- old/krunner-5.5.0/src/querymatch.cpp 2014-12-06 13:44:15.000000000 +0100 +++ new/krunner-5.6.0/src/querymatch.cpp 2015-01-03 13:13:27.000000000 +0100 @@ -53,7 +53,7 @@ : QSharedData(other), lock(new QReadWriteLock(QReadWriteLock::Recursive)) { - QReadLocker lock(other.lock); + QReadLocker l(other.lock); runner = other.runner; type = other.type; relevance = other.relevance; @@ -138,7 +138,7 @@ QString QueryMatch::matchCategory() const { - if (d->matchCategory.isEmpty()) { + if (d->matchCategory.isEmpty() && d->runner) { return d->runner->name(); } return d->matchCategory; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.5.0/src/runnercontext.cpp new/krunner-5.6.0/src/runnercontext.cpp --- old/krunner-5.5.0/src/runnercontext.cpp 2014-12-06 13:44:15.000000000 +0100 +++ new/krunner-5.6.0/src/runnercontext.cpp 2015-01-03 13:13:27.000000000 +0100 @@ -198,10 +198,14 @@ RunnerContext::Executable; } else { QUrl url = QUrl::fromUserInput(term); - // check for a normal URL first - //qDebug() << url << KProtocolInfo::protocolClass(url.scheme()) << url.hasHost() << - // url.host() << url.isLocalFile() << path << path.indexOf('/'); - const bool hasProtocol = !url.scheme().isEmpty() && (url.scheme() != "http" || term.contains('.')); + // QUrl::fromUserInput assigns http to everything if it cannot match it to + // anything else. We do not want that. + if (url.scheme() == QStringLiteral("http")) { + if (!term.startsWith(QStringLiteral("http"))) { + url.setScheme(QString()); + } + } + const bool hasProtocol = !url.scheme().isEmpty(); const bool isLocalProtocol = KProtocolInfo::protocolClass(url.scheme()) == ":local"; if (hasProtocol && ((!isLocalProtocol && !url.host().isEmpty()) || diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.5.0/src/runnerjobs.cpp new/krunner-5.6.0/src/runnerjobs.cpp --- old/krunner-5.5.0/src/runnerjobs.cpp 2014-12-06 13:44:15.000000000 +0100 +++ new/krunner-5.6.0/src/runnerjobs.cpp 2015-01-03 13:13:27.000000000 +0100 @@ -121,7 +121,7 @@ //////////////////// FindMatchesJob::FindMatchesJob(Plasma::AbstractRunner *runner, - Plasma::RunnerContext *context, QObject *parent) + Plasma::RunnerContext *context, QObject *) : ThreadWeaver::Job(), m_context(*context, 0), m_runner(runner), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.5.0/src/runnermanager.cpp new/krunner-5.6.0/src/runnermanager.cpp --- old/krunner-5.5.0/src/runnermanager.cpp 2014-12-06 13:44:15.000000000 +0100 +++ new/krunner-5.6.0/src/runnermanager.cpp 2015-01-03 13:13:27.000000000 +0100 @@ -448,7 +448,6 @@ KConfigGroup conf; QStringList enabledCategories; QString singleModeRunnerId; - bool loadAll : 1; bool prepped : 1; bool allRunnersPrepped : 1; bool singleRunnerPrepped : 1; -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
