Hello community, here is the log from the commit of package kcmutils for openSUSE:Factory checked in at 2014-04-02 17:21:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-03-10 12:17:56.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kcmutils.new/kcmutils.changes 2014-04-02 17:21:51.000000000 +0200 @@ -1,0 +2,9 @@ +Sat Mar 29 19:47:22 UTC 2014 - hrvoje.sen...@gmail.com + +- Update to 4.98.0 + * API improvements and cleanups + * Buildsystem fixes + * For more details please see: + http://www.kde.org/announcements/announce-frameworks5-beta1.php + +------------------------------------------------------------------- Old: ---- kcmutils-4.97.0.tar.xz New: ---- kcmutils-4.98.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kcmutils.spec ++++++ --- /var/tmp/diff_new_pack.7kkOL7/_old 2014-04-02 17:21:51.000000000 +0200 +++ /var/tmp/diff_new_pack.7kkOL7/_new 2014-04-02 17:21:51.000000000 +0200 @@ -18,10 +18,10 @@ %define lname libKF5KCMUtils5 Name: kcmutils -Version: 4.97.0 +Version: 4.98.0 Release: 0 BuildRequires: cmake >= 2.8.12 -BuildRequires: extra-cmake-modules >= 0.0.11 +BuildRequires: extra-cmake-modules >= 0.0.12 BuildRequires: fdupes BuildRequires: kconfigwidgets-devel >= %{_kf5_version} BuildRequires: kcoreaddons-devel >= %{_kf5_version} ++++++ kcmutils-4.97.0.tar.xz -> kcmutils-4.98.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcmutils-4.97.0/CMakeLists.txt new/kcmutils-4.98.0/CMakeLists.txt --- old/kcmutils-4.97.0/CMakeLists.txt 2014-03-01 12:50:11.000000000 +0100 +++ new/kcmutils-4.98.0/CMakeLists.txt 2014-03-28 19:16:10.000000000 +0100 @@ -2,7 +2,7 @@ project(KCMUtils) -find_package(ECM 0.0.11 REQUIRED NO_MODULE) +find_package(ECM 0.0.12 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) @@ -11,7 +11,7 @@ include(KDECMakeSettings) set(REQUIRED_QT_VERSION "5.2.0") -find_package(Qt5 ${QT_REQUIRED_VERSION} NO_MODULE REQUIRED Widgets DBus) +find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED Widgets DBus) include(FeatureSummary) include(GenerateExportHeader) @@ -19,7 +19,7 @@ include(ECMGenerateHeaders) include(ECMPackageConfigHelpers) -set(KF5_VERSION "4.97.0") +set(KF5_VERSION "4.98.0") 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-4.97.0/TODO new/kcmutils-4.98.0/TODO --- old/kcmutils-4.97.0/TODO 2014-03-01 12:50:11.000000000 +0100 +++ new/kcmutils-4.98.0/TODO 1970-01-01 01:00:00.000000000 +0100 @@ -1,25 +0,0 @@ - -This is a list of random changes to do in KDE 4 with the various KCM* classes. - -* KCModuleinfo; - - Make it inherit KService; saves a lot of code, simplifies ctors/overloads in surrounding classes - - Implement docPath in KService - - Get rid of loadAll() and do lazy loading in each getter - -* Merge KCModuleProxy and its DCOP Object class(MI) - -* Get rid of `QStringlist arguments` in KCModule and all the helper classes(simplify API) - -* Move stuff to d pointers.. Too much hackish solutions otherwise - -* Get rid of bool fallback argument in helper classes(never fails, simplify API) - -* Re-implement the QScrollView(d->view) in KCModuleProxy; the protection against violation of HIG-clause. It needs kde-core-devel approval. - -* The API in KCModule, KCModuleProxy, and the various desktop entries, concerning root loading are butt ugly. It needs cleaning and simplification. - -* There's big confusion regarding /when/ the changed(bool) signal should be emitted, abd by /whom/. This can't be fixed properly in 3.x since it means breaking behavior. In KDE 4 it must be made clear if KCModuleProxy should take care of emitting appropriate signals for load()/save()/defaults, or if modules manually should handle it(is there a reason?). - -* Root modules in KCModuleProxy doesn't support D&D, or it is perhaps implemented in QXEmbed? Anyway, this is what the XEmbed Protocol Specification says: - -Solving the drag-and-drop problem, however, is quite easy, since the XDND protocol was carefully designed in a way that makes it possible to support embedded windows. Basically, the embedder has to operate as drag-and-drop proxy for the client. Any XDND messages like XdndEnter, Xdnd,Leave, etc. simply have to be passed through. A toolkit's XDND implementation has to take this situation in consideration. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcmutils-4.97.0/src/Messages.sh new/kcmutils-4.98.0/src/Messages.sh --- old/kcmutils-4.97.0/src/Messages.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/kcmutils-4.98.0/src/Messages.sh 2014-03-28 19:16:10.000000000 +0100 @@ -0,0 +1,18 @@ +#!/bin/sh + +# Invoke the extractrc script on all .ui, .rc, and .kcfg files in the sources. +# The results are stored in a pseudo .cpp file to be picked up by xgettext. +lst=`find . -name \*.rc -o -name \*.ui -o -name \*.kcfg` +if [ -n "$lst" ] ; then + $EXTRACTRC $lst >> rc.cpp +fi + +# If your framework contains tips-of-the-day, call preparetips as well. +if [ -f "data/tips" ] ; then + ( cd data && $PREPARETIPS > ../tips.cpp ) +fi + +# Extract strings from all source files. +# If your framework depends on KI18n, use $XGETTEXT. If it uses Qt translation +# system, use $EXTRACT_TR_STRINGS. +$XGETTEXT `find . -name \*.cpp -o -name \*.h -name \*.qml` -o $podir/kcmutils5.pot diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcmutils-4.97.0/src/kcmodulecontainer.cpp new/kcmutils-4.98.0/src/kcmodulecontainer.cpp --- old/kcmutils-4.97.0/src/kcmodulecontainer.cpp 2014-03-01 12:50:11.000000000 +0100 +++ new/kcmutils-4.98.0/src/kcmodulecontainer.cpp 2014-03-28 19:16:10.000000000 +0100 @@ -30,6 +30,8 @@ #include <QDebug> #include <kservice.h> +typedef QList<KCModuleProxy *> ModuleList; + /***********************************************************************/ class KCModuleContainer::KCModuleContainerPrivate { @@ -45,6 +47,17 @@ KCModule::Buttons buttons; QVBoxLayout *topLayout; + /** + * A list containing KCModuleProxy objects which + * have changed and must be saved. + */ + ModuleList changedModules; + + /** + * A list of all modules which are encapsulated. + */ + ModuleList allModules; + }; /***********************************************************************/ @@ -100,7 +113,7 @@ } KCModuleProxy *proxy = new KCModuleProxy(service, d->tabWidget); - allModules.append(proxy); + d->allModules.append(proxy); proxy->setObjectName(module); @@ -125,7 +138,7 @@ void KCModuleContainer::save() { - ModuleList list = changedModules; + ModuleList list = d->changedModules; ModuleList::iterator it; for (it = list.begin(); it != list.end(); ++it) { (*it)->save(); @@ -137,7 +150,7 @@ void KCModuleContainer::load() { - ModuleList list = allModules; + ModuleList list = d->allModules; ModuleList::iterator it; for (it = list.begin(); it != list.end(); ++it) { (*it)->load(); @@ -148,7 +161,7 @@ void KCModuleContainer::defaults() { - ModuleList list = allModules; + ModuleList list = d->allModules; ModuleList::iterator it; for (it = list.begin(); it != list.end(); ++it) { (*it)->defaults(); @@ -159,8 +172,8 @@ void KCModuleContainer::moduleChanged(KCModuleProxy *proxy) { - changedModules.append(proxy); - if (changedModules.isEmpty()) { + d->changedModules.append(proxy); + if (d->changedModules.isEmpty()) { return; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcmutils-4.97.0/src/kcmodulecontainer.h new/kcmutils-4.98.0/src/kcmodulecontainer.h --- old/kcmutils-4.97.0/src/kcmodulecontainer.h 2014-03-01 12:50:11.000000000 +0100 +++ new/kcmutils-4.98.0/src/kcmodulecontainer.h 2014-03-28 19:16:10.000000000 +0100 @@ -95,36 +95,19 @@ virtual ~KCModuleContainer(); /** - * Reimplemented for internal purposes. - * @internal + * @reimp */ - void save(); + void save() Q_DECL_OVERRIDE; /** - * Reimplemented for internal purposes. - * @internal + * @reimp */ - void load(); + void load() Q_DECL_OVERRIDE; /** - * Reimplemented for internal purposes. - * @internal + * @reimp */ - void defaults(); - -protected: - typedef QList<KCModuleProxy *> ModuleList; - - /** - * A list containing KCModuleProxy objects which - * have changed and must be saved. - */ - ModuleList changedModules; - - /** - * A list of all modules which are encapsulated. - */ - ModuleList allModules; // KDE 4 put in the Private class and abstract with getter + void defaults() Q_DECL_OVERRIDE; private Q_SLOTS: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcmutils-4.97.0/src/kcmoduleloader.cpp new/kcmutils-4.98.0/src/kcmoduleloader.cpp --- old/kcmutils-4.97.0/src/kcmoduleloader.cpp 2014-03-01 12:50:11.000000000 +0100 +++ new/kcmutils-4.98.0/src/kcmoduleloader.cpp 2014-03-28 19:16:10.000000000 +0100 @@ -26,8 +26,8 @@ #include <QtCore/QFile> #include <QLabel> #include <QLayout> +#include <QLibrary> -#include <klibrary.h> #include <kpluginloader.h> #include <QDebug> #include <klocalizedstring.h> @@ -93,12 +93,12 @@ //#ifndef NDEBUG { // get the create_ function - KLibrary lib(mod.library()); + QLibrary lib(KPluginLoader::findPlugin(mod.library())); if (lib.load()) { KCModule *(*create)(QWidget *, const char *); QByteArray factorymethod("create_"); factorymethod += mod.handle().toLatin1(); - create = reinterpret_cast<KCModule *(*)(QWidget *, const char *)>(lib.resolveFunction(factorymethod.constData())); + create = reinterpret_cast<KCModule *(*)(QWidget *, const char *)>(lib.resolve(factorymethod.constData())); if (create) { return create(parent, mod.handle().toLatin1().constData()); qFatal("This module still uses a custom factory method (%s). This is not supported anymore. Please fix the module.", factorymethod.constData()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcmutils-4.97.0/src/kcmoduleproxy.cpp new/kcmutils-4.98.0/src/kcmoduleproxy.cpp --- old/kcmutils-4.97.0/src/kcmoduleproxy.cpp 2014-03-01 12:50:11.000000000 +0100 +++ new/kcmutils-4.98.0/src/kcmoduleproxy.cpp 2014-03-28 19:16:10.000000000 +0100 @@ -296,16 +296,6 @@ return KCModule::Buttons(KCModule::Help | KCModule::Default | KCModule::Apply); } -QString KCModuleProxy::rootOnlyMessage() const -{ - return realModule() ? realModule()->rootOnlyMessage() : QString(); -} - -bool KCModuleProxy::useRootOnlyMessage() const -{ - return realModule() ? realModule()->useRootOnlyMessage() : true; -} - bool KCModuleProxy::changed() const { Q_D(const KCModuleProxy); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcmutils-4.97.0/src/kcmoduleproxy.h new/kcmutils-4.98.0/src/kcmoduleproxy.h --- old/kcmutils-4.97.0/src/kcmoduleproxy.h 2014-03-01 12:50:11.000000000 +0100 +++ new/kcmutils-4.98.0/src/kcmoduleproxy.h 2014-03-28 19:16:10.000000000 +0100 @@ -140,23 +140,6 @@ KCModule::Buttons buttons() const; /** - * @return The module's custom root - * message, if it has one - * @deprecated - */ - QString rootOnlyMessage() const; - //KDE4 remove. There's a limit for convenience functions, - // this one's available via realModule()-> - - /** - * @return If the module is a root module. - * @deprecated - */ - bool useRootOnlyMessage() const; - //KDE4 remove. There's a limit for convenience functions, - // this one's available via realModule()-> - - /** * @return true if the module is modified * and needs to be saved. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcmutils-4.97.0/src/kcmultidialog.cpp new/kcmutils-4.98.0/src/kcmultidialog.cpp --- old/kcmutils-4.97.0/src/kcmultidialog.cpp 2014-03-01 12:50:11.000000000 +0100 +++ new/kcmutils-4.98.0/src/kcmultidialog.cpp 2014-03-28 19:16:10.000000000 +0100 @@ -419,8 +419,12 @@ // qDebug() << moduleInfo.moduleName(); KPageWidgetItem *item = new KPageWidgetItem(kcm, moduleInfo.moduleName()); - if (kcm->useRootOnlyMessage()) { - item->setHeader(QStringLiteral("<b>") + moduleInfo.comment() + QStringLiteral("</b><br><i>") + kcm->rootOnlyMessage() + QStringLiteral("</i>")); + if (kcm->realModule() && kcm->realModule()->useRootOnlyMessage()) { + item->setHeader(QStringLiteral("<b>") + + moduleInfo.comment() + + QStringLiteral("</b><br><i>") + + kcm->realModule()->rootOnlyMessage() + + QStringLiteral("</i>")); item->setIcon(KDE::icon(moduleInfo.icon(), QStringList() << QStringLiteral("dialog-warning"))); } else { item->setHeader(moduleInfo.comment()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcmutils-4.97.0/src/kpluginselector.cpp new/kcmutils-4.98.0/src/kpluginselector.cpp --- old/kcmutils-4.97.0/src/kpluginselector.cpp 2014-03-01 12:50:11.000000000 +0100 +++ new/kcmutils-4.98.0/src/kpluginselector.cpp 2014-03-28 19:16:10.000000000 +0100 @@ -760,26 +760,6 @@ const QModelIndex index = focusedIndex(); const QAbstractItemModel *model = index.model(); - // Try to retrieve the plugin information from the component name of the plugin. - // If there is no valid information, go and fetch it from the service itself (the .desktop - // file). - - PluginEntry *entry = index.model()->data(index, PluginEntryRole).value<PluginEntry *>(); - KService::Ptr entryService = entry->pluginInfo.service(); - if (entryService) { - KPluginLoader loader(*entryService); - KPluginFactory *factory = loader.factory(); - if (factory) { - const KAboutData *aboutData = KAboutData::pluginData(factory->componentName()); - if (aboutData) { - KAboutApplicationDialog aboutPlugin(*aboutData, itemView()); - aboutPlugin.setWindowTitle(i18nc("Used only for plugins", "About %1", aboutData->displayName())); - aboutPlugin.exec(); - return; - } - } - } - const QString name = model->data(index, NameRole).toString(); const QString comment = model->data(index, CommentRole).toString(); const QString author = model->data(index, AuthorRole).toString(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcmutils-4.97.0/src/ksettings/pluginpage.cpp new/kcmutils-4.98.0/src/ksettings/pluginpage.cpp --- old/kcmutils-4.97.0/src/ksettings/pluginpage.cpp 2014-03-01 12:50:11.000000000 +0100 +++ new/kcmutils-4.98.0/src/ksettings/pluginpage.cpp 2014-03-28 19:16:10.000000000 +0100 @@ -17,9 +17,7 @@ */ -#define KDE3_SUPPORT #include "ksettings/pluginpage.h" -#undef KDE3_SUPPORT #include "kpluginselector.h" #include <QLayout> #include "ksettings/dispatcher.h" -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
