Hello community, here is the log from the commit of package kservice.3714 for openSUSE:13.2:Update checked in at 2015-04-28 12:35:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.2:Update/kservice.3714 (Old) and /work/SRC/openSUSE:13.2:Update/.kservice.3714.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kservice.3714" Changes: -------- New Changes file: --- /dev/null 2015-03-12 01:14:30.992027505 +0100 +++ /work/SRC/openSUSE:13.2:Update/.kservice.3714.new/kservice.changes 2015-04-28 12:35:55.000000000 +0200 @@ -0,0 +1,153 @@ +------------------------------------------------------------------- +Sun Apr 19 15:54:46 UTC 2015 - hrvoje.senjan@gmail.com + +- Recommend kded package, it is a runtime requirement, but can't + be marked as Required as it would create a buildcycle + +------------------------------------------------------------------- +Sat Apr 4 14:40:36 UTC 2015 - hrvoje.senjan@gmail.com + +- Update to 5.9.0 + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.9.0.php +- Drop no longer needed Requires of the devel subpackage: + kdbusaddons-devel and ki18n-devel + +------------------------------------------------------------------- +Sat Mar 7 16:58:37 UTC 2015 - hrvoje.senjan@gmail.com + +- Update to 5.8.0 + * KPluginInfo: support stringlists as properties + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.8.0.php + +------------------------------------------------------------------- +Sun Feb 8 18:15:07 UTC 2015 - hrvoje.senjan@gmail.com + +- Update to 5.7.0 + * Include unknown properties when converting + KPluginInfo from KService + * KPluginInfo: fixed properties not being + copied from KService::Ptr + * OS X: performance fix for kbuildsycoca4 (skip app bundles) + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.7.0.php + +------------------------------------------------------------------- +Sat Jan 3 18:03:10 UTC 2015 - hrvoje.senjan@gmail.com + +- Update to 5.6.0 + * Fix build on MSVC. + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.6.0.php + +------------------------------------------------------------------- +Sat Dec 6 12:53:33 UTC 2014 - hrvoje.senjan@gmail.com + +- Update to 5.5.0 + * Fix KPluginTrader::query() for old JSON + * Deprecate kservice_desktop_to_json for + kcoreaddons_desktop_to_json + * Implement KPluginTrader::query() using + KPluginLoader::findPlugins() + * Fix KPluginInfo::entryPath() being empty + when not loaded from .desktop + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.5.0.php + +------------------------------------------------------------------- +Sun Nov 2 17:46:44 UTC 2014 - hrvoje.senjan@gmail.com + +- Update to 5.4.0 + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.4.0.php +- Drop 0001-Don-t-call-enableTestMode-when-QStandardPaths-isTest.patch, + merged upstream + +------------------------------------------------------------------- +Thu Oct 9 21:31:30 UTC 2014 - hrvoje.senjan@gmail.com + +- Add 0001-Don-t-call-enableTestMode-when-QStandardPaths-isTest.patch + from upstream: fixes bug where kded would be called in test mode, + which made it use ~/.qttest as home dir + +------------------------------------------------------------------- +Sat Oct 4 17:59:14 UTC 2014 - hrvoje.senjan@gmail.com + +- Update to 5.3.0 + * Many many fixes to KPluginInfo + * Add functions to convert between lists KPluginMetaData + and KPluginInfo + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.3.0.php + +------------------------------------------------------------------- +Tue Sep 9 09:49:17 UTC 2014 - hrvoje.senjan@gmail.com + +- Update to 5.2.0 + * For more details please see: + http://kde.org/announcements/kde-frameworks-5.2.php + +------------------------------------------------------------------- +Sat Aug 2 10:20:01 UTC 2014 - hrvoje.senjan@gmail.com + +- Update to 5.1.0 + * For more details please see: + http://www.kde.org/announcements/kde-frameworks-5.1.php + +------------------------------------------------------------------- +Fri Jul 11 09:48:50 UTC 2014 - hrvoje.senjan@gmail.com + +- Define kf5_version within package + +------------------------------------------------------------------- +Tue Jul 1 21:35:37 UTC 2014 - hrvoje.senjan@gmail.com + +- Update to 5.0.0 + * Final release of KDE Frameworks 5 + * API improvements and cleanups + * Buildsystem fixes + * For more details please see: + http://www.kde.org/announcements/kde-frameworks-5.0.php + +------------------------------------------------------------------- +Sun Jun 1 18:02:06 UTC 2014 - hrvoje.senjan@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 +- Add baselibs.conf + +------------------------------------------------------------------- +Sun May 4 01:41:23 UTC 2014 - hrvoje.senjan@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 + +------------------------------------------------------------------- +Sat Mar 29 19:47:51 UTC 2014 - hrvoje.senjan@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 + +------------------------------------------------------------------- +Tue Mar 4 16:37:59 UTC 2014 - hrvoje.senjan@gmail.com + +- Update to 4.97.0: + * Buildsystem fixes + * For more details please see: + http://www.kde.org/announcements/announce-frameworks5-alpha2.php + +------------------------------------------------------------------- +Sat Feb 8 02:19:45 UTC 2014 - hrvoje.senjan@gmail.com + +- Init kservice package + New: ---- baselibs.conf kservice-5.9.0.tar.xz kservice.changes kservice.spec menu.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kservice.spec ++++++ # # spec file for package kservice # # 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 # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # %bcond_without lang %define _tar_path 5.9 Name: kservice Version: 5.9.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 2.8.12 BuildRequires: extra-cmake-modules >= %{_tar_path} BuildRequires: fdupes BuildRequires: kconfig-devel >= %{_tar_path} BuildRequires: kcoreaddons-devel >= %{_tar_path} BuildRequires: kcrash-devel >= %{_tar_path} BuildRequires: kdbusaddons-devel >= %{_tar_path} BuildRequires: kdoctools-devel >= %{_tar_path} BuildRequires: kf5-filesystem BuildRequires: ki18n-devel >= %{_tar_path} BuildRequires: pkgconfig(Qt5Concurrent) >= 5.2.0 BuildRequires: pkgconfig(Qt5DBus) >= 5.2.0 BuildRequires: pkgconfig(Qt5Test) >= 5.2.0 BuildRequires: pkgconfig(Qt5Xml) >= 5.2.0 %if %{with lang} Recommends: %{name}-lang = %{version} %endif Recommends: kded >= %{_tar_path} Obsoletes: libKF5Service4 Summary: Plugin framework for desktop services License: LGPL-2.1+ Group: System/GUI/KDE Url: http://www.kde.org Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz Source1: baselibs.conf # PATCH-FIX-OPENSUSE menu.patch Patch0: menu.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description 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: %{name} = %{version} Requires: extra-cmake-modules Requires: kconfig-devel >= %{_tar_path} Requires: kcoreaddons-devel >= %{_tar_path} %description devel 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. Development files %lang_package %prep %setup -q %patch0 -p1 %build %cmake_kf5 -d build -- -DSYSCONF_INSTALL_DIR=%{_kf5_sysconfdir} %make_jobs %install %kf5_makeinstall -C build %fdupes %{buildroot} %if %{with lang} %find_lang %{name}5 echo "%doc %lang(it) %{_kf5_mandir}/it" >>%{name}5.lang echo "%doc %lang(nl) %{_kf5_mandir}/nl" >>%{name}5.lang echo "%doc %lang(pt_BR) %{_kf5_mandir}/pt_BR" >>%{name}5.lang echo "%doc %lang(sv) %{_kf5_mandir}/sv" >>%{name}5.lang echo "%doc %lang(uk) %{_kf5_mandir}/uk" >>%{name}5.lang %endif %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %if %{with lang} %files lang -f %{name}5.lang %endif %files %defattr(-,root,root) %doc COPYING* %{_kf5_libdir}/libKF5Service.so.* %{_kf5_bindir}/kbuildsycoca5 %dir %{_kf5_servicetypesdir} %{_kf5_servicetypesdir}/application.desktop %{_kf5_servicetypesdir}/kplugininfo.desktop %dir %{_kf5_sysconfdir}/xdg/menus %{_kf5_sysconfdir}/xdg/menus/kf5-applications.menu %doc %lang(en) %{_kf5_mandir}/*/kbuildsycoca5.* %doc %lang(en) %{_kf5_mandir}/*/desktoptojson.* %files devel %defattr(-,root,root) %{_kf5_libdir}/libKF5Service.so %{_kf5_libdir}/cmake/KF5Service/ %{_kf5_includedir}/ %{_kf5_mkspecsdir}/qt_KService.pri %changelog ++++++ baselibs.conf ++++++ kservice kservice-devel requires "kservice-<targettype> = <version>" ++++++ menu.patch ++++++ diff --git a/src/kbuildsycoca/CMakeLists.txt b/src/kbuildsycoca/CMakeLists.txt index 8240b0c..ecfde40 100644 --- a/src/kbuildsycoca/CMakeLists.txt +++ b/src/kbuildsycoca/CMakeLists.txt @@ -32,5 +32,5 @@ install(TARGETS kbuildsycoca5 ${KF5_INSTALL_TARGETS_DEFAULT_ARGS} ) if (WIN32) install( FILES applications.menu DESTINATION ${KDE_INSTALL_DATAROOTDIR}/xdg/menus ) else () -install( FILES applications.menu DESTINATION ${KDE_INSTALL_SYSCONFDIR}/xdg/menus ) +install( FILES applications.menu DESTINATION ${KDE_INSTALL_SYSCONFDIR}/xdg/menus RENAME kf5-applications.menu ) endif () diff --git a/src/kbuildsycoca/kbuildsycoca.cpp b/src/kbuildsycoca/kbuildsycoca.cpp index bea46ff..49a6a6d 100644 --- a/src/kbuildsycoca/kbuildsycoca.cpp +++ b/src/kbuildsycoca/kbuildsycoca.cpp @@ -307,7 +307,7 @@ bool KBuildSycoca::build() g_vfolder->setTrackId(m_trackId); } - VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu(QStringLiteral("applications.menu")); + VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu(QStringLiteral("kf5-applications.menu")); KServiceGroup::Ptr entry = g_buildServiceGroupFactory->addNew(QStringLiteral("/"), kdeMenu->directoryFile, KServiceGroup::Ptr(), false); entry->setLayoutInfo(kdeMenu->layoutList); diff --git a/src/kbuildsycoca/vfolder_menu.cpp b/src/kbuildsycoca/vfolder_menu.cpp index 44926cd..a600672 100644 --- a/src/kbuildsycoca/vfolder_menu.cpp +++ b/src/kbuildsycoca/vfolder_menu.cpp @@ -739,7 +739,7 @@ VFolderMenu::locateMenuFile(const QString &fileName) QString result; - QString xdgMenuPrefix = QString::fromLocal8Bit(qgetenv("XDG_MENU_PREFIX")); + QString xdgMenuPrefix = QString::fromLocal8Bit(qgetenv("kf5-")); if (!xdgMenuPrefix.isEmpty()) { QFileInfo fileInfo(fileName);