Hello community,

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

Package is "kwayland"

Mon Jul 17 10:26:04 2017 rev:38 rq:509936 version:5.36.0

Changes:
--------
--- /work/SRC/openSUSE:Factory/kwayland/kwayland.changes        2017-07-05 
23:53:24.378763128 +0200
+++ /work/SRC/openSUSE:Factory/.kwayland.new/kwayland.changes   2017-07-17 
10:26:05.590520615 +0200
@@ -1,0 +2,11 @@
+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:
+  * [autotests/server] Check whether test is run as root
+  * [FEATURE] Option to build & install QCH file with the public API dox
+
+-------------------------------------------------------------------

Old:
----
  kwayland-5.35.0.tar.xz

New:
----
  kwayland-5.36.0.tar.xz

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

Other differences:
------------------
++++++ kwayland.spec ++++++
--- /var/tmp/diff_new_pack.m5oDD0/_old  2017-07-17 10:26:06.134443936 +0200
+++ /var/tmp/diff_new_pack.m5oDD0/_new  2017-07-17 10:26:06.138443372 +0200
@@ -16,9 +16,9 @@
 #
 
 
-%define _tar_path 5.35
+%define _tar_path 5.36
 Name:           kwayland
-Version:        5.35.0
+Version:        5.36.0
 Release:        0
 Summary:        KDE Wayland library
 License:        LGPL-2.1+

++++++ kwayland-5.35.0.tar.xz -> kwayland-5.36.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kwayland-5.35.0/CMakeLists.txt 
new/kwayland-5.36.0/CMakeLists.txt
--- old/kwayland-5.35.0/CMakeLists.txt  2017-06-03 11:16:30.000000000 +0200
+++ new/kwayland-5.36.0/CMakeLists.txt  2017-07-01 17:01:18.000000000 +0200
@@ -1,11 +1,11 @@
 cmake_minimum_required(VERSION 3.0)
 
-set(KF5_VERSION "5.35.0") # handled by release scripts
+set(KF5_VERSION "5.36.0") # handled by release scripts
 project(KWayland 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)
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
@@ -18,7 +18,10 @@
 include(CMakeFindFrameworks)
 
 include(ECMPoQmTools)
+include(ECMAddQch)
 
+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 KWAYLAND
                         VERSION_HEADER 
"${CMAKE_CURRENT_BINARY_DIR}/kwayland_version.h"
@@ -62,6 +65,16 @@
 # create a Config.cmake and a ConfigVersion.cmake file and install them
 set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/KF5Wayland")
 
+if (BUILD_QCH)
+    ecm_install_qch_export(
+        TARGETS KF5Wayland_QCH
+        FILE KF5WaylandQchTargets.cmake
+        DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
+        COMPONENT Devel
+    )
+    set(PACKAGE_INCLUDE_QCHTARGETS 
"include(\"\${CMAKE_CURRENT_LIST_DIR}/KF5WaylandQchTargets.cmake\")")
+endif()
+
 
