Hello community,

here is the log from the commit of package kservice for openSUSE:Factory 
checked in at 2017-07-17 10:25:39
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kservice (Old)
 and      /work/SRC/openSUSE:Factory/.kservice.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "kservice"

Mon Jul 17 10:25:39 2017 rev:48 rq:509931 version:5.36.0

Changes:
--------
--- /work/SRC/openSUSE:Factory/kservice/kservice.changes        2017-07-05 
23:52:52.659231061 +0200
+++ /work/SRC/openSUSE:Factory/.kservice.new/kservice.changes   2017-07-17 
10:25:40.866006135 +0200
@@ -1,0 +2,13 @@
+Wed Jul 12 07:14:02 CEST 2017 - lbeltr...@kde.org
+
+- Update to 5.36.0
+  * New feature release
+  * For more details please see:
+  * https://www.kde.org/announcements/kde-frameworks-5.36.0.php
+- Changes since 5.35.0:
+  * Fix MSVC warning
+  * [FEATURE] Option to build & install QCH file with the public API dox
+  * tests: kautostarttest: fix also expected value
+  * tests: use cmd.exe as TryExec on Windows
+
+-------------------------------------------------------------------

Old:
----
  kservice-5.35.0.tar.xz

New:
----
  kservice-5.36.0.tar.xz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ kservice.spec ++++++
--- /var/tmp/diff_new_pack.4hUlY6/_old  2017-07-17 10:25:41.437925509 +0200
+++ /var/tmp/diff_new_pack.4hUlY6/_new  2017-07-17 10:25:41.437925509 +0200
@@ -17,9 +17,9 @@
 
 
 %bcond_without lang
-%define _tar_path 5.35
+%define _tar_path 5.36
 Name:           kservice
-Version:        5.35.0
+Version:        5.36.0
 Release:        0
 %define kf5_version %{version}
 BuildRequires:  bison

++++++ dont-show-yast-modules-in-the-applications-menu.patch ++++++
--- /var/tmp/diff_new_pack.4hUlY6/_old  2017-07-17 10:25:41.465921562 +0200
+++ /var/tmp/diff_new_pack.4hUlY6/_new  2017-07-17 10:25:41.465921562 +0200
@@ -1,8 +1,8 @@
-diff --git a/src/applications.menu b/src/applications.menu
-index f2d5253..85970c7 100644
---- a/src/applications.menu
-+++ b/src/applications.menu
-@@ -369,7 +369,10 @@
+Index: kservice-5.36.0/src/applications.menu
+===================================================================
+--- kservice-5.36.0.orig/src/applications.menu
++++ kservice-5.36.0/src/applications.menu
+@@ -350,7 +350,10 @@
                <Name>Settingsmenu</Name>
                <Directory>kf5-settingsmenu.directory</Directory>
                <Include>
@@ -14,7 +14,7 @@
                </Include>
        </Menu>
        <Menu>
-@@ -379,6 +383,7 @@
+@@ -360,6 +363,7 @@
                        <And>
                                <Category>System</Category>
                                <Not><Category>X-KDE-More</Category></Not>

++++++ kservice-5.35.0.tar.xz -> kservice-5.36.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kservice-5.35.0/CMakeLists.txt 
new/kservice-5.36.0/CMakeLists.txt
--- old/kservice-5.35.0/CMakeLists.txt  2017-06-03 12:20:06.000000000 +0200
+++ new/kservice-5.36.0/CMakeLists.txt  2017-07-02 10:10:31.000000000 +0200
@@ -1,13 +1,13 @@
 
 cmake_minimum_required(VERSION 3.0)
 
-set(KF5_VERSION "5.35.0") # handled by release scripts
-set(KF5_DEP_VERSION "5.35.0") # handled by release scripts
+set(KF5_VERSION "5.36.0") # handled by release scripts
+set(KF5_DEP_VERSION "5.36.0") # handled by release scripts
 project(KService VERSION ${KF5_VERSION})
 
 # ECM setup
 include(FeatureSummary)
-find_package(ECM 5.35.0  NO_MODULE)
+find_package(ECM 5.36.0  NO_MODULE)
 set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake 
Modules." URL 
"https://projects.kde.org/projects/kdesupport/extra-cmake-modules";)
 feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND 
FATAL_ON_MISSING_REQUIRED_PACKAGES)
 
