Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package extra-cmake-modules for
openSUSE:Factory checked in at 2021-03-16 15:39:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/extra-cmake-modules (Old)
and /work/SRC/openSUSE:Factory/.extra-cmake-modules.new.2401 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "extra-cmake-modules"
Tue Mar 16 15:39:54 2021 rev:87 rq:878777 version:5.80.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/extra-cmake-modules/extra-cmake-modules.changes
2021-02-17 18:11:22.817932764 +0100
+++
/work/SRC/openSUSE:Factory/.extra-cmake-modules.new.2401/extra-cmake-modules.changes
2021-03-16 15:41:01.068711992 +0100
@@ -1,0 +2,17 @@
+Sun Mar 7 09:26:29 UTC 2021 - Christophe Giboudeaux <[email protected]>
+
+- Update to 5.80.0
+ * New feature release
+ * For more details please see:
+ * https://kde.org/announcements/frameworks/5/5.80.0
+- Changes since 5.79.0:
+ * Fix ECMCheckOutboundLicenseTest to find the FindReuseTool.cmake file
+ * ecm_qt_declare_logging_category: support target arg to append source file
to
+ * Add FindIsoCodes module
+ * clang-format: set AlwaysBreakTemplateDeclarations to true
+ * Add clang-format target by default in KDEFrameworkCompilerSettings
+ * Add FindLibcap.cmake
+ * Fix relative path edge case in ECMGeneratePriFile
+ * Define relative paths when KDE_INSTALL_USE_QT_SYS_PATHS is enabled
+
+-------------------------------------------------------------------
Old:
----
extra-cmake-modules-5.79.0.tar.xz
extra-cmake-modules-5.79.0.tar.xz.sig
New:
----
extra-cmake-modules-5.80.0.tar.xz
extra-cmake-modules-5.80.0.tar.xz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ extra-cmake-modules.spec ++++++
--- /var/tmp/diff_new_pack.e4wqqP/_old 2021-03-16 15:41:01.648712919 +0100
+++ /var/tmp/diff_new_pack.e4wqqP/_new 2021-03-16 15:41:01.652712926 +0100
@@ -16,7 +16,7 @@
#
-%define _tar_path 5.79
+%define _tar_path 5.80
# Full KF5 version (e.g. 5.33.0)
%{!?_kf5_version: %global _kf5_version %{version}}
# Last major and minor KF5 version (e.g. 5.33)
@@ -29,7 +29,7 @@
# Only needed for the package signature condition
%bcond_without lang
Name: extra-cmake-modules
-Version: 5.79.0
+Version: 5.80.0
Release: 0
Summary: CMake modules
License: BSD-3-Clause
++++++ extra-cmake-modules-5.79.0.tar.xz -> extra-cmake-modules-5.80.0.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-5.79.0/CMakeLists.txt
new/extra-cmake-modules-5.80.0/CMakeLists.txt
--- old/extra-cmake-modules-5.79.0/CMakeLists.txt 2021-02-05
16:18:39.000000000 +0100
+++ new/extra-cmake-modules-5.80.0/CMakeLists.txt 2021-02-26
22:48:38.000000000 +0100
@@ -11,7 +11,7 @@
# Preliminary setup
#
-set(VERSION "5.79.0") # handled by release scripts
+set(VERSION "5.80.0") # handled by release scripts
if (POLICY CMP0048)
cmake_policy(SET CMP0048 NEW)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.79.0/docs/find-module/FindIsoCodes.rst
new/extra-cmake-modules-5.80.0/docs/find-module/FindIsoCodes.rst
--- old/extra-cmake-modules-5.79.0/docs/find-module/FindIsoCodes.rst
1970-01-01 01:00:00.000000000 +0100
+++ new/extra-cmake-modules-5.80.0/docs/find-module/FindIsoCodes.rst
2021-02-26 22:48:38.000000000 +0100
@@ -0,0 +1 @@
+.. ecm-module:: ../../find-modules/FindIsoCodes.cmake
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.79.0/docs/find-module/FindLibcap.rst
new/extra-cmake-modules-5.80.0/docs/find-module/FindLibcap.rst
--- old/extra-cmake-modules-5.79.0/docs/find-module/FindLibcap.rst
1970-01-01 01:00:00.000000000 +0100
+++ new/extra-cmake-modules-5.80.0/docs/find-module/FindLibcap.rst
2021-02-26 22:48:38.000000000 +0100
@@ -0,0 +1 @@
+.. ecm-module:: ../../find-modules/FindLibcap.cmake
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.79.0/find-modules/FindIsoCodes.cmake
new/extra-cmake-modules-5.80.0/find-modules/FindIsoCodes.cmake
--- old/extra-cmake-modules-5.79.0/find-modules/FindIsoCodes.cmake
1970-01-01 01:00:00.000000000 +0100
+++ new/extra-cmake-modules-5.80.0/find-modules/FindIsoCodes.cmake
2021-02-26 22:48:38.000000000 +0100
@@ -0,0 +1,41 @@
+#.rst:
+# FindIsoCodes
+# ------------
+#
+# Try to find iso-codes data files.
+# Once done this will define:
+# ``IsoCodes_FOUND``
+# Whether the system has iso-codes
+# ``IsoCodes_PREFIX``
+# The location in which the iso-codes data files are found
+# ``IsoCodes_DOMAINS``
+# The available domains provided by iso-codes
+#
+# Since 5.80.0.
+
+#=============================================================================
+# SPDX-FileCopyrightText: 2016 Pino Toscano <[email protected]>
+# SPDX-FileCopyrightText: 2021 Volker Krause <[email protected]>
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#=============================================================================
+
+find_package(PkgConfig)
+pkg_check_modules(PKG_iso_codes QUIET iso-codes)
+
+set(IsoCodes_VERSION ${PKG_iso_codes_VERSION})
+set(IsoCodes_PREFIX ${PKG_iso_codes_PREFIX})
+pkg_get_variable(IsoCodes_DOMAINS iso-codes domains)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(IsoCodes
+ FOUND_VAR IsoCodes_FOUND
+ REQUIRED_VARS IsoCodes_DOMAINS IsoCodes_PREFIX
+ VERSION_VAR IsoCodes_VERSION
+)
+
+include(FeatureSummary)
+set_package_properties(IsoCodes PROPERTIES
+ URL "https://salsa.debian.org/iso-codes-team/iso-codes";
+ DESCRIPTION "Data about various ISO standards (e.g. country, language,
language scripts, and currency names)"
+)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.79.0/find-modules/FindLibcap.cmake
new/extra-cmake-modules-5.80.0/find-modules/FindLibcap.cmake
--- old/extra-cmake-modules-5.79.0/find-modules/FindLibcap.cmake
1970-01-01 01:00:00.000000000 +0100
+++ new/extra-cmake-modules-5.80.0/find-modules/FindLibcap.cmake
2021-02-26 22:48:38.000000000 +0100
@@ -0,0 +1,44 @@
+#.rst:
+# FindLibcap
+# ----------
+# Try to find the setcap binary and cap libraries
+#
+# This will define:
+#
+# Libcap_FOUND - system has the cap library and setcap binary
+# Libcap_LIBRARIES - cap libraries to link against
+# SETCAP_EXECUTABLE - path of the setcap binary
+#
+# In addition, the following targets are defined:
+#
+# Libcap::SetCapabilities
+#
+# Since 5.80.0
+#
+#=====================================================================
+# SPDX-FileCopyrightText: 2014 Hrvoje Senjan <[email protected]>
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#=====================================================================
+
+find_program(SETCAP_EXECUTABLE NAMES setcap DOC "The setcap executable")
+
+find_library(Libcap_LIBRARIES NAMES cap DOC "The cap (capabilities) library")
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(Libcap FOUND_VAR Libcap_FOUND
+ REQUIRED_VARS SETCAP_EXECUTABLE
Libcap_LIBRARIES)
+
+if(Libcap_FOUND AND NOT TARGET Libcap::SetCapabilities)
+ add_executable(Libcap::SetCapabilities IMPORTED)
+ set_target_properties(Libcap::SetCapabilities PROPERTIES
+ IMPORTED_LOCATION "${SETCAP_EXECUTABLE}"
+ )
+endif()
+
+mark_as_advanced(SETCAP_EXECUTABLE Libcap_LIBRARIES)
+
+include(FeatureSummary)
+set_package_properties(Libcap PROPERTIES
+ URL https://sites.google.com/site/fullycapable/
+ DESCRIPTION "Capabilities are a measure to limit the omnipotence of the
superuser.")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.79.0/kde-modules/KDEClangFormat.cmake
new/extra-cmake-modules-5.80.0/kde-modules/KDEClangFormat.cmake
--- old/extra-cmake-modules-5.79.0/kde-modules/KDEClangFormat.cmake
2021-02-05 16:18:39.000000000 +0100
+++ new/extra-cmake-modules-5.80.0/kde-modules/KDEClangFormat.cmake
2021-02-26 22:48:38.000000000 +0100
@@ -22,6 +22,8 @@
# added to version control. It is recommended to add it to the ``.gitignore``
file: ``/.clang-format``.
#
# Since 5.79: If the source folder already contains a .clang-format file it is
not overwritten.
+# Since version 5.80 this function is called by default in
KDEFrameworkCompilerSettings. If directories should be excluded from
+# the formatting a .clang-format file with "DisableFormat: true" and
"SortIncludes: false" should be created.
#
# Example usage:
#
@@ -43,6 +45,7 @@
#=============================================================================
# SPDX-FileCopyrightText: 2019 Christoph Cullmann <[email protected]>
+# SPDX-FileCopyrightText: 2021 Alexander Lohnau <[email protected]>
#
# SPDX-License-Identifier: BSD-3-Clause
@@ -67,6 +70,11 @@
# formatting target
function(KDE_CLANG_FORMAT)
+ if (TARGET clang-format)
+ message(WARNING "the kde_clang_format function was already called")
+ return()
+ endif()
+
# add target without specific commands first, we add the real calls
file-per-file to avoid command line length issues
add_custom_target(clang-format COMMENT "Formatting sources in
${CMAKE_CURRENT_SOURCE_DIR} with ${KDE_CLANG_FORMAT_EXECUTABLE}...")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.79.0/kde-modules/KDEFrameworkCompilerSettings.cmake
new/extra-cmake-modules-5.80.0/kde-modules/KDEFrameworkCompilerSettings.cmake
---
old/extra-cmake-modules-5.79.0/kde-modules/KDEFrameworkCompilerSettings.cmake
2021-02-05 16:18:39.000000000 +0100
+++
new/extra-cmake-modules-5.80.0/kde-modules/KDEFrameworkCompilerSettings.cmake
2021-02-26 22:48:38.000000000 +0100
@@ -74,3 +74,10 @@
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wzero-as-null-pointer-constant"
)
endif()
endif()
+
+if (NOT ("${ECM_GLOBAL_FIND_VERSION}" VERSION_LESS "5.80.0"))
+ include(KDEClangFormat)
+ # add clang-format target
+ file(GLOB_RECURSE ALL_CLANG_FORMAT_SOURCE_FILES *.cpp *.h *.c)
+ kde_clang_format(${ALL_CLANG_FORMAT_SOURCE_FILES})
+endif ()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.79.0/kde-modules/KDEInstallDirs.cmake
new/extra-cmake-modules-5.80.0/kde-modules/KDEInstallDirs.cmake
--- old/extra-cmake-modules-5.79.0/kde-modules/KDEInstallDirs.cmake
2021-02-05 16:18:39.000000000 +0100
+++ new/extra-cmake-modules-5.80.0/kde-modules/KDEInstallDirs.cmake
2021-02-26 22:48:38.000000000 +0100
@@ -469,20 +469,30 @@
option (KDE_INSTALL_USE_QT_SYS_PATHS "Install mkspecs files, QCH files for
Qt-based libs, Plugins and Imports to the Qt 5 install dir"
"${_default_KDE_INSTALL_USE_QT_SYS_PATHS}")
if(KDE_INSTALL_USE_QT_SYS_PATHS)
# Qt-specific vars
+ query_qmake(qt_install_prefix_dir QT_INSTALL_PREFIX TRY)
query_qmake(qt_plugins_dir QT_INSTALL_PLUGINS)
+ if(qt_install_prefix_dir STREQUAL "${CMAKE_INSTALL_PREFIX}")
+ file(RELATIVE_PATH qt_plugins_dir ${qt_install_prefix_dir}
${qt_plugins_dir})
+ endif()
_define_absolute(QTPLUGINDIR ${qt_plugins_dir}
"Qt plugins"
QT_PLUGIN_INSTALL_DIR)
query_qmake(qt_imports_dir QT_INSTALL_IMPORTS)
+ if(qt_install_prefix_dir STREQUAL "${CMAKE_INSTALL_PREFIX}")
+ file(RELATIVE_PATH qt_imports_dir ${qt_install_prefix_dir}
${qt_imports_dir})
+ endif()
_define_absolute(QTQUICKIMPORTSDIR ${qt_imports_dir}
"QtQuick1 imports"
IMPORTS_INSTALL_DIR)
query_qmake(qt_qml_dir QT_INSTALL_QML)
+ if(qt_install_prefix_dir STREQUAL "${CMAKE_INSTALL_PREFIX}")
+ file(RELATIVE_PATH qt_qml_dir ${qt_install_prefix_dir} ${qt_qml_dir})
+ endif()
_define_absolute(QMLDIR ${qt_qml_dir}
"QtQuick2 imports"
QML_INSTALL_DIR)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.79.0/kde-modules/clang-format.cmake
new/extra-cmake-modules-5.80.0/kde-modules/clang-format.cmake
--- old/extra-cmake-modules-5.79.0/kde-modules/clang-format.cmake
2021-02-05 16:18:39.000000000 +0100
+++ new/extra-cmake-modules-5.80.0/kde-modules/clang-format.cmake
2021-02-26 22:48:38.000000000 +0100
@@ -66,6 +66,9 @@
# we use template< without space.
SpaceAfterTemplateKeyword: false
+# Always break after template declaration
+AlwaysBreakTemplateDeclarations: true
+
# macros for which the opening brace stays attached.
ForEachMacros: [ foreach, Q_FOREACH, BOOST_FOREACH, forever, Q_FOREVER,
QBENCHMARK, QBENCHMARK_ONCE ]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.79.0/modules/ECMCheckOutboundLicense.cmake
new/extra-cmake-modules-5.80.0/modules/ECMCheckOutboundLicense.cmake
--- old/extra-cmake-modules-5.79.0/modules/ECMCheckOutboundLicense.cmake
2021-02-05 16:18:39.000000000 +0100
+++ new/extra-cmake-modules-5.80.0/modules/ECMCheckOutboundLicense.cmake
2021-02-26 22:48:38.000000000 +0100
@@ -130,7 +130,6 @@
# generate file with list of relative file paths
string(REPLACE "${CMAKE_BINARY_DIR}/" "" RELATIVE_PREFIX_PATH
${CMAKE_CURRENT_BINARY_DIR})
set(OUTPUT_FILE ${CMAKE_BINARY_DIR}/licensecheck_${ARG_TEST_NAME}.txt)
- message(STATUS "Generate test input file: ${OUTPUT_FILE}")
file(REMOVE ${OUTPUT_FILE})
foreach(_file ${ARG_FILES})
# check script expects files to start with "./", which must be
relative to CMAKE_SOURCE_DIR
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.79.0/modules/ECMGeneratePriFile.cmake
new/extra-cmake-modules-5.80.0/modules/ECMGeneratePriFile.cmake
--- old/extra-cmake-modules-5.79.0/modules/ECMGeneratePriFile.cmake
2021-02-05 16:18:39.000000000 +0100
+++ new/extra-cmake-modules-5.80.0/modules/ECMGeneratePriFile.cmake
2021-02-26 22:48:38.000000000 +0100
@@ -89,8 +89,17 @@
if(KDE_INSTALL_USE_QT_SYS_PATHS OR _askqmake)
include(ECMQueryQmake)
+ query_qmake(qt_install_prefix_dir QT_INSTALL_PREFIX)
query_qmake(qt_host_data_dir QT_HOST_DATA)
- set(ECM_MKSPECS_INSTALL_DIR ${qt_host_data_dir}/mkspecs/modules CACHE PATH
"The directory where mkspecs will be installed to.")
+ if(qt_install_prefix_dir STREQUAL "${CMAKE_INSTALL_PREFIX}")
+ file(RELATIVE_PATH qt_host_data_dir ${qt_install_prefix_dir}
${qt_host_data_dir})
+ endif()
+ if(qt_host_data_dir STREQUAL "")
+ set(mkspecs_install_dir mkspecs/modules)
+ else()
+ set(mkspecs_install_dir ${qt_host_data_dir}/mkspecs/modules)
+ endif()
+ set(ECM_MKSPECS_INSTALL_DIR ${mkspecs_install_dir} CACHE PATH "The directory
where mkspecs will be installed to.")
else()
set(ECM_MKSPECS_INSTALL_DIR mkspecs/modules CACHE PATH "The directory where
mkspecs will be installed to.")
endif()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.79.0/modules/ECMQtDeclareLoggingCategory.cmake
new/extra-cmake-modules-5.80.0/modules/ECMQtDeclareLoggingCategory.cmake
--- old/extra-cmake-modules-5.79.0/modules/ECMQtDeclareLoggingCategory.cmake
2021-02-05 16:18:39.000000000 +0100
+++ new/extra-cmake-modules-5.80.0/modules/ECMQtDeclareLoggingCategory.cmake
2021-02-26 22:48:38.000000000 +0100
@@ -12,7 +12,7 @@
#
# ::
#
-# ecm_qt_declare_logging_category(<sources_var>
+# ecm_qt_declare_logging_category(<sources_var_name(|target (since 5.80))>
# HEADER <filename>
# IDENTIFIER <identifier>
# CATEGORY_NAME <category_name>
@@ -23,11 +23,15 @@
# )
#
# A header file, ``<filename>``, will be generated along with a corresponding
-# source file, which will be added to ``<sources_var>``. These will provide a
-# QLoggingCategory category that can be referred to from C++ code using
-# ``<identifier>``, and from the logging configuration using
+# source file. These will provide a QLoggingCategory category that can be
referred
+# to from C++ code using ``<identifier>``, and from the logging configuration
using
# ``<category_name>``.
#
+# The generated source file will be added to the variable with the name
+# ``<sources_var_name>``. If the given argument is a target though, instead
both the
+# generated header file and the generated source file will be added to the
target as
+# private sources (since 5.80).
+#
# If ``<filename>`` is not absolute, it will be taken relative to the current
# binary directory.
#
@@ -265,9 +269,13 @@
configure_file("${_ECM_QT_DECLARE_LOGGING_CATEGORY_TEMPLATE_CPP}"
"${cpp_filename}")
configure_file("${_ECM_QT_DECLARE_LOGGING_CATEGORY_TEMPLATE_H}"
"${ARG_HEADER}")
- set(sources "${${sources_var}}")
- list(APPEND sources "${cpp_filename}")
- set(${sources_var} "${sources}" PARENT_SCOPE)
+ if(TARGET ${sources_var})
+ target_sources(${sources_var} PRIVATE ${cpp_filename} "${ARG_HEADER}")
+ else()
+ set(sources "${${sources_var}}")
+ list(APPEND sources "${cpp_filename}")
+ set(${sources_var} "${sources}" PARENT_SCOPE)
+ endif()
# note data in global properties
if (ARG_EXPORT)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-5.79.0/tests/CMakeLists.txt
new/extra-cmake-modules-5.80.0/tests/CMakeLists.txt
--- old/extra-cmake-modules-5.79.0/tests/CMakeLists.txt 2021-02-05
16:18:39.000000000 +0100
+++ new/extra-cmake-modules-5.80.0/tests/CMakeLists.txt 2021-02-26
22:48:38.000000000 +0100
@@ -60,9 +60,6 @@
list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/find-modules)
-# enforce finding of ReuseTool in parent scope of module, beause
-# only here the module path can point into the source directory
-find_package(ReuseTool)
add_subdirectory(ECMCheckOutboundLicenseTest)
# Skip if PyQt not available
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.79.0/tests/ECMCheckOutboundLicenseTest/CMakeLists.txt
new/extra-cmake-modules-5.80.0/tests/ECMCheckOutboundLicenseTest/CMakeLists.txt
---
old/extra-cmake-modules-5.79.0/tests/ECMCheckOutboundLicenseTest/CMakeLists.txt
2021-02-05 16:18:39.000000000 +0100
+++
new/extra-cmake-modules-5.80.0/tests/ECMCheckOutboundLicenseTest/CMakeLists.txt
2021-02-26 22:48:38.000000000 +0100
@@ -1,5 +1,9 @@
set(ECM_MODULE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../modules)
-set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../modules)
+set(CMAKE_MODULE_PATH
+ ${CMAKE_CURRENT_SOURCE_DIR}/../../modules
+ ${CMAKE_CURRENT_SOURCE_DIR}/../../find-modules
+)
+
include(ECMCheckOutboundLicense)
# check relative and absolute input paths
