Hello community, here is the log from the commit of package kdbusaddons for openSUSE:Factory checked in at 2015-02-16 15:05:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdbusaddons (Old) and /work/SRC/openSUSE:Factory/.kdbusaddons.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdbusaddons" Changes: -------- --- /work/SRC/openSUSE:Factory/kdbusaddons/kdbusaddons.changes 2015-01-29 12:52:00.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdbusaddons.new/kdbusaddons.changes 2015-02-16 17:30:31.000000000 +0100 @@ -1,0 +2,9 @@ +Sun Feb 8 18:15:23 UTC 2015 - [email protected] + +- Update to 5.7.0 + * Added helper method KDEDModule::moduleForMessage for writing + more kded-like daemons, such as kiod + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.7.0.php + +------------------------------------------------------------------- Old: ---- kdbusaddons-5.6.0.tar.xz New: ---- kdbusaddons-5.7.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdbusaddons.spec ++++++ --- /var/tmp/diff_new_pack.EIrHvO/_old 2015-02-16 17:30:33.000000000 +0100 +++ /var/tmp/diff_new_pack.EIrHvO/_new 2015-02-16 17:30:33.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package kdbusaddons # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,11 +17,12 @@ %define lname libKF5DBusAddons5 +%define _tar_path 5.7 Name: kdbusaddons -Version: 5.6.0 +Version: %{_tar_path}.0 Release: 0 BuildRequires: cmake >= 2.8.12 -BuildRequires: extra-cmake-modules >= 1.6.0 +BuildRequires: extra-cmake-modules >= 1.7.0 BuildRequires: fdupes BuildRequires: kf5-filesystem BuildRequires: libqt5-linguist-devel >= 5.2.0 @@ -32,7 +33,7 @@ License: LGPL-2.1+ Group: System/GUI/KDE Url: http://www.kde.org -Source: http://download.kde.org/stable/frameworks/5.6/%{name}-%{version}.tar.xz +Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz Source1: baselibs.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ kdbusaddons-5.6.0.tar.xz -> kdbusaddons-5.7.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdbusaddons-5.6.0/CMakeLists.txt new/kdbusaddons-5.7.0/CMakeLists.txt --- old/kdbusaddons-5.6.0/CMakeLists.txt 2015-01-03 13:03:33.000000000 +0100 +++ new/kdbusaddons-5.7.0/CMakeLists.txt 2015-02-08 16:14:19.000000000 +0100 @@ -2,7 +2,7 @@ project(KDBusAddons) -find_package(ECM 1.6.0 REQUIRED NO_MODULE) +find_package(ECM 1.7.0 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) @@ -23,7 +23,7 @@ include(ECMPoQmTools) -set(KF5_VERSION "5.6.0") # handled by release scripts +set(KF5_VERSION "5.7.0") # handled by release scripts ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KDBUSADDONS VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kdbusaddons_version.h" @@ -47,7 +47,7 @@ add_subdirectory(tests) # create a Config.cmake and a ConfigVersion.cmake file and install them -set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/KF5DBusAddons") +set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5DBusAddons") ecm_configure_package_config_file("${CMAKE_CURRENT_SOURCE_DIR}/KF5DBusAddonsConfig.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/KF5DBusAddonsConfig.cmake" @@ -61,6 +61,6 @@ install(EXPORT KF5DBusAddonsTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE KF5DBusAddonsTargets.cmake NAMESPACE KF5:: ) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kdbusaddons_version.h DESTINATION ${KF5_INCLUDE_INSTALL_DIR} COMPONENT Devel ) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kdbusaddons_version.h DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5} COMPONENT Devel ) feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdbusaddons-5.6.0/po/fr/kdbusaddons5_qt.po new/kdbusaddons-5.7.0/po/fr/kdbusaddons5_qt.po --- old/kdbusaddons-5.6.0/po/fr/kdbusaddons5_qt.po 2015-01-03 13:03:33.000000000 +0100 +++ new/kdbusaddons-5.7.0/po/fr/kdbusaddons5_qt.po 2015-02-08 16:14:19.000000000 +0100 @@ -11,15 +11,15 @@ msgstr "" "Project-Id-Version: kquitapp\n" "Language-Team: French <[email protected]>\n" -"Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Lokalize 1.5\n" "X-Environment: kde\n" "X-Accelerator-Marker: &\n" -"X-Text-Markup: kde4\n" +"X-Text-Markup: qtrich\n" "X-Qt-Contexts: true\n" #: tools/kquitapp/kquitapp.cpp:31 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdbusaddons-5.6.0/po/lt/kdbusaddons5_qt.po new/kdbusaddons-5.7.0/po/lt/kdbusaddons5_qt.po --- old/kdbusaddons-5.6.0/po/lt/kdbusaddons5_qt.po 2015-01-03 13:03:33.000000000 +0100 +++ new/kdbusaddons-5.7.0/po/lt/kdbusaddons5_qt.po 2015-02-08 16:14:19.000000000 +0100 @@ -1,41 +1,44 @@ +# Liudas Ališauskas <[email protected]>, 2015. msgid "" msgstr "" "Project-Id-Version: trunk-kf 5\n" -"Last-Translator: Automatically generated\n" -"Language-Team: none\n" -"Language: \n" +"PO-Revision-Date: 2015-01-10 09:40+0200\n" +"Last-Translator: Liudas Ališauskas <[email protected]>\n" +"Language-Team: Lithuanian <[email protected]>\n" +"Language: lt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Qt-Contexts: true\n" "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : n%10>=2 && (n%100<10 || n" "%100>=20) ? 1 : n%10==0 || (n%100>10 && n%100<20) ? 2 : 3);\n" +"X-Generator: Lokalize 1.5\n" #: tools/kquitapp/kquitapp.cpp:31 msgctxt "main|" msgid "Quit a D-Bus enabled application easily" -msgstr "" +msgstr "Lengvai išjungti D-Bus palaikančią programą" #: tools/kquitapp/kquitapp.cpp:32 msgctxt "main|" msgid "Full service name, overrides application name provided" -msgstr "" +msgstr "Pilnas tarnybos vardas, perrašo pirminį programos vardą" #: tools/kquitapp/kquitapp.cpp:33 msgctxt "main|" msgid "Path in the D-Bus interface to use" -msgstr "" +msgstr "Kelias D-Bus sąsajoje, kurį naudoti" #: tools/kquitapp/kquitapp.cpp:34 msgctxt "main|" msgid "The name of the application to quit" -msgstr "" +msgstr "Išjungiamos programos vardas" #: tools/kquitapp/kquitapp.cpp:57 #, qt-format msgctxt "main|" msgid "Application %1 could not be found using service %2 and path %3." -msgstr "" +msgstr "Nepavyko rasti programos %1 naudojant tarnybą %2 ir kelią %3." #: tools/kquitapp/kquitapp.cpp:63 #, qt-format @@ -45,3 +48,6 @@ "\n" " %2 : %3" msgstr "" +"Nepavyko uždaryti programos %1. Pranešta klaida:\n" +"\n" +" %2 : %3" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdbusaddons-5.6.0/po/nb/kdbusaddons5_qt.po new/kdbusaddons-5.7.0/po/nb/kdbusaddons5_qt.po --- old/kdbusaddons-5.6.0/po/nb/kdbusaddons5_qt.po 2015-01-03 13:03:33.000000000 +0100 +++ new/kdbusaddons-5.7.0/po/nb/kdbusaddons5_qt.po 2015-02-08 16:14:19.000000000 +0100 @@ -1,4 +1,4 @@ -# Translation of kquitapp to Norwegian Bokmål +# Translation of kdbusaddons5_qt to Norwegian Bokmål # # Bjørn Steensrud <[email protected]>, 2008, 2014. msgid "" @@ -15,7 +15,7 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Environment: kde\n" "X-Accelerator-Marker: &\n" -"X-Text-Markup: kde4\n" +"X-Text-Markup: qtrich\n" "X-Qt-Contexts: true\n" #: tools/kquitapp/kquitapp.cpp:31 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdbusaddons-5.6.0/po/nn/kdbusaddons5_qt.po new/kdbusaddons-5.7.0/po/nn/kdbusaddons5_qt.po --- old/kdbusaddons-5.6.0/po/nn/kdbusaddons5_qt.po 2015-01-03 13:03:33.000000000 +0100 +++ new/kdbusaddons-5.7.0/po/nn/kdbusaddons5_qt.po 2015-02-08 16:14:19.000000000 +0100 @@ -1,4 +1,4 @@ -# Translation of kquitapp to Norwegian Nynorsk +# Translation of kdbusaddons5_qt to Norwegian Nynorsk # # Karl Ove Hufthammer <[email protected]>, 2007, 2008. # Håvard Korsvoll <[email protected]>, 2008. @@ -15,7 +15,7 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Environment: kde\n" "X-Accelerator-Marker: &\n" -"X-Text-Markup: kde4\n" +"X-Text-Markup: qtrich\n" "X-Qt-Contexts: true\n" #: tools/kquitapp/kquitapp.cpp:31 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdbusaddons-5.6.0/po/se/kdbusaddons5_qt.po new/kdbusaddons-5.7.0/po/se/kdbusaddons5_qt.po --- old/kdbusaddons-5.6.0/po/se/kdbusaddons5_qt.po 2015-01-03 13:03:33.000000000 +0100 +++ new/kdbusaddons-5.7.0/po/se/kdbusaddons5_qt.po 2015-02-08 16:14:19.000000000 +0100 @@ -1,4 +1,4 @@ -# Translation of kquitapp to Northern Sami +# Translation of kdbusaddons5_qt to Northern Sami # msgid "" msgstr "" @@ -12,7 +12,7 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Environment: kde\n" "X-Accelerator-Marker: &\n" -"X-Text-Markup: kde4\n" +"X-Text-Markup: qtrich\n" "X-Qt-Contexts: true\n" #: tools/kquitapp/kquitapp.cpp:31 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdbusaddons-5.6.0/po/sr/kdbusaddons5_qt.po new/kdbusaddons-5.7.0/po/sr/kdbusaddons5_qt.po --- old/kdbusaddons-5.6.0/po/sr/kdbusaddons5_qt.po 2015-01-03 13:03:33.000000000 +0100 +++ new/kdbusaddons-5.7.0/po/sr/kdbusaddons5_qt.po 2015-02-08 16:14:19.000000000 +0100 @@ -18,33 +18,33 @@ "X-Environment: kde\n" "X-Qt-Contexts: true\n" -#: ../../home/scripty/prod/git-unstable/frameworks_kdbusaddons/src/tools/kquitapp/kquitapp.cpp:31 +#: tools/kquitapp/kquitapp.cpp:31 msgctxt "main|" msgid "Quit a D-Bus enabled application easily" msgstr "Једноставо напустите програм опремљен д‑бусом" -#: ../../home/scripty/prod/git-unstable/frameworks_kdbusaddons/src/tools/kquitapp/kquitapp.cpp:32 +#: tools/kquitapp/kquitapp.cpp:32 msgctxt "main|" msgid "Full service name, overrides application name provided" msgstr "Пуно име сервиса, потискује дато име програма" -#: ../../home/scripty/prod/git-unstable/frameworks_kdbusaddons/src/tools/kquitapp/kquitapp.cpp:33 +#: tools/kquitapp/kquitapp.cpp:33 msgctxt "main|" msgid "Path in the D-Bus interface to use" msgstr "Путања у д‑бус сучељу" -#: ../../home/scripty/prod/git-unstable/frameworks_kdbusaddons/src/tools/kquitapp/kquitapp.cpp:34 +#: tools/kquitapp/kquitapp.cpp:34 msgctxt "main|" msgid "The name of the application to quit" msgstr "Име програма који се напушта" -#: ../../home/scripty/prod/git-unstable/frameworks_kdbusaddons/src/tools/kquitapp/kquitapp.cpp:57 +#: tools/kquitapp/kquitapp.cpp:57 #, qt-format msgctxt "main|" msgid "Application %1 could not be found using service %2 and path %3." msgstr "Програм %1 не може да се нађе кроз сервис %2 и путању %3." -#: ../../home/scripty/prod/git-unstable/frameworks_kdbusaddons/src/tools/kquitapp/kquitapp.cpp:63 +#: tools/kquitapp/kquitapp.cpp:63 #, qt-format msgctxt "main|" msgid "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdbusaddons-5.6.0/po/sr@ijekavian/kdbusaddons5_qt.po new/kdbusaddons-5.7.0/po/sr@ijekavian/kdbusaddons5_qt.po --- old/kdbusaddons-5.6.0/po/sr@ijekavian/kdbusaddons5_qt.po 2015-01-03 13:03:33.000000000 +0100 +++ new/kdbusaddons-5.7.0/po/sr@ijekavian/kdbusaddons5_qt.po 2015-02-08 16:14:19.000000000 +0100 @@ -18,33 +18,33 @@ "X-Environment: kde\n" "X-Qt-Contexts: true\n" -#: ../../home/scripty/prod/git-unstable/frameworks_kdbusaddons/src/tools/kquitapp/kquitapp.cpp:31 +#: tools/kquitapp/kquitapp.cpp:31 msgctxt "main|" msgid "Quit a D-Bus enabled application easily" msgstr "Једноставо напустите програм опремљен д‑бусом" -#: ../../home/scripty/prod/git-unstable/frameworks_kdbusaddons/src/tools/kquitapp/kquitapp.cpp:32 +#: tools/kquitapp/kquitapp.cpp:32 msgctxt "main|" msgid "Full service name, overrides application name provided" msgstr "Пуно име сервиса, потискује дато име програма" -#: ../../home/scripty/prod/git-unstable/frameworks_kdbusaddons/src/tools/kquitapp/kquitapp.cpp:33 +#: tools/kquitapp/kquitapp.cpp:33 msgctxt "main|" msgid "Path in the D-Bus interface to use" msgstr "Путања у д‑бус сучељу" -#: ../../home/scripty/prod/git-unstable/frameworks_kdbusaddons/src/tools/kquitapp/kquitapp.cpp:34 +#: tools/kquitapp/kquitapp.cpp:34 msgctxt "main|" msgid "The name of the application to quit" msgstr "Име програма који се напушта" -#: ../../home/scripty/prod/git-unstable/frameworks_kdbusaddons/src/tools/kquitapp/kquitapp.cpp:57 +#: tools/kquitapp/kquitapp.cpp:57 #, qt-format msgctxt "main|" msgid "Application %1 could not be found using service %2 and path %3." msgstr "Програм %1 не може да се нађе кроз сервис %2 и путању %3." -#: ../../home/scripty/prod/git-unstable/frameworks_kdbusaddons/src/tools/kquitapp/kquitapp.cpp:63 +#: tools/kquitapp/kquitapp.cpp:63 #, qt-format msgctxt "main|" msgid "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdbusaddons-5.6.0/po/sr@ijekavianlatin/kdbusaddons5_qt.po new/kdbusaddons-5.7.0/po/sr@ijekavianlatin/kdbusaddons5_qt.po --- old/kdbusaddons-5.6.0/po/sr@ijekavianlatin/kdbusaddons5_qt.po 2015-01-03 13:03:33.000000000 +0100 +++ new/kdbusaddons-5.7.0/po/sr@ijekavianlatin/kdbusaddons5_qt.po 2015-02-08 16:14:19.000000000 +0100 @@ -18,33 +18,33 @@ "X-Environment: kde\n" "X-Qt-Contexts: true\n" -#: ../../home/scripty/prod/git-unstable/frameworks_kdbusaddons/src/tools/kquitapp/kquitapp.cpp:31 +#: tools/kquitapp/kquitapp.cpp:31 msgctxt "main|" msgid "Quit a D-Bus enabled application easily" msgstr "Jednostavo napustite program opremljen D‑Busom" -#: ../../home/scripty/prod/git-unstable/frameworks_kdbusaddons/src/tools/kquitapp/kquitapp.cpp:32 +#: tools/kquitapp/kquitapp.cpp:32 msgctxt "main|" msgid "Full service name, overrides application name provided" msgstr "Puno ime servisa, potiskuje dato ime programa" -#: ../../home/scripty/prod/git-unstable/frameworks_kdbusaddons/src/tools/kquitapp/kquitapp.cpp:33 +#: tools/kquitapp/kquitapp.cpp:33 msgctxt "main|" msgid "Path in the D-Bus interface to use" msgstr "Putanja u D‑Bus sučelju" -#: ../../home/scripty/prod/git-unstable/frameworks_kdbusaddons/src/tools/kquitapp/kquitapp.cpp:34 +#: tools/kquitapp/kquitapp.cpp:34 msgctxt "main|" msgid "The name of the application to quit" msgstr "Ime programa koji se napušta" -#: ../../home/scripty/prod/git-unstable/frameworks_kdbusaddons/src/tools/kquitapp/kquitapp.cpp:57 +#: tools/kquitapp/kquitapp.cpp:57 #, qt-format msgctxt "main|" msgid "Application %1 could not be found using service %2 and path %3." msgstr "Program %1 ne može da se nađe kroz servis %2 i putanju %3." -#: ../../home/scripty/prod/git-unstable/frameworks_kdbusaddons/src/tools/kquitapp/kquitapp.cpp:63 +#: tools/kquitapp/kquitapp.cpp:63 #, qt-format msgctxt "main|" msgid "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdbusaddons-5.6.0/po/sr@latin/kdbusaddons5_qt.po new/kdbusaddons-5.7.0/po/sr@latin/kdbusaddons5_qt.po --- old/kdbusaddons-5.6.0/po/sr@latin/kdbusaddons5_qt.po 2015-01-03 13:03:33.000000000 +0100 +++ new/kdbusaddons-5.7.0/po/sr@latin/kdbusaddons5_qt.po 2015-02-08 16:14:19.000000000 +0100 @@ -18,33 +18,33 @@ "X-Environment: kde\n" "X-Qt-Contexts: true\n" -#: ../../home/scripty/prod/git-unstable/frameworks_kdbusaddons/src/tools/kquitapp/kquitapp.cpp:31 +#: tools/kquitapp/kquitapp.cpp:31 msgctxt "main|" msgid "Quit a D-Bus enabled application easily" msgstr "Jednostavo napustite program opremljen D‑Busom" -#: ../../home/scripty/prod/git-unstable/frameworks_kdbusaddons/src/tools/kquitapp/kquitapp.cpp:32 +#: tools/kquitapp/kquitapp.cpp:32 msgctxt "main|" msgid "Full service name, overrides application name provided" msgstr "Puno ime servisa, potiskuje dato ime programa" -#: ../../home/scripty/prod/git-unstable/frameworks_kdbusaddons/src/tools/kquitapp/kquitapp.cpp:33 +#: tools/kquitapp/kquitapp.cpp:33 msgctxt "main|" msgid "Path in the D-Bus interface to use" msgstr "Putanja u D‑Bus sučelju" -#: ../../home/scripty/prod/git-unstable/frameworks_kdbusaddons/src/tools/kquitapp/kquitapp.cpp:34 +#: tools/kquitapp/kquitapp.cpp:34 msgctxt "main|" msgid "The name of the application to quit" msgstr "Ime programa koji se napušta" -#: ../../home/scripty/prod/git-unstable/frameworks_kdbusaddons/src/tools/kquitapp/kquitapp.cpp:57 +#: tools/kquitapp/kquitapp.cpp:57 #, qt-format msgctxt "main|" msgid "Application %1 could not be found using service %2 and path %3." msgstr "Program %1 ne može da se nađe kroz servis %2 i putanju %3." -#: ../../home/scripty/prod/git-unstable/frameworks_kdbusaddons/src/tools/kquitapp/kquitapp.cpp:63 +#: tools/kquitapp/kquitapp.cpp:63 #, qt-format msgctxt "main|" msgid "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdbusaddons-5.6.0/src/CMakeLists.txt new/kdbusaddons-5.7.0/src/CMakeLists.txt --- old/kdbusaddons-5.6.0/src/CMakeLists.txt 2015-01-03 13:03:33.000000000 +0100 +++ new/kdbusaddons-5.7.0/src/CMakeLists.txt 2015-02-08 16:14:19.000000000 +0100 @@ -31,7 +31,7 @@ target_link_libraries(KF5DBusAddons PUBLIC Qt5::DBus PRIVATE ${qtx11extras}) -target_include_directories(KF5DBusAddons INTERFACE "$<INSTALL_INTERFACE:${KF5_INCLUDE_INSTALL_DIR}/KDBusAddons>") +target_include_directories(KF5DBusAddons INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/KDBusAddons>") set_target_properties(KF5DBusAddons PROPERTIES VERSION ${KDBUSADDONS_VERSION_STRING} SOVERSION ${KDBUSADDONS_SOVERSION} @@ -55,10 +55,10 @@ install(FILES ${KDBusAddons_HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/kdbusaddons_export.h - DESTINATION ${KF5_INCLUDE_INSTALL_DIR}/KDBusAddons COMPONENT Devel + DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KDBusAddons COMPONENT Devel ) include(ECMGeneratePriFile) -ecm_generate_pri_file(BASE_NAME KDBusAddons LIB_NAME KF5DBusAddons DEPS "dbus" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KF5_INCLUDE_INSTALL_DIR}/KDBusAddons) +ecm_generate_pri_file(BASE_NAME KDBusAddons LIB_NAME KF5DBusAddons DEPS "dbus" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF5}/KDBusAddons) install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdbusaddons-5.6.0/src/kdedmodule.cpp new/kdbusaddons-5.7.0/src/kdedmodule.cpp --- old/kdbusaddons-5.6.0/src/kdedmodule.cpp 2015-01-03 13:03:33.000000000 +0100 +++ new/kdbusaddons-5.7.0/src/kdedmodule.cpp 2015-02-08 16:14:19.000000000 +0100 @@ -26,6 +26,7 @@ #include <QTimer> #include <QDBusConnection> #include <QDBusObjectPath> +#include <QDBusMessage> class KDEDModulePrivate { @@ -88,3 +89,28 @@ return d->moduleName; } +static const char s_modules_path[] = "/modules/"; + +QString KDEDModule::moduleForMessage(const QDBusMessage &message) +{ + if (message.type() != QDBusMessage::MethodCallMessage) { + return QString(); + } + + QString obj = message.path(); + if (!obj.startsWith(QLatin1String(s_modules_path))) { + return QString(); + } + + // Remove the <s_modules_path> part + obj = obj.mid(strlen(s_modules_path)); + + // Remove the part after the modules name + const int index = obj.indexOf(QLatin1Char('/')); + if (index != -1) { + obj = obj.left(index); + } + + return obj; +} + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdbusaddons-5.6.0/src/kdedmodule.h new/kdbusaddons-5.7.0/src/kdedmodule.h --- old/kdbusaddons-5.6.0/src/kdedmodule.h 2015-01-03 13:03:33.000000000 +0100 +++ new/kdbusaddons-5.7.0/src/kdedmodule.h 2015-02-08 16:14:19.000000000 +0100 @@ -31,6 +31,7 @@ class Kded; class QDBusObjectPath; +class QDBusMessage; /** * \class KDEDModule kdedmodule.h <KDEDModule> @@ -60,14 +61,22 @@ virtual ~KDEDModule(); /** - * @internal called by kded after loading a module - * The module name is set from the path of the desktop file, and is - * used to register the module to D-Bus. + * Sets the name of the module, and uses it to register the module to D-Bus. + * + * For modules loaded as plugins by a daemon, this is called automatically + * by the daemon after loading the module. Module authors should NOT call this. */ void setModuleName(const QString &name); QString moduleName() const; + /** + * Returns the module being called by this dbus message. + * Useful for autoloading modules in kded and similar daemons. + * @since 5.7 + */ + static QString moduleForMessage(const QDBusMessage &message); + Q_SIGNALS: /** * Emitted when the module is being deleted. -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