@@ -18,9 +18,13 @@
 include(KDECMakeSettings)
 include(ECMSetupVersion)
 include(ECMGenerateHeaders)
+include(ECMAddQch)
 
 include(GenerateExportHeader)
 
+option(BUILD_QCH "Build API documentation in QCH format (for e.g. Qt 
Assistant, Qt Creator & KDevelop)" OFF)
+add_feature_info(QCH ${BUILD_QCH} "API documentation in QCH format (for e.g. 
Qt Assistant, Qt Creator & KDevelop)")
+
 ecm_setup_version(PROJECT
                   VARIABLE_PREFIX KSERVICE
                   VERSION_HEADER 
"${CMAKE_CURRENT_BINARY_DIR}/kservice_version.h"
@@ -60,9 +64,38 @@
     PURPOSE "Required for the Trader parser"
 )
 
+add_definitions(-DTRANSLATION_DOMAIN=\"kservice5\")
+if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po")
+    ki18n_install(po)
+
+    if (KF5DocTools_FOUND)
+        kdoctools_install(po)
+    endif()
+endif()
+
+if (KF5DocTools_FOUND)
+    add_subdirectory(docs)
+endif()
+
+add_subdirectory(src)
+if (BUILD_TESTING)
+    add_subdirectory(autotests)
+    add_subdirectory(tests)
+endif()
+
 # create a Config.cmake and a ConfigVersion.cmake file and install them
 set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5Service")
 
+if (BUILD_QCH)
+    ecm_install_qch_export(
+        TARGETS KF5Service_QCH
+        FILE KF5ServiceQchTargets.cmake
+        DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
+        COMPONENT Devel
+    )
+    set(PACKAGE_INCLUDE_QCHTARGETS 
"include(\"\${CMAKE_CURRENT_LIST_DIR}/KF5ServiceQchTargets.cmake\")")
+endif()
+
 include(CMakePackageConfigHelpers)
 
 
configure_package_config_file("${CMAKE_CURRENT_SOURCE_DIR}/KF5ServiceConfig.cmake.in"
@@ -82,23 +115,4 @@
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kservice_version.h
         DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5} COMPONENT Devel )
 
