Hello community, here is the log from the commit of package kcmutils for openSUSE:Factory checked in at 2014-11-11 01:10:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kcmutils (Old) and /work/SRC/openSUSE:Factory/.kcmutils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kcmutils" Changes: -------- --- /work/SRC/openSUSE:Factory/kcmutils/kcmutils.changes 2014-10-07 16:00:51.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kcmutils.new/kcmutils.changes 2014-11-11 01:10:30.000000000 +0100 @@ -1,0 +2,8 @@ +Sun Nov 2 17:47:51 UTC 2014 - hrvoje.sen...@gmail.com + +- Update to 5.4.0 + * Fix KPluginSelector not adding non .desktop file plugins + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.4.0.php + +------------------------------------------------------------------- Old: ---- kcmutils-5.3.0.tar.xz New: ---- kcmutils-5.4.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kcmutils.spec ++++++ --- /var/tmp/diff_new_pack.S7ZNqe/_old 2014-11-11 01:10:32.000000000 +0100 +++ /var/tmp/diff_new_pack.S7ZNqe/_new 2014-11-11 01:10:32.000000000 +0100 @@ -18,11 +18,11 @@ %define lname libKF5KCMUtils5 Name: kcmutils -Version: 5.3.0 +Version: 5.4.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 2.8.12 -BuildRequires: extra-cmake-modules >= 1.3.0 +BuildRequires: extra-cmake-modules >= 1.4.0 BuildRequires: fdupes BuildRequires: kconfigwidgets-devel >= %{kf5_version} BuildRequires: kcoreaddons-devel >= %{kf5_version} @@ -38,7 +38,7 @@ License: LGPL-2.1+ Group: System/GUI/KDE Url: http://www.kde.org -Source: http://download.kde.org/stable/frameworks/%{version}/%{name}-%{version}.tar.xz +Source: http://download.kde.org/stable/frameworks/5.4/%{name}-%{version}.tar.xz Source1: baselibs.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ kcmutils-5.3.0.tar.xz -> kcmutils-5.4.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcmutils-5.3.0/CMakeLists.txt new/kcmutils-5.4.0/CMakeLists.txt --- old/kcmutils-5.3.0/CMakeLists.txt 2014-10-04 18:58:24.000000000 +0200 +++ new/kcmutils-5.4.0/CMakeLists.txt 2014-11-02 13:06:00.000000000 +0100 @@ -2,7 +2,7 @@ project(KCMUtils) -find_package(ECM 1.3.0 REQUIRED NO_MODULE) +find_package(ECM 1.4.0 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) @@ -19,8 +19,8 @@ include(ECMGenerateHeaders) include(ECMPackageConfigHelpers) -set(KF5_VERSION "5.3.0") # handled by release scripts -set(KF5_DEP_VERSION "5.3.0") # handled by release scripts +set(KF5_VERSION "5.4.0") # handled by release scripts +set(KF5_DEP_VERSION "5.4.0") # handled by release scripts ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KCMUTILS VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kcmutils_version.h" PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5KCMUtilsConfigVersion.cmake" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcmutils-5.3.0/po/fi/kcmutils5.po new/kcmutils-5.4.0/po/fi/kcmutils5.po --- old/kcmutils-5.3.0/po/fi/kcmutils5.po 2014-10-04 18:58:24.000000000 +0200 +++ new/kcmutils-5.4.0/po/fi/kcmutils5.po 2014-11-02 13:06:00.000000000 +0100 @@ -27,9 +27,9 @@ "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2014-08-08 08:33+0000\n" -"PO-Revision-Date: 2014-04-07 21:44+0300\n" +"PO-Revision-Date: 2014-10-19 17:16+0300\n" "Last-Translator: Lasse Liehu <lasse.li...@gmail.com>\n" -"Language-Team: Finnish <kde-i18n-...@kde.org>\n" +"Language-Team: Finnish <lokalisoi...@lists.coss.fi>\n" "Language: fi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -381,7 +381,7 @@ "for further information" msgstr "" "Tehtiin automaattisia päivityksiä johtuen liitännäisen vaatimuksista. " -"Napsauta tästä saadaksesi lisätietoja" +"Napsauta tästä saadaksesi lisätietoa" #: kpluginselector.cpp:208 msgid "" @@ -443,7 +443,7 @@ msgctxt "Used only for plugins" msgid "About %1" msgstr "" -"Tietoja liitännäisestä %1|/|Tietoja liitännäisestä $[yleisnimi_pienellä %1]" +"Tietoa liitännäisestä %1|/|Tietoa liitännäisestä $[yleisnimi_pienellä %1]" #: ksettings/componentsdialog.cpp:55 msgid "Select Components" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcmutils-5.3.0/po/it/kcmutils5.po new/kcmutils-5.4.0/po/it/kcmutils5.po --- old/kcmutils-5.3.0/po/it/kcmutils5.po 2014-10-04 18:58:24.000000000 +0200 +++ new/kcmutils-5.4.0/po/it/kcmutils5.po 2014-11-02 13:06:00.000000000 +0100 @@ -8,8 +8,9 @@ # Luciano Montanaro <mikel...@cirulla.net>, 2007. # Dario Panico <dareus_persarum...@fastwebnet.it>, 2008. # Pino Toscano <toscano.p...@tiscali.it>, 2008. -# Federico Zenith <federico.zen...@member.fsf.org>, 2008, 2012, 2013. +# Federico Zenith <federico.zen...@member.fsf.org>, 2008, 2012, 2013, 2014. # Innocenzo Ventre <innocenzo.ven...@gmail.com>, 2012. +# Vincenzo Reale <smart2...@baslug.org>, 2014. msgid "" msgstr "" "Project-Id-Version: kdelibs4\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcmutils-5.3.0/po/nn/kcmutils5.po new/kcmutils-5.4.0/po/nn/kcmutils5.po --- old/kcmutils-5.3.0/po/nn/kcmutils5.po 2014-10-04 18:58:24.000000000 +0200 +++ new/kcmutils-5.4.0/po/nn/kcmutils5.po 2014-11-02 13:06:00.000000000 +0100 @@ -2,7 +2,7 @@ # # Gaute Hvoslef Kvalnes <ga...@verdsveven.com>, 2003, 2004, 2005, 2006. # Håvard Korsvoll <korsv...@skulelinux.no>, 2003, 2005. -# Karl Ove Hufthammer <k...@huftis.org>, 2004, 2007, 2008, 2009, 2010, 2011, 2012, 2013. +# Karl Ove Hufthammer <k...@huftis.org>, 2004, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014. # Eirik U. Birkeland <eir...@gmail.com>, 2008, 2009, 2010. msgid "" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcmutils-5.3.0/src/kcmultidialog.cpp new/kcmutils-5.4.0/src/kcmultidialog.cpp --- old/kcmutils-5.3.0/src/kcmultidialog.cpp 2014-10-04 18:58:24.000000000 +0200 +++ new/kcmutils-5.4.0/src/kcmultidialog.cpp 2014-11-02 13:06:00.000000000 +0100 @@ -369,7 +369,7 @@ } } - QUrl docUrl = QUrl(QStringLiteral("help:/")).resolved(QUrl::fromUserInput(docPath)); // same code as in KHelpClient::invokeHelp + QUrl docUrl = QUrl(QStringLiteral("help:/")).resolved(QUrl(docPath)); // same code as in KHelpClient::invokeHelp if (docUrl.scheme() == QLatin1String("help") || docUrl.scheme() == QLatin1String("man") || docUrl.scheme() == QLatin1String("info")) { QProcess::startDetached(QStringLiteral("khelpcenter"), QStringList() << docUrl.toString()); } else { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcmutils-5.3.0/src/kpluginselector_p.h new/kcmutils-5.4.0/src/kpluginselector_p.h --- old/kcmutils-5.3.0/src/kpluginselector_p.h 2014-10-04 18:58:24.000000000 +0200 +++ new/kcmutils-5.4.0/src/kpluginselector_p.h 2014-11-02 13:06:00.000000000 +0100 @@ -96,7 +96,10 @@ bool operator==(const PluginEntry &pe) const { - return pluginInfo.entryPath() == pe.pluginInfo.entryPath(); + // just comparing the entry path is not enough, since it is now also possible + // to load the plugin information directly from a library (without .desktop files) + return pluginInfo.entryPath() == pe.pluginInfo.entryPath() + && pluginInfo.libraryPath() == pe.pluginInfo.libraryPath(); } }; -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
