Hello community, here is the log from the commit of package kded for openSUSE:Factory checked in at 2014-05-14 20:26:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-04-02 17:22:02.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kded.new/kded.changes 2014-05-14 20:26:58.000000000 +0200 @@ -1,0 +2,9 @@ +Sun May 4 01:41:05 UTC 2014 - hrvoje.sen...@gmail.com + +- 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: ---- kded-4.98.0.tar.xz New: ---- kded-4.99.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kded.spec ++++++ --- /var/tmp/diff_new_pack.jN0CnK/_old 2014-05-14 20:26:58.000000000 +0200 +++ /var/tmp/diff_new_pack.jN0CnK/_new 2014-05-14 20:26:58.000000000 +0200 @@ -17,10 +17,10 @@ Name: kded -Version: 4.98.0 +Version: 4.99.0 Release: 0 BuildRequires: cmake >= 2.8.12 -BuildRequires: extra-cmake-modules >= 0.0.12 +BuildRequires: extra-cmake-modules >= 0.0.13 BuildRequires: fdupes BuildRequires: kcoreaddons-devel >= %{_kf5_version} BuildRequires: kcrash-devel >= %{_kf5_version} @@ -83,7 +83,7 @@ %doc COPYING* README* %{_kf5_libdir}/libkdeinit5_kded5.so %{_kf5_bindir}/kded5 -%{_kf5_datadir}/dbus-1/services/org.kde.kded5.service +%{_kf5_sharedir}/dbus-1/services/org.kde.kded5.service %dir %{_kf5_servicetypesdir} %{_kf5_servicetypesdir}/kdedmodule.desktop ++++++ kded-4.98.0.tar.xz -> kded-4.99.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kded-4.98.0/CMakeLists.txt new/kded-4.99.0/CMakeLists.txt --- old/kded-4.98.0/CMakeLists.txt 2014-03-29 07:54:44.000000000 +0100 +++ new/kded-4.99.0/CMakeLists.txt 2014-05-04 20:57:24.000000000 +0200 @@ -2,7 +2,7 @@ project(KDED) -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}) set(REQUIRED_QT_VERSION "5.2") @@ -12,14 +12,15 @@ include(KDEFrameworkCompilerSettings) include(KDECMakeSettings) -set(KF5_VERSION "4.98.0") -find_package(KF5Config ${KF5_VERSION} REQUIRED) -find_package(KF5CoreAddons ${KF5_VERSION} REQUIRED) -find_package(KF5Crash ${KF5_VERSION} REQUIRED) -find_package(KF5DBusAddons ${KF5_VERSION} REQUIRED) -find_package(KF5DocTools ${KF5_VERSION} REQUIRED) -find_package(KF5Init ${KF5_VERSION} REQUIRED) -find_package(KF5Service ${KF5_VERSION} REQUIRED) +set(KF5_VERSION "4.99.0") # handled by release scripts +set(KF5_DEP_VERSION "4.99.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) +find_package(KF5DBusAddons ${KF5_DEP_VERSION} REQUIRED) +find_package(KF5DocTools ${KF5_DEP_VERSION} REQUIRED) +find_package(KF5Init ${KF5_DEP_VERSION} REQUIRED) +find_package(KF5Service ${KF5_DEP_VERSION} REQUIRED) include(FeatureSummary) include(ECMPackageConfigHelpers) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kded-4.98.0/kded.yaml new/kded-4.99.0/kded.yaml --- old/kded-4.98.0/kded.yaml 2014-03-29 07:54:44.000000000 +0100 +++ new/kded-4.99.0/kded.yaml 1970-01-01 01:00:00.000000000 +0100 @@ -1,5 +0,0 @@ -tier: 3 - -framework-dependencies: - # kded depends on CMake macros provided by kinit - - kinit diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kded-4.98.0/metainfo.yaml new/kded-4.99.0/metainfo.yaml --- old/kded-4.98.0/metainfo.yaml 1970-01-01 01:00:00.000000000 +0100 +++ new/kded-4.99.0/metainfo.yaml 2014-05-04 20:57:24.000000000 +0200 @@ -0,0 +1,11 @@ +maintainer: afiestas +description: Extensible deamon for providing system level services +tier: 3 +type: solution +platforms: +portingAid: false +deprecated: false +release: true +framework-dependencies: + # kded depends on CMake macros provided by kinit + - kinit diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kded-4.98.0/src/CMakeLists.txt new/kded-4.99.0/src/CMakeLists.txt --- old/kded-4.98.0/src/CMakeLists.txt 2014-03-29 07:54:44.000000000 +0100 +++ new/kded-4.99.0/src/CMakeLists.txt 2014-05-04 20:57:24.000000000 +0200 @@ -20,27 +20,22 @@ target_compile_definitions(kdeinit_kded5 PRIVATE KCONF_UPDATE_EXE="$<TARGET_FILE:KF5::kconf_update>" ) +target_compile_definitions(kded5 PRIVATE + KCONF_UPDATE_EXE="$<TARGET_FILE:KF5::kconf_update>" +) -install(TARGETS kdeinit_kded5 EXPORT KDEDTargets ${INSTALL_TARGETS_DEFAULT_ARGS}) +install(TARGETS kdeinit_kded5 EXPORT KDEDTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) target_link_libraries( kded5 kdeinit_kded5) -install(TARGETS kded5 EXPORT KDEDTargets ${INSTALL_TARGETS_DEFAULT_ARGS} ) +install(TARGETS kded5 EXPORT KDEDTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS} ) qt5_generate_dbus_interface( kdedadaptor.h org.kde.kded5.xml ) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.kded5.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR}) -#include(MacroDBusAddActivationService) # for dbus_add_activation_service - -macro(dbus_add_activation_service _sources) - foreach (_i ${_sources}) - get_filename_component(_service_file ${_i} ABSOLUTE) - string(REGEX REPLACE "\\.service.*$" ".service" _output_file ${_i}) - set(_target ${CMAKE_CURRENT_BINARY_DIR}/${_output_file}) - configure_file(${_service_file} ${_target}) - install(FILES ${_target} DESTINATION ${DBUS_SERVICES_INSTALL_DIR} ) - endforeach (_i ${ARGN}) -endmacro(dbus_add_activation_service _sources) -dbus_add_activation_service(org.kde.kded5.service.in) +configure_file(org.kde.kded5.service.in + ${CMAKE_CURRENT_BINARY_DIR}/org.kde.kded5.service) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.kded5.service + DESTINATION ${DBUS_SERVICES_INSTALL_DIR}) install( FILES kdedmodule.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kded-4.98.0/src/kded.cpp new/kded-4.99.0/src/kded.cpp --- old/kded-4.98.0/src/kded.cpp 2014-03-29 07:54:44.000000000 +0100 +++ new/kded-4.99.0/src/kded.cpp 2014-05-04 20:57:24.000000000 +0200 @@ -23,10 +23,7 @@ #include <kcrash.h> -#include <unistd.h> -#include <stdlib.h> -#include <signal.h> -#include <time.h> +#include <qplatformdefs.h> #include <QDebug> #include <QtCore/QDir> @@ -199,12 +196,13 @@ m_dontLoad.clear(); bool kde_running = !qgetenv("KDE_FULL_SESSION").isEmpty(); if (kde_running) { +#ifndef Q_OS_WIN // not the same user like the one running the session (most likely we're run via sudo or something) const QByteArray sessionUID = qgetenv("KDE_SESSION_UID"); if (!sessionUID.isEmpty() && uid_t(sessionUID.toInt()) != getuid()) { kde_running = false; } - +#endif //TODO: Change 5 to KDED_VERSION_MAJOR the moment KF5 are stable // not the same kde version as the current desktop const QByteArray kdeSession = qgetenv("KDE_SESSION_VERSION"); @@ -776,10 +774,10 @@ checkStamps = cg.readEntry("CheckFileStamps", s_checkStampsDefault); delayedCheck = cg.readEntry("DelayedCheck", false); -#ifndef _WIN32_WCE +#ifndef Q_OS_WIN signal(SIGTERM, sighandler); -#endif signal(SIGHUP, sighandler); +#endif KCrash::setFlags(KCrash::AutoRestart); -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