configure_package_config_file("${CMAKE_CURRENT_SOURCE_DIR}/KF5WaylandConfig.cmake.in"
                               
"${CMAKE_CURRENT_BINARY_DIR}/KF5WaylandConfig.cmake"
                               INSTALL_DESTINATION  ${CMAKECONFIG_INSTALL_DIR}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kwayland-5.35.0/KF5WaylandConfig.cmake.in 
new/kwayland-5.36.0/KF5WaylandConfig.cmake.in
--- old/kwayland-5.35.0/KF5WaylandConfig.cmake.in       2017-06-03 
11:16:30.000000000 +0200
+++ new/kwayland-5.36.0/KF5WaylandConfig.cmake.in       2017-07-01 
17:01:18.000000000 +0200
@@ -4,6 +4,7 @@
 find_dependency(Qt5Gui @REQUIRED_QT_VERSION@)
 
 include("${CMAKE_CURRENT_LIST_DIR}/KF5WaylandTargets.cmake")
+@PACKAGE_INCLUDE_QCHTARGETS@
 
 function(kwaylandtest testBinaryName)
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kwayland-5.35.0/autotests/server/test_display.cpp 
new/kwayland-5.36.0/autotests/server/test_display.cpp
--- old/kwayland-5.35.0/autotests/server/test_display.cpp       2017-06-03 
11:16:30.000000000 +0200
+++ new/kwayland-5.36.0/autotests/server/test_display.cpp       2017-07-01 
17:01:18.000000000 +0200
@@ -133,7 +133,13 @@
     ClientConnection *connection = display.getConnection(client);
     QVERIFY(connection);
     QCOMPARE(connection->client(), client);
+    if (getuid() == 0) {
+        QEXPECT_FAIL("", "Please don't run test as root", Continue);
+    }
     QVERIFY(connection->userId() != 0);
+    if (getgid() == 0) {
+        QEXPECT_FAIL("", "Please don't run test as root", Continue);
+    }
     QVERIFY(connection->groupId() != 0);
     QVERIFY(connection->processId() != 0);
     QCOMPARE(connection->display(), &display);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kwayland-5.35.0/src/CMakeLists.txt 
new/kwayland-5.36.0/src/CMakeLists.txt
--- old/kwayland-5.35.0/src/CMakeLists.txt      2017-06-03 11:16:30.000000000 
+0200
+++ new/kwayland-5.36.0/src/CMakeLists.txt      2017-07-01 17:01:18.000000000 
+0200
@@ -3,3 +3,45 @@
 add_subdirectory(tools)
 
 install( FILES org_kde_kwayland.categories DESTINATION ${KDE_INSTALL_CONFDIR} )
+
+
+if(BUILD_QCH)
+    macro(_make_absolute var_name base_path)
+        set(_result)
+        foreach(_path ${${var_name}})
+            if(IS_ABSOLUTE "${_path}")
+                list(APPEND _result "${_path}")
+            else()
+                list(APPEND _result "${base_path}/${_path}")
+            endif()
+        endforeach()
+        set(${var_name} ${_result})
+    endmacro()
+
+    _make_absolute(KWaylandClient_APIDOX_SRCS 
"${CMAKE_CURRENT_SOURCE_DIR}/client")
+    _make_absolute(KWaylandServer_APIDOX_SRCS 
"${CMAKE_CURRENT_SOURCE_DIR}/server")
+
+    ecm_add_qch(
+        KF5Wayland_QCH
+        NAME KWayland
+        BASE_NAME KF5Wayland
+        VERSION ${KF5_VERSION}
+        ORG_DOMAIN org.kde
+        SOURCES # using only public headers, to cover only public API
+            ${KWaylandClient_APIDOX_SRCS}
+            ${KWaylandServer_APIDOX_SRCS}
+        MD_MAINPAGE "${CMAKE_SOURCE_DIR}/README.md"
+        LINK_QCHS
+            Qt5Gui_QCH
+        BLANK_MACROS
+            KWAYLANDCLIENT_EXPORT
+            KWAYLANDCLIENT_DEPRECATED
+            KWAYLANDCLIENT_DEPRECATED_EXPORT
+            KWAYLANDSERVER_EXPORT
+            KWAYLANDSERVER_DEPRECATED
+            KWAYLANDSERVER_DEPRECATED_EXPORT
+        TAGFILE_INSTALL_DESTINATION ${KDE_INSTALL_QTQCHDIR}
+        QCH_INSTALL_DESTINATION ${KDE_INSTALL_QTQCHDIR}
+        COMPONENT Devel
+    )
+endif()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kwayland-5.35.0/src/client/CMakeLists.txt 
new/kwayland-5.36.0/src/client/CMakeLists.txt
--- old/kwayland-5.35.0/src/client/CMakeLists.txt       2017-06-03 
11:16:30.000000000 +0200
+++ new/kwayland-5.36.0/src/client/CMakeLists.txt       2017-07-01 
17:01:18.000000000 +0200
@@ -163,7 +163,7 @@
 
 install(TARGETS KF5WaylandClient EXPORT KF5WaylandTargets 
${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
 
-install(FILES
+set(CLIENT_LIB_HEADERS
   ${CMAKE_CURRENT_BINARY_DIR}/KWayland/Client/kwaylandclient_export.h
   blur.h
   buffer.h
@@ -205,9 +205,16 @@
   touch.h
   textinput.h
   xdgshell.h
+)
+
+install(FILES
+  ${CLIENT_LIB_HEADERS}
   DESTINATION ${KF5_INCLUDE_INSTALL_DIR}/KWayland/Client COMPONENT Devel
 )
 
+# make available to ecm_add_qch in parent folder
+set(KWaylandClient_APIDOX_SRCS ${CLIENT_LIB_HEADERS} PARENT_SCOPE)
+
 include(ECMGeneratePriFile)
 ecm_generate_pri_file(BASE_NAME KWaylandClient LIB_NAME KF5WaylandClient DEPS 
"core" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR 
${KDE_INSTALL_INCLUDEDIR_KF5})
 install(FILES ${PRI_FILENAME}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kwayland-5.35.0/src/server/CMakeLists.txt 
new/kwayland-5.36.0/src/server/CMakeLists.txt
--- old/kwayland-5.35.0/src/server/CMakeLists.txt       2017-06-03 
11:16:30.000000000 +0200
+++ new/kwayland-5.36.0/src/server/CMakeLists.txt       2017-07-01 
17:01:18.000000000 +0200
@@ -169,7 +169,7 @@
 
 install(TARGETS KF5WaylandServer EXPORT KF5WaylandTargets 
${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
 
-install(FILES
+set(SERVER_LIB_HEADERS
   ${CMAKE_CURRENT_BINARY_DIR}/KWayland/Server/kwaylandserver_export.h
   blur_interface.h
   contrast_interface.h
@@ -210,9 +210,16 @@
   textinput_interface.h
   touch_interface.h
   xdgshell_interface.h
+)
+
+install(FILES
+  ${SERVER_LIB_HEADERS}
   DESTINATION ${KF5_INCLUDE_INSTALL_DIR}/KWayland/Server COMPONENT Devel
 )
 
+# make available to ecm_add_qch in parent folder
+set(KWaylandServer_APIDOX_SRCS ${SERVER_LIB_HEADERS} PARENT_SCOPE)
+
 include(ECMGeneratePriFile)
 ecm_generate_pri_file(BASE_NAME KWaylandServer LIB_NAME KF5WaylandServer DEPS 
"core" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR 
${KDE_INSTALL_INCLUDEDIR_KF5})
 install(FILES ${PRI_FILENAME}


Reply via email to