Hello community, here is the log from the commit of package kservice for openSUSE:Factory checked in at 2014-03-10 12:18:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kservice (Old) and /work/SRC/openSUSE:Factory/.kservice.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kservice" Changes: -------- --- /work/SRC/openSUSE:Factory/kservice/kservice.changes 2014-02-28 16:24:05.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kservice.new/kservice.changes 2014-03-10 12:18:16.000000000 +0100 @@ -1,0 +2,8 @@ +Tue Mar 4 16:37:59 UTC 2014 - [email protected] + +- Update to 4.97.0: + * Buildsystem fixes + * For more details please see: + http://www.kde.org/announcements/announce-frameworks5-alpha2.php + +------------------------------------------------------------------- Old: ---- kservice-4.96.0.tar.xz New: ---- kservice-4.97.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kservice.spec ++++++ --- /var/tmp/diff_new_pack.7b2Ho6/_old 2014-03-10 12:18:17.000000000 +0100 +++ /var/tmp/diff_new_pack.7b2Ho6/_new 2014-03-10 12:18:17.000000000 +0100 @@ -16,12 +16,11 @@ # -%define lname libKF5Service4 Name: kservice -Version: 4.96.0 +Version: 4.97.0 Release: 0 BuildRequires: cmake >= 2.8.12 -BuildRequires: extra-cmake-modules >= 0.0.10 +BuildRequires: extra-cmake-modules >= 0.0.11 BuildRequires: fdupes BuildRequires: kconfig-devel >= %{_kf5_version} BuildRequires: kcoreaddons-devel >= %{_kf5_version} @@ -34,6 +33,7 @@ BuildRequires: pkgconfig(Qt5DBus) >= 5.2.0 BuildRequires: pkgconfig(Qt5Test) >= 5.2.0 BuildRequires: pkgconfig(Qt5Xml) >= 5.2.0 +Obsoletes: libKF5Service4 Summary: Plugin framework for desktop services License: LGPL-2.1+ Group: System/GUI/KDE @@ -48,19 +48,10 @@ be applications or libraries. They can be bound to MIME types or handled by application specific code. -%package -n %lname -Summary: Plugin framework for desktop services -Group: System/GUI/KDE - -%description -n %lname -Provides a plugin framework for handling desktop services. Services can -be applications or libraries. They can be bound to MIME types or handled by -application specific code. - %package devel Summary: Plugin framework for desktop services: Build Environment Group: Development/Libraries/KDE -Requires: %lname = %{version} +Requires: %{name} = %{version} Requires: extra-cmake-modules Requires: kconfig-devel >= %{_kf5_version} Requires: kcoreaddons-devel >= %{_kf5_version} @@ -84,11 +75,11 @@ %kf5_makeinstall -C build %fdupes -s %{buildroot} -%post -n %lname -p /sbin/ldconfig +%post -p /sbin/ldconfig -%postun -n %lname -p /sbin/ldconfig +%postun -p /sbin/ldconfig -%files -n %lname +%files %defattr(-,root,root) %doc COPYING* %{_kf5_libdir}/libKF5Service.so.* ++++++ kservice-4.96.0.tar.xz -> kservice-4.97.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-4.96.0/CMakeLists.txt new/kservice-4.97.0/CMakeLists.txt --- old/kservice-4.96.0/CMakeLists.txt 2014-02-06 05:09:25.000000000 +0100 +++ new/kservice-4.97.0/CMakeLists.txt 2014-03-01 12:51:36.000000000 +0100 @@ -4,7 +4,7 @@ project(KService) # ECM setup -find_package(ECM 0.0.10 REQUIRED NO_MODULE) +find_package(ECM 0.0.11 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/cmake ) include(KDEInstallDirs) @@ -14,12 +14,13 @@ include(ECMGenerateHeaders) include(GenerateExportHeader) -set(KF5_VERSION "4.96.0") +set(KF5_VERSION "4.97.0") ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KSERVICE VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kservice_version.h" - PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5ServiceConfigVersion.cmake") + PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5ServiceConfigVersion.cmake" + SOVERSION 5) # TODO: Remove these remove_definitions(-DQT_NO_CAST_TO_ASCII) @@ -46,9 +47,9 @@ # create a Config.cmake and a ConfigVersion.cmake file and install them set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/KF5Service") -include(CMakePackageConfigHelpers) +include(ECMPackageConfigHelpers) -configure_package_config_file("${CMAKE_CURRENT_SOURCE_DIR}/KF5ServiceConfig.cmake.in" +ecm_configure_package_config_file("${CMAKE_CURRENT_SOURCE_DIR}/KF5ServiceConfig.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/KF5ServiceConfig.cmake" INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-4.96.0/autotests/fakekdedmodule.desktop new/kservice-4.97.0/autotests/fakekdedmodule.desktop --- old/kservice-4.96.0/autotests/fakekdedmodule.desktop 2014-02-06 05:09:25.000000000 +0100 +++ new/kservice-4.97.0/autotests/fakekdedmodule.desktop 2014-03-01 12:51:36.000000000 +0100 @@ -97,6 +97,7 @@ Comment[xh]=KDED Isichatshulwa Comment[x-test]=xxKDED Modulexx Comment[zh_CN]=KDED 模块 +Comment[zh_HK]=KDED 模組 Comment[zh_TW]=KDED 模組 [PropertyDef::X-KDE-FactoryName] Type=QString diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-4.96.0/autotests/fakeplugin.desktop new/kservice-4.97.0/autotests/fakeplugin.desktop --- old/kservice-4.96.0/autotests/fakeplugin.desktop 2014-02-06 05:09:25.000000000 +0100 +++ new/kservice-4.97.0/autotests/fakeplugin.desktop 2014-03-01 12:51:36.000000000 +0100 @@ -2,12 +2,17 @@ Name=NSA Plugin Name[bs]=NSA priključak Name[ca]=Connector de la NSA +Name[cs]=Modul NSA Name[da]=NSA-plugin Name[de]=NSA-Modul +Name[el]=Πρόσθετο NSA Name[es]=Complemento NSA Name[fi]=NSA-liitännäinen Name[hu]=NSA bővítmény +Name[ia]=Plugin de NSA +Name[nds]=NSA-Moduul Name[nl]=NSA plug-in +Name[pl]=Wtyczka NSA Name[pt]='Plugin' da NSA Name[pt_BR]=Plugin NSA Name[sk]=NSA plugin @@ -17,16 +22,24 @@ Name[sr@ijekavianlatin]=NSA‑ov priključak Name[sr@latin]=NSA‑ov priključak Name[sv]=NSA-insticksprogram +Name[tr]=NSA Eklentisi Name[uk]=Додаток NSA Name[x-test]=xxNSA Pluginxx +Name[zh_TW]=NSA 外掛程式 Comment=Test Plugin Spy Comment[bs]=Špijun za test priključaka Comment[ca]=Connector de proves espia +Comment[cs]=Testovascí modul SPy Comment[da]=Test-plugin spion Comment[de]=Test-Spionagemodul +Comment[el]=Πρόσθετο κατάσκοπος για δοκιμή +Comment[es]=Complemento espía de pruebas Comment[fi]=Testivakoiluliitännäinen Comment[hu]=Teszt bővítmény kém +Comment[ia]=Essaya Plugin Spy +Comment[nds]=Testmoduul Spioon Comment[nl]=Plug-in spion testen +Comment[pl]=Wypróbuj szpiega wtyczki Comment[pt]=Espião dos 'Plugins' de Testes Comment[pt_BR]=Plugin de teste de espionagem Comment[sk]=Testovací plugin špión @@ -36,8 +49,10 @@ Comment[sr@ijekavianlatin]=Probni priključak špijun Comment[sr@latin]=Probni priključak špijun Comment[sv]=Spioninsticksprogram för provning +Comment[tr]=Test Eklenti Casusu Comment[uk]=Тестовий шпигунський додаток Comment[x-test]=xxTest Plugin Spyxx +Comment[zh_TW]=測試外掛程式 Type=Service Icon=preferences-system-time diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-4.96.0/src/CMakeLists.txt new/kservice-4.97.0/src/CMakeLists.txt --- old/kservice-4.96.0/src/CMakeLists.txt 2014-02-06 05:09:25.000000000 +0100 +++ new/kservice-4.97.0/src/CMakeLists.txt 2014-03-01 12:51:36.000000000 +0100 @@ -53,6 +53,10 @@ qt5_add_dbus_interface(kservice_SRCS kdeinit/org.kde.KLauncher.xml klauncher_iface) add_library(KF5Service ${kservice_SRCS}) +if(WIN32) + #unistd.h does not exist on windows + target_compile_definitions(KF5Service PRIVATE YY_NO_UNISTD_H=1) +endif() generate_export_header(KF5Service BASE_NAME KService) add_library(KF5::Service ALIAS KF5Service) set(kservice_includes @@ -80,7 +84,8 @@ EXPORT_NAME Service ) -ecm_generate_headers( +ecm_generate_headers(KService_HEADERS + HEADER_NAMES KLibrary KPluginFactory KPluginLoader @@ -90,19 +95,22 @@ RELATIVE plugin REQUIRED_HEADERS KService_HEADERS ) -ecm_generate_headers( +ecm_generate_headers(KService_HEADERS + HEADER_NAMES KSycoca KSycocaEntry KSycocaType RELATIVE sycoca REQUIRED_HEADERS KService_HEADERS ) -ecm_generate_headers( +ecm_generate_headers(KService_HEADERS + HEADER_NAMES KToolInvocation RELATIVE kdeinit REQUIRED_HEADERS KService_HEADERS ) -ecm_generate_headers( +ecm_generate_headers(KService_HEADERS + HEADER_NAMES KAutostart KMimeTypeTrader KService @@ -121,7 +129,6 @@ services/application.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} ) -install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/KService DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel) install(TARGETS KF5Service EXPORT KF5ServiceTargets ${INSTALL_TARGETS_DEFAULT_ARGS}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-4.96.0/src/desktoptojson/CMakeLists.txt new/kservice-4.97.0/src/desktoptojson/CMakeLists.txt --- old/kservice-4.96.0/src/desktoptojson/CMakeLists.txt 2014-02-06 05:09:25.000000000 +0100 +++ new/kservice-4.97.0/src/desktoptojson/CMakeLists.txt 2014-03-01 12:51:36.000000000 +0100 @@ -1,11 +1,16 @@ project("desktoptojson") +include(ECMMarkNonGuiExecutable) + add_executable(desktoptojson main.cpp kconfigtojson.cpp ) add_executable(KF5::desktoptojson ALIAS desktoptojson) +# Mark it as non-gui so we won't create an app bundle on Mac OS X +ecm_mark_nongui_executable(desktoptojson) + target_link_libraries(desktoptojson Qt5::Core KF5::ConfigCore diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-4.96.0/src/kbuildsycoca/CMakeLists.txt new/kservice-4.97.0/src/kbuildsycoca/CMakeLists.txt --- old/kservice-4.96.0/src/kbuildsycoca/CMakeLists.txt 2014-02-06 05:09:25.000000000 +0100 +++ new/kservice-4.97.0/src/kbuildsycoca/CMakeLists.txt 2014-03-01 12:51:36.000000000 +0100 @@ -1,3 +1,5 @@ +include(ECMMarkNonGuiExecutable) + set(kbuildsycoca_SRCS kbuildsycoca.cpp kbuildmimetypefactory.cpp @@ -12,6 +14,9 @@ # We need to add a '5' so that kde3/kde4 apps running kbuildsycoca don't run the kde4 one. add_executable( kbuildsycoca5 ${kbuildsycoca_SRCS}) +# Mark it as non-gui so we won't create an app bundle on Mac OS X +ecm_mark_nongui_executable(kbuildsycoca5) + target_link_libraries(kbuildsycoca5 KF5::Service #KBuildMimeTypeFactory subclasses KMimeTypeFactory, KServiceGroupFactory and KService used as well KF5::Crash #set a crash handler for ksycoca binary diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-4.96.0/src/kbuildsycoca/kbuildsycoca.cpp new/kservice-4.97.0/src/kbuildsycoca/kbuildsycoca.cpp --- old/kservice-4.96.0/src/kbuildsycoca/kbuildsycoca.cpp 2014-02-06 05:09:25.000000000 +0100 +++ new/kservice-4.97.0/src/kbuildsycoca/kbuildsycoca.cpp 2014-03-01 12:51:36.000000000 +0100 @@ -49,8 +49,7 @@ #include <kmemfile_p.h> #include <kaboutdata.h> -#include <stdlib.h> -#include <unistd.h> +#include <qplatformdefs.h> #include <time.h> #include <memory> // auto_ptr #include <qstandardpaths.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-4.96.0/src/kdeinit/ktoolinvocation_win.cpp new/kservice-4.97.0/src/kdeinit/ktoolinvocation_win.cpp --- old/kservice-4.96.0/src/kdeinit/ktoolinvocation_win.cpp 2014-02-06 05:09:25.000000000 +0100 +++ new/kservice-4.97.0/src/kdeinit/ktoolinvocation_win.cpp 2014-03-01 12:51:36.000000000 +0100 @@ -24,6 +24,7 @@ #include "klocalizedstring.h" #include <QUrl> +#include <QUrlQuery> #include <QProcess> #include <QtCore/QCoreApplication> #include <QtCore/QHash> @@ -55,13 +56,15 @@ const QByteArray &startup_id) { QUrl url(QLatin1String("mailto:";) + _to); - url.setQuery(QLatin1String("?subject=") + subject); - url.addQueryItem(QLatin1String("cc"), _cc); - url.addQueryItem(QLatin1String("bcc"), _bcc); - url.addQueryItem(QLatin1String("body"), body); + QUrlQuery query; + query.addQueryItem(QStringLiteral("subject"), subject); + query.addQueryItem(QStringLiteral("cc"), _cc); + query.addQueryItem(QStringLiteral("bcc"), _bcc); + query.addQueryItem(QStringLiteral("body"), body); foreach (const QString &attachURL, attachURLs) { - url.addQueryItem(QLatin1String("attach"), attachURL); + query.addQueryItem(QStringLiteral("attach"), attachURL); } + url.setQuery(query); #ifndef _WIN32_WCE QString sOpen = QLatin1String("open"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-4.96.0/src/plugin/kpluginloader.cpp new/kservice-4.97.0/src/plugin/kpluginloader.cpp --- old/kservice-4.96.0/src/plugin/kpluginloader.cpp 2014-02-06 05:09:25.000000000 +0100 +++ new/kservice-4.97.0/src/plugin/kpluginloader.cpp 2014-03-01 12:51:36.000000000 +0100 @@ -89,8 +89,11 @@ #endif } -#ifdef Q_OS_WIN -extern QString fixLibPrefix(const QString &libname); +#ifdef Q_CC_MSVC +static QString removeLibPrefix(const QString &libname) +{ + return libname.startsWith(QStringLiteral("lib")) ? libname.mid(3) : libname; +} #endif QString findLibraryInternal(const QString &name) @@ -106,7 +109,7 @@ } #ifdef Q_CC_MSVC // first remove the 'lib' prefix in front of windows plugins - libname = fixLibPrefix(libname); + libname = removeLibPrefix(libname); #endif // If it is a absolute path just return it diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-4.96.0/src/services/application.desktop new/kservice-4.97.0/src/services/application.desktop --- old/kservice-4.96.0/src/services/application.desktop 2014-02-06 05:09:25.000000000 +0100 +++ new/kservice-4.97.0/src/services/application.desktop 2014-03-01 12:51:36.000000000 +0100 @@ -97,6 +97,7 @@ Name[xh]=Isicelo Name[x-test]=xxApplicationxx Name[zh_CN]=应用程序 +Name[zh_HK]=應用程式 Name[zh_TW]=應用程式 [PropertyDef::NoDisplay] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-4.96.0/src/services/kplugininfo.desktop new/kservice-4.97.0/src/services/kplugininfo.desktop --- old/kservice-4.96.0/src/services/kplugininfo.desktop 2014-02-06 05:09:25.000000000 +0100 +++ new/kservice-4.97.0/src/services/kplugininfo.desktop 2014-03-01 12:51:36.000000000 +0100 @@ -95,6 +95,7 @@ Name[wa]=Infôrmåcion sol tchôke-divins di KDE Name[x-test]=xxKDE Plugin Informationxx Name[zh_CN]=KDE 插件信息 +Name[zh_HK]=KDE 外掛資訊 Name[zh_TW]=KDE 外掛資訊 [PropertyDef::X-KDE-PluginInfo-Author] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-4.96.0/src/services/kservice.cpp new/kservice-4.97.0/src/services/kservice.cpp --- old/kservice-4.96.0/src/services/kservice.cpp 2014-02-06 05:09:25.000000000 +0100 +++ new/kservice-4.97.0/src/services/kservice.cpp 2014-03-01 12:51:36.000000000 +0100 @@ -21,17 +21,13 @@ #include "kservice_p.h" #include "kmimetypefactory.h" -#include <sys/types.h> -#include <sys/stat.h> - -#include <stddef.h> -#include <unistd.h> -#include <stdlib.h> +#include <qplatformdefs.h> #include <QtCore/QCharRef> #include <QtCore/QFile> #include <QtCore/QDir> #include <QtCore/QMap> +#include <QCoreApplication> #include <qmimedatabase.h> #include <kauthorized.h> @@ -717,6 +713,32 @@ return true; } +bool KService::showOnCurrentPlatform() const +{ + Q_D(const KService); + const QString platform = QCoreApplication::instance()->property("platformName").toString(); + if (platform.isEmpty()) { + return true; + } + + auto it = d->m_mapProps.find(QStringLiteral("X-KDE-OnlyShowOnQtPlatforms")); + if ((it != d->m_mapProps.end()) && (it->isValid())) { + const QStringList aList = it->toString().split(QLatin1Char(';')); + if (!aList.contains(platform)) { + return false; + } + } + + it = d->m_mapProps.find(QStringLiteral("X-KDE-NotShowOnQtPlatforms")); + if ((it != d->m_mapProps.end()) && (it->isValid())) { + const QStringList aList = it->toString().split(QLatin1Char(';')); + if (aList.contains(platform)) { + return false; + } + } + return true; +} + bool KService::noDisplay() const { if (qvariant_cast<bool>(property(QString::fromLatin1("NoDisplay"), QVariant::Bool))) { @@ -727,6 +749,10 @@ return true; } + if (!showOnCurrentPlatform()) { + return true; + } + if (!KAuthorized::authorizeControlModule(storageId())) { return true; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-4.96.0/src/services/kservice.h new/kservice-4.97.0/src/services/kservice.h --- old/kservice-4.96.0/src/services/kservice.h 2014-02-06 05:09:25.000000000 +0100 +++ new/kservice-4.97.0/src/services/kservice.h 2014-03-01 12:51:36.000000000 +0100 @@ -360,6 +360,15 @@ bool showInKDE() const; /** + * Whether the service should be shown on the current + * platform (e.g. on xcb or on wayland). + * @return true if the service should be shown + * + * @since 5.0 + */ + bool showOnCurrentPlatform() const; + + /** * Name of the application this service belongs to. * (Useful for e.g. plugins) * @return the parent application, or QString() if not set diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-4.96.0/tests/kservicetojsontest/dummy-service.desktop new/kservice-4.97.0/tests/kservicetojsontest/dummy-service.desktop --- old/kservice-4.96.0/tests/kservicetojsontest/dummy-service.desktop 2014-02-06 05:09:25.000000000 +0100 +++ new/kservice-4.97.0/tests/kservicetojsontest/dummy-service.desktop 2014-03-01 12:51:36.000000000 +0100 @@ -7,9 +7,14 @@ Name[cs]=Falešný Name[da]=Attrap Name[de]=Dummy +Name[el]=Εικονικό +Name[es]=Ficticio Name[fi]=Testi Name[hu]=Üres +Name[ia]=Dummy +Name[nds]=Platzholler Name[nl]=Dummy +Name[pl]=Fikcyjna Name[pt]=Testes Name[pt_BR]=Teste Name[sk]=Prázdne @@ -19,8 +24,10 @@ Name[sr@ijekavianlatin]=Lažnjak Name[sr@latin]=Lažnjak Name[sv]=Test +Name[tr]=Sahte Name[uk]=Макет Name[x-test]=xxDummyxx +Name[zh_TW]=Dummy ServiceTypes=Dummy X-KDE-Library=kservicetojsontest X-KDE-PluginInfo-Author=Aurélien Gâteau -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
