Hello community, here is the log from the commit of package kded for openSUSE:Factory checked in at 2014-06-10 14:36:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kded (Old) and /work/SRC/openSUSE:Factory/.kded.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kded" Changes: -------- --- /work/SRC/openSUSE:Factory/kded/kded.changes 2014-05-14 20:26:58.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kded.new/kded.changes 2014-06-10 14:37:23.000000000 +0200 @@ -1,0 +2,9 @@ +Sun Jun 1 18:02:41 UTC 2014 - hrvoje.sen...@gmail.com + +- Update to 4.100.0 + * API improvements and cleanups + * Buildsystem fixes + * For more details please see: + http://www.kde.org/announcements/announce-frameworks5-beta3.php + +------------------------------------------------------------------- Old: ---- kded-4.99.0.tar.xz New: ---- kded-4.100.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kded.spec ++++++ --- /var/tmp/diff_new_pack.yYlKQP/_old 2014-06-10 14:37:23.000000000 +0200 +++ /var/tmp/diff_new_pack.yYlKQP/_new 2014-06-10 14:37:23.000000000 +0200 @@ -17,10 +17,10 @@ Name: kded -Version: 4.99.0 +Version: 4.100.0 Release: 0 BuildRequires: cmake >= 2.8.12 -BuildRequires: extra-cmake-modules >= 0.0.13 +BuildRequires: extra-cmake-modules >= 0.0.14 BuildRequires: fdupes BuildRequires: kcoreaddons-devel >= %{_kf5_version} BuildRequires: kcrash-devel >= %{_kf5_version} @@ -41,7 +41,7 @@ License: LGPL-2.1+ Group: System/GUI/KDE Url: http://www.kde.org -Source0: kded-%{version}.tar.xz +Source: http://download.kde.org/unstable/frameworks/%{version}/%{name}-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build %description ++++++ kded-4.99.0.tar.xz -> kded-4.100.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kded-4.99.0/CMakeLists.txt new/kded-4.100.0/CMakeLists.txt --- old/kded-4.99.0/CMakeLists.txt 2014-05-04 20:57:24.000000000 +0200 +++ new/kded-4.100.0/CMakeLists.txt 2014-06-01 12:38:57.000000000 +0200 @@ -2,7 +2,7 @@ project(KDED) -find_package(ECM 0.0.13 REQUIRED NO_MODULE) +find_package(ECM 0.0.14 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) set(REQUIRED_QT_VERSION "5.2") @@ -12,8 +12,8 @@ include(KDEFrameworkCompilerSettings) include(KDECMakeSettings) -set(KF5_VERSION "4.99.0") # handled by release scripts -set(KF5_DEP_VERSION "4.99.0") # handled by release scripts +set(KF5_VERSION "4.100.0") # handled by release scripts +set(KF5_DEP_VERSION "4.100.0") # handled by release scripts find_package(KF5Config ${KF5_DEP_VERSION} REQUIRED) find_package(KF5CoreAddons ${KF5_DEP_VERSION} REQUIRED) find_package(KF5Crash ${KF5_DEP_VERSION} REQUIRED) @@ -39,6 +39,9 @@ remove_definitions(-DQT_NO_CAST_FROM_ASCII) +if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po") + kdoctools_install(po) +endif() add_subdirectory(docs) add_subdirectory(src) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kded-4.99.0/metainfo.yaml new/kded-4.100.0/metainfo.yaml --- old/kded-4.99.0/metainfo.yaml 2014-05-04 20:57:24.000000000 +0200 +++ new/kded-4.100.0/metainfo.yaml 2014-06-01 12:38:57.000000000 +0200 @@ -8,4 +8,4 @@ release: true framework-dependencies: # kded depends on CMake macros provided by kinit - - kinit + - KInit diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kded-4.99.0/src/kded.cpp new/kded-4.100.0/src/kded.cpp --- old/kded-4.99.0/src/kded.cpp 2014-05-04 20:57:24.000000000 +0200 +++ new/kded-4.100.0/src/kded.cpp 2014-06-01 12:38:57.000000000 +0200 @@ -365,17 +365,25 @@ } KDEDModule *module = 0; - QString libname = "kded_" + s->library(); - KPluginLoader loader(libname); - KPluginFactory *factory = loader.factory(); - if (!factory) { - qWarning() << "Could not load library" << libname << ". [" - << loader.errorString() << "]"; - } else { - // create the module - module = factory->create<KDEDModule>(this); + QString errorMessage; + QStringList libNames; + libNames << s->library() + << "kded_" + s->library(); // old-style naming + Q_FOREACH(const QString &libname, libNames) { + KPluginLoader loader(libname); + KPluginFactory *factory = loader.factory(); + if (factory) { + // create the module + module = factory->create<KDEDModule>(this); + if (module) { + break; + } + } else { + errorMessage = loader.errorString(); + } } + if (module) { module->setModuleName(obj); m_modules.insert(obj, module); @@ -384,8 +392,9 @@ qDebug() << "Successfully loaded module" << obj; return module; } else { - //qDebug() << "Could not load module" << obj; - //loader.unload(); + qWarning() << "Could not load KDED module" << obj << ":" + << errorMessage << "(tried plugins named:" + << libNames << ")"; } } return 0; -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
