Hello community, here is the log from the commit of package kservice for openSUSE:Factory checked in at 2015-04-13 20:23:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2015-03-16 09:28:15.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kservice.new/kservice.changes 2015-04-13 20:23:36.000000000 +0200 @@ -1,0 +2,9 @@ +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 + +------------------------------------------------------------------- Old: ---- kservice-5.8.0.tar.xz New: ---- kservice-5.9.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kservice.spec ++++++ --- /var/tmp/diff_new_pack.xrTnVB/_old 2015-04-13 20:23:37.000000000 +0200 +++ /var/tmp/diff_new_pack.xrTnVB/_new 2015-04-13 20:23:37.000000000 +0200 @@ -16,26 +16,29 @@ # -%define _tar_path 5.8 +%bcond_without lang +%define _tar_path 5.9 Name: kservice -Version: %{_tar_path}.0 +Version: 5.9.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 2.8.12 -BuildRequires: extra-cmake-modules >= 1.8.0 +BuildRequires: extra-cmake-modules >= %{_tar_path} BuildRequires: fdupes -BuildRequires: kconfig-devel >= %{kf5_version} -BuildRequires: kcoreaddons-devel >= %{kf5_version} -BuildRequires: kcrash-devel >= %{kf5_version} -BuildRequires: kdbusaddons-devel >= %{kf5_version} -BuildRequires: kdoctools-devel >= %{kf5_version} +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 >= %{kf5_version} +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 Obsoletes: libKF5Service4 Summary: Plugin framework for desktop services License: LGPL-2.1+ @@ -57,10 +60,8 @@ Group: Development/Libraries/KDE Requires: %{name} = %{version} Requires: extra-cmake-modules -Requires: kconfig-devel >= %{kf5_version} -Requires: kcoreaddons-devel >= %{kf5_version} -Requires: kdbusaddons-devel >= %{kf5_version} -Requires: ki18n-devel >= %{kf5_version} +Requires: kconfig-devel >= %{_tar_path} +Requires: kcoreaddons-devel >= %{_tar_path} %description devel Provides a plugin framework for handling desktop services. Services can @@ -78,21 +79,24 @@ %install %kf5_makeinstall -C build - %fdupes -s %{buildroot} + %fdupes %{buildroot} - %find_lang %{name}5 +%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 -%defattr(-,root,root) -%doc %lang(it) %{_kf5_mandir}/it -%doc %lang(nl) %{_kf5_mandir}/nl -%doc %lang(pt_BR) %{_kf5_mandir}/pt_BR -%doc %lang(sv) %{_kf5_mandir}/sv -%doc %lang(uk) %{_kf5_mandir}/uk +%endif %files %defattr(-,root,root) ++++++ kservice-5.8.0.tar.xz -> kservice-5.9.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.8.0/CMakeLists.txt new/kservice-5.9.0/CMakeLists.txt --- old/kservice-5.8.0/CMakeLists.txt 2015-03-07 15:49:54.000000000 +0100 +++ new/kservice-5.9.0/CMakeLists.txt 2015-04-04 14:12:17.000000000 +0200 @@ -4,7 +4,7 @@ project(KService) # ECM setup -find_package(ECM 1.8.0 REQUIRED NO_MODULE) +find_package(ECM 5.9.0 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/cmake ) include(KDEInstallDirs) @@ -15,8 +15,8 @@ include(FeatureSummary) include(GenerateExportHeader) -set(KF5_VERSION "5.8.0") # handled by release scripts -set(KF5_DEP_VERSION "5.8.0") # handled by release scripts +set(KF5_VERSION "5.9.0") # handled by release scripts +set(KF5_DEP_VERSION "5.9.0") # handled by release scripts ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KSERVICE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.8.0/KF5ServiceConfig.cmake.in new/kservice-5.9.0/KF5ServiceConfig.cmake.in --- old/kservice-5.8.0/KF5ServiceConfig.cmake.in 2015-03-07 15:49:54.000000000 +0100 +++ new/kservice-5.9.0/KF5ServiceConfig.cmake.in 2015-04-04 14:12:17.000000000 +0200 @@ -2,8 +2,6 @@ find_dependency(KF5Config "@KF5_DEP_VERSION@") find_dependency(KF5CoreAddons "@KF5_DEP_VERSION@") -find_dependency(KF5DBusAddons "@KF5_DEP_VERSION@") -find_dependency(KF5I18n "@KF5_DEP_VERSION@") include("${CMAKE_CURRENT_LIST_DIR}/KF5ServiceTargets.cmake") include("${CMAKE_CURRENT_LIST_DIR}/KF5ServiceMacros.cmake") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.8.0/autotests/fakeplugin.desktop new/kservice-5.9.0/autotests/fakeplugin.desktop --- old/kservice-5.8.0/autotests/fakeplugin.desktop 2015-03-07 15:49:54.000000000 +0100 +++ new/kservice-5.9.0/autotests/fakeplugin.desktop 2015-04-04 14:12:17.000000000 +0200 @@ -1,5 +1,6 @@ [Desktop Entry] Name=NSA Plugin +Name[ast]=Complemetnu NSA Name[bs]=NSA priključak Name[ca]=Connector de la NSA Name[ca@valencia]=Connector de la NSA @@ -103,9 +104,11 @@ Keywords=word1;word2 Keywords[ca]=paraula1;paraula2 Keywords[da]=ord1;ord2 +Keywords[de]=Welt1;Welt2 Keywords[en_GB]=word1;word2 Keywords[es]=palabra1;palabra2 Keywords[fi]=sana1;sana2 +Keywords[gl]=palabra1;palabra2 Keywords[it]=parola1;parola2 Keywords[nl]=woord1;woord2 Keywords[pl]=słowo1;słowo2 @@ -113,6 +116,7 @@ Keywords[pt_BR]=palavra1;palavra2 Keywords[ru]=слово1;слово2 Keywords[sk]=word1;word2 +Keywords[sl]=beseda1;beseda2 Keywords[sr]=реч1;реч2; Keywords[sr@ijekavian]=реч1;реч2; Keywords[sr@ijekavianlatin]=reč1;reč2; @@ -127,9 +131,11 @@ X-KDE-Keywords=word3,word4 X-KDE-Keywords[ca]=paraula3,paraula4 X-KDE-Keywords[da]=ord3,ord4 +X-KDE-Keywords[de]=Welt3,Welt4 X-KDE-Keywords[en_GB]=word3,word4 X-KDE-Keywords[es]=palabra3,palabra4 X-KDE-Keywords[fi]=sana3,sana4 +X-KDE-Keywords[gl]=palabra3,palabra4 X-KDE-Keywords[it]=parola3,parola4 X-KDE-Keywords[nl]=woord3,woord4 X-KDE-Keywords[pl]=słowo3,słowo4 @@ -137,6 +143,7 @@ X-KDE-Keywords[pt_BR]=palavra3,palavra4 X-KDE-Keywords[ru]=слово3,слово4 X-KDE-Keywords[sk]=word3,word4 +X-KDE-Keywords[sl]=beseda3;beseda4 X-KDE-Keywords[sr]=реч3,реч4 X-KDE-Keywords[sr@ijekavian]=реч3,реч4 X-KDE-Keywords[sr@ijekavianlatin]=reč3,reč4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.8.0/src/kbuildsycoca/kbuildsycoca.cpp new/kservice-5.9.0/src/kbuildsycoca/kbuildsycoca.cpp --- old/kservice-5.8.0/src/kbuildsycoca/kbuildsycoca.cpp 2015-03-07 15:49:54.000000000 +0100 +++ new/kservice-5.9.0/src/kbuildsycoca/kbuildsycoca.cpp 2015-04-04 14:12:17.000000000 +0200 @@ -493,7 +493,7 @@ (*str) << (*g_allResourceDirs); // Calculate per-servicetype/mimetype data - serviceFactory->postProcessServices(); + if (serviceFactory) serviceFactory->postProcessServices(); // Here so that it's the last debug message qDebug() << "Saving"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.8.0/src/kbuildsycoca/vfolder_menu.cpp new/kservice-5.9.0/src/kbuildsycoca/vfolder_menu.cpp --- old/kservice-5.8.0/src/kbuildsycoca/vfolder_menu.cpp 2015-03-07 15:49:54.000000000 +0100 +++ new/kservice-5.9.0/src/kbuildsycoca/vfolder_menu.cpp 2015-04-04 14:12:17.000000000 +0200 @@ -277,12 +277,14 @@ } VFolderMenu::VFolderMenu(KBuildServiceFactory *serviceFactory, KBuildSycocaInterface *kbuildsycocaInterface) - : m_track(false), - m_serviceFactory(serviceFactory), - m_kbuildsycocaInterface(kbuildsycocaInterface) + : m_appsInfo(0) + , m_rootMenu(0) + , m_currentMenu(0) + , m_track(false) + , m_serviceFactory(serviceFactory) + , m_kbuildsycocaInterface(kbuildsycocaInterface) { m_usedAppsDict.reserve(797); - m_rootMenu = 0; initDirs(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.8.0/src/services/kservicegroupfactory.cpp new/kservice-5.9.0/src/services/kservicegroupfactory.cpp --- old/kservice-5.8.0/src/services/kservicegroupfactory.cpp 2015-03-07 15:49:54.000000000 +0100 +++ new/kservice-5.9.0/src/services/kservicegroupfactory.cpp 2015-04-04 14:12:17.000000000 +0200 @@ -28,9 +28,10 @@ KServiceGroupFactory::KServiceGroupFactory() : KSycocaFactory(KST_KServiceGroupFactory) + , m_baseGroupDict(0) + , m_baseGroupDictOffset(0) { kServiceGroupFactoryInstance()->instanceCreated(this); - m_baseGroupDictOffset = 0; if (!KSycoca::self()->isBuilding()) { QDataStream *str = stream(); // Read Header diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.8.0/src/sycoca/ksycocadict.cpp new/kservice-5.9.0/src/sycoca/ksycocadict.cpp --- old/kservice-5.8.0/src/sycoca/ksycocadict.cpp 2015-03-07 15:49:54.000000000 +0100 +++ new/kservice-5.9.0/src/sycoca/ksycocadict.cpp 2015-04-04 14:12:17.000000000 +0200 @@ -52,9 +52,10 @@ { public: Private() - : stringlist(0), - stream(0), - offset(0) + : stringlist(0) + , stream(0) + , offset(0) + , hashTableSize(0) { }