-add_definitions(-DTRANSLATION_DOMAIN=\"kservice5\")
-if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po")
-    ki18n_install(po)
-
-    if (KF5DocTools_FOUND)
-        kdoctools_install(po)
-    endif()
-endif()
-
-if (KF5DocTools_FOUND)
-    add_subdirectory(docs)
-endif()
-
-add_subdirectory(src)
-if (BUILD_TESTING)
-    add_subdirectory(autotests)
-    add_subdirectory(tests)
-endif()
-
 feature_summary(WHAT ALL   FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kservice-5.35.0/KF5ServiceConfig.cmake.in 
new/kservice-5.36.0/KF5ServiceConfig.cmake.in
--- old/kservice-5.35.0/KF5ServiceConfig.cmake.in       2017-06-03 
12:20:06.000000000 +0200
+++ new/kservice-5.36.0/KF5ServiceConfig.cmake.in       2017-07-02 
10:10:31.000000000 +0200
@@ -5,5 +5,6 @@
 find_dependency(KF5CoreAddons "@KF5_DEP_VERSION@")
 
 include("${CMAKE_CURRENT_LIST_DIR}/KF5ServiceTargets.cmake")
+@PACKAGE_INCLUDE_QCHTARGETS@
 include("${CMAKE_CURRENT_LIST_DIR}/KF5ServiceMacros.cmake")
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kservice-5.35.0/autotests/kautostarttest.cpp 
new/kservice-5.36.0/autotests/kautostarttest.cpp
--- old/kservice-5.35.0/autotests/kautostarttest.cpp    2017-06-03 
12:20:06.000000000 +0200
+++ new/kservice-5.36.0/autotests/kautostarttest.cpp    2017-07-02 
10:10:31.000000000 +0200
@@ -125,7 +125,11 @@
         KAutostart autostart(QStringLiteral("doesnotexist"));
         QCOMPARE(autostart.autostarts(), false);
         autostart.setCommand(QStringLiteral("aseigo"));
+#ifdef Q_OS_WIN
+        autostart.setCommandToCheck(QStringLiteral("cmd"));
+#else
         autostart.setCommandToCheck(QStringLiteral("/bin/ls"));
+#endif
         autostart.setVisibleName(QStringLiteral("doesnotexisttest"));
         autostart.setStartPhase(KAutostart::BaseDesktop);
         autostart.setAllowedEnvironments(QStringList(QStringLiteral("KDE")));
@@ -155,7 +159,11 @@
         QCOMPARE(autostart.autostarts(QStringLiteral("XFCE")), true);
         QCOMPARE(autostart.autostarts(QStringLiteral("XFCE"), 
KAutostart::CheckCommand), true);
         QCOMPARE(autostart.visibleName(), QStringLiteral("doesnotexisttest"));
+#ifdef Q_OS_WIN
+        QCOMPARE(autostart.commandToCheck(), QStringLiteral("cmd"));
+#else
         QCOMPARE(autostart.commandToCheck(), QStringLiteral("/bin/ls"));
+#endif
         QCOMPARE(int(autostart.startPhase()), int(KAutostart::BaseDesktop));
         QCOMPARE(autostart.allowedEnvironments(), allowedEnvs);
         QCOMPARE(autostart.excludedEnvironments(), excludedEnvs);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kservice-5.35.0/src/CMakeLists.txt 
new/kservice-5.36.0/src/CMakeLists.txt
--- old/kservice-5.35.0/src/CMakeLists.txt      2017-06-03 12:20:06.000000000 
+0200
+++ new/kservice-5.36.0/src/CMakeLists.txt      2017-07-02 10:10:31.000000000 
+0200
@@ -159,6 +159,29 @@
    DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KService COMPONENT Devel
 )
 
+if(BUILD_QCH)
+    ecm_add_qch(
+        KF5Service_QCH
+        NAME KService
+        BASE_NAME KF5Service
+        VERSION ${KF5_VERSION}
+        ORG_DOMAIN org.kde
+        SOURCES # using only public headers, to cover only public API
+            ${KService_HEADERS}
+        MD_MAINPAGE "${CMAKE_SOURCE_DIR}/README.md"
+        LINK_QCHS
+            KF5Config_QCH
+            KF5CoreAddons_QCH
+        BLANK_MACROS
+            KSERVICE_EXPORT
+            KSERVICE_DEPRECATED
+            KSERVICE_DEPRECATED_EXPORT
+        TAGFILE_INSTALL_DESTINATION ${KDE_INSTALL_QTQCHDIR}
+        QCH_INSTALL_DESTINATION ${KDE_INSTALL_QTQCHDIR}
+        COMPONENT Devel
+    )
+endif()
+
 add_subdirectory(kbuildsycoca)
 
 include(ECMGeneratePriFile)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kservice-5.35.0/src/sycoca/ksycocadict.cpp 
new/kservice-5.36.0/src/sycoca/ksycocadict.cpp
--- old/kservice-5.35.0/src/sycoca/ksycocadict.cpp      2017-06-03 
12:20:06.000000000 +0200
+++ new/kservice-5.36.0/src/sycoca/ksycocadict.cpp      2017-07-02 
10:10:31.000000000 +0200
@@ -559,7 +559,7 @@
     const uint hash = hashKey(key) % hashTableSize;
     //qCDebug(SYCOCA) << "hash is" << hash;
 
-    const qint32 off = offset + sizeof(qint32) * hash;
+    const qint64 off = offset + sizeof(qint32) * hash;
     //qCDebug(SYCOCA) << QString("off is %1").arg(off,8,16);
     stream->device()->seek(off);
 

++++++ kservice-desktop-translations.patch ++++++
--- /var/tmp/diff_new_pack.4hUlY6/_old  2017-07-17 10:25:41.637897318 +0200
+++ /var/tmp/diff_new_pack.4hUlY6/_new  2017-07-17 10:25:41.637897318 +0200
@@ -1,8 +1,8 @@
-diff --git a/src/services/kservicegroup.cpp b/src/services/kservicegroup.cpp
-index b182b5a..16c2846 100644
---- a/src/services/kservicegroup.cpp
-+++ b/src/services/kservicegroup.cpp
-@@ -52,9 +52,9 @@ void KServiceGroupPrivate::load(const QString &cfg)
+Index: kservice-5.36.0/src/services/kservicegroup.cpp
+===================================================================
+--- kservice-5.36.0.orig/src/services/kservicegroup.cpp
++++ kservice-5.36.0/src/services/kservicegroup.cpp
+@@ -54,9 +54,9 @@ void KServiceGroupPrivate::load(const QS
  
      const KConfigGroup config = desktopFile.desktopGroup();
  


Reply via email to