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 2023-05-14 16:30:10
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/extra-cmake-modules (Old)
and /work/SRC/openSUSE:Factory/.extra-cmake-modules.new.1533 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "extra-cmake-modules"
Sun May 14 16:30:10 2023 rev:113 rq:1086898 version:5.106.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/extra-cmake-modules/extra-cmake-modules.changes
2023-04-09 18:41:14.369826981 +0200
+++
/work/SRC/openSUSE:Factory/.extra-cmake-modules.new.1533/extra-cmake-modules.changes
2023-05-14 16:32:10.603329204 +0200
@@ -1,0 +2,14 @@
+Sat May 6 14:01:24 UTC 2023 - Christophe Marin <[email protected]>
+
+- Update to 5.106.0
+ * New feature release
+ * For more details please see:
+ * https://kde.org/announcements/frameworks/5/5.106.0
+- Changes since 5.105.0:
+ * Query gradle plugin version from Qt
+ * ecm_process_po_files_as_qm: use own subdir ECMPoQm/ for build artifacts
+ * Fix generate_export_header tests failures with parallel jobs (kde#464348)
+ * ECMGenerateExportHeader: add USE_VERSION_HEADER arg (& related tune args)
+ * ECMGenerateExportHeader: avoid helper C++ macro shared across gen. headers
+
+-------------------------------------------------------------------
Old:
----
extra-cmake-modules-5.105.0.tar.xz
extra-cmake-modules-5.105.0.tar.xz.sig
New:
----
extra-cmake-modules-5.106.0.tar.xz
extra-cmake-modules-5.106.0.tar.xz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ extra-cmake-modules.spec ++++++
--- /var/tmp/diff_new_pack.IkwLH6/_old 2023-05-14 16:32:11.095331583 +0200
+++ /var/tmp/diff_new_pack.IkwLH6/_new 2023-05-14 16:32:11.099331602 +0200
@@ -30,7 +30,7 @@
# Only needed for the package signature condition
%bcond_without released
Name: extra-cmake-modules%{?pkg_suffix}
-Version: 5.105.0
+Version: 5.106.0
Release: 0
Summary: CMake modules
License: BSD-3-Clause
++++++ extra-cmake-modules-5.105.0.tar.xz -> extra-cmake-modules-5.106.0.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-5.105.0/CMakeLists.txt
new/extra-cmake-modules-5.106.0/CMakeLists.txt
--- old/extra-cmake-modules-5.105.0/CMakeLists.txt 2023-03-26
16:18:14.000000000 +0200
+++ new/extra-cmake-modules-5.106.0/CMakeLists.txt 2023-04-29
18:44:55.000000000 +0200
@@ -11,7 +11,7 @@
# Preliminary setup
#
-set(VERSION "5.105.0") # handled by release scripts
+set(VERSION "5.106.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.105.0/find-modules/FindGradle.cmake
new/extra-cmake-modules-5.106.0/find-modules/FindGradle.cmake
--- old/extra-cmake-modules-5.105.0/find-modules/FindGradle.cmake
2023-03-26 16:18:14.000000000 +0200
+++ new/extra-cmake-modules-5.106.0/find-modules/FindGradle.cmake
2023-04-29 18:44:55.000000000 +0200
@@ -57,11 +57,8 @@
add_custom_target(gradle DEPENDS ${Gradle_EXECUTABLE})
# Android Gradle plugin version (not the Gradle version!) used by Qt, for use
in our own build.gradle files
-if (QT_MAJOR_VERSION EQUAL "5" AND Qt5Core_VERSION VERSION_LESS 5.15.8)
- set(Gradle_ANDROID_GRADLE_PLUGIN_VERSION 3.6.4)
-else()
- set(Gradle_ANDROID_GRADLE_PLUGIN_VERSION 7.0.2)
-endif()
+file(READ ${_qt_install_root}/src/android/templates/build.gradle
_build_grade_template)
+string(REGEX MATCH "[0-9]+\.[0-9]+\.[0-9]+"
Gradle_ANDROID_GRADLE_PLUGIN_VERSION ${_build_grade_template})
find_package_handle_standard_args(Gradle DEFAULT_MSG Gradle_EXECUTABLE)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.105.0/modules/ECMGenerateExportHeader.cmake
new/extra-cmake-modules-5.106.0/modules/ECMGenerateExportHeader.cmake
--- old/extra-cmake-modules-5.105.0/modules/ECMGenerateExportHeader.cmake
2023-03-26 16:18:14.000000000 +0200
+++ new/extra-cmake-modules-5.106.0/modules/ECMGenerateExportHeader.cmake
2023-04-29 18:44:55.000000000 +0200
@@ -33,6 +33,9 @@
[EXCLUDE_DEPRECATED_BEFORE_AND_AT
<exclude_deprecated_before_and_at_version>]
[NO_BUILD_SET_DEPRECATED_WARNINGS_SINCE]
[NO_DEFINITION_EXPORT_TO_BUILD_INTERFACE]
+ [USE_VERSION_HEADER [<version_file_name>]] # Since 5.106
+ [VERSION_BASE_NAME <version_base_name>] # Since 5.106
+ [VERSION_MACRO_NAME <version_macro_name>] # Since 5.106
[CUSTOM_CONTENT_FROM_VARIABLE <variable>]
)
@@ -85,6 +88,21 @@
project automatically build against the full API included in the build and
without any deprecation warnings for it.
+``USE_VERSION_HEADER`` defines whether a given header file
+``<version_file_name>`` providing macros specifying the library version should
+be included in the generated header file. By default angle-brackets are used
+for the include statement. To generate includes with double quotes, add
+double quotes to the argument string (needs escaping), e.g. ``\"version.h\"``.
+The macro from the included version header holding the library version is
+given as ``<version_macro_name>`` by the argument ``VERSION_MACRO_NAME`` and
+used in the generated code for calculating defaults. If not specified, the
+defaults for the version file name and the version macro are derived from
+``<version_base_name>`` as passed with ``VERSION_BASE_NAME``, which again
+defaults to ``<base_name>`` or otherwise ``<library_target_name>``.
+The macro name defaults to ``<uppercase_version_base_name>_VERSION``,
+the version file name to ``<lowercase_version_base_name>_version.h``.
+Since 5.106.
+
``CUSTOM_CONTENT_FROM_VARIABLE`` specifies the name of a variable whose
content will be appended at the end of the generated file, before any
final inclusion guard closing. Note that before 5.98 this was broken and
@@ -390,6 +408,9 @@
include(GenerateExportHeader)
include(CMakeParseArguments)
+cmake_policy(PUSH)
+cmake_policy(SET CMP0057 NEW) # if IN_LIST
+
# helper method
function(_ecm_geh_generate_hex_number _var_name _version)
set(_hexnumber 0)
@@ -452,6 +473,8 @@
EXPORT_FILE_NAME
DEPRECATED_BASE_VERSION
VERSION
+ VERSION_BASE_NAME
+ VERSION_MACRO_NAME
EXCLUDE_DEPRECATED_BEFORE_AND_AT
EXPORT_MACRO_NAME
DEPRECATED_MACRO_NAME
@@ -463,6 +486,7 @@
)
set(multiValueArgs
DEPRECATION_VERSIONS
+ USE_VERSION_HEADER
)
cmake_parse_arguments(ARGS "${options}" "${oneValueArgs}"
"${multiValueArgs}" ${ARGN})
@@ -504,13 +528,36 @@
if(NOT ARGS_BASE_NAME)
set(ARGS_BASE_NAME "${target}")
endif()
+ if(NOT ARGS_VERSION_BASE_NAME)
+ set(ARGS_VERSION_BASE_NAME "${ARGS_BASE_NAME}")
+ endif()
string(TOUPPER "${ARGS_BASE_NAME}" _upper_base_name)
string(TOLOWER "${ARGS_BASE_NAME}" _lower_base_name)
+ set(_version_header)
+ if (USE_VERSION_HEADER IN_LIST ARGS_KEYWORDS_MISSING_VALUES)
+ string(TOLOWER "${ARGS_VERSION_BASE_NAME}" _lower_version_base_name)
+ set(_version_header "${_lower_version_base_name}_version.h")
+ elseif (DEFINED ARGS_USE_VERSION_HEADER)
+ list(LENGTH ARGS_USE_VERSION_HEADER _arg_count)
+ if (_arg_count GREATER 1)
+ message(FATAL_ERROR "USE_VERSION_HEADER only takes 1 or no arg
when calling ecm_generate_export_header().")
+ endif()
+ set(_version_header ${ARGS_USE_VERSION_HEADER})
+ endif()
+ if(_version_header)
+ if(ARGS_VERSION_MACRO_NAME)
+ set(_version_hexnumber "${ARGS_VERSION_MACRO_NAME}")
+ else()
+ string(TOUPPER "${ARGS_VERSION_BASE_NAME}"
_upper_version_base_name)
+ set(_version_hexnumber "${_upper_version_base_name}_VERSION")
+ endif()
+ else()
+ _ecm_geh_generate_hex_number(_version_hexnumber "${ARGS_VERSION}")
+ endif()
if(NOT ARGS_EXPORT_FILE_NAME)
set(ARGS_EXPORT_FILE_NAME "${_lower_base_name}_export.h")
endif()
- _ecm_geh_generate_hex_number(_version_hexnumber "${ARGS_VERSION}")
if (ARGS_DEPRECATED_BASE_VERSION STREQUAL "0")
set(_default_disabled_deprecated_version_hexnumber "0")
else()
@@ -564,10 +611,16 @@
set(_decl_deprecated_text_definition
"${_macro_base_name}_DECL_DEPRECATED")
endif()
# generate header file
- set(_output "
+ set(_output)
+ if(_version_header)
+ if (_version_header MATCHES "^\".+\"$")
+ string(APPEND _output "#include ${_version_header}\n")
+ else()
+ string(APPEND _output "#include <${_version_header}>\n")
+ endif()
+ endif()
+ string(APPEND _output "
#define ${_macro_base_name}_DECL_DEPRECATED_TEXT(text)
${_decl_deprecated_text_definition}
-
-#define ECM_GENERATEEXPORTHEADER_VERSION_VALUE(major, minor, patch)
((major<<16)|(minor<<8)|(patch))
"
)
if (ARGS_GROUP_BASE_NAME)
@@ -630,7 +683,7 @@
# endif
#endif
-#define ${_macro_base_name}_BUILD_DEPRECATED_SINCE(major, minor)
(ECM_GENERATEEXPORTHEADER_VERSION_VALUE(major, minor, 0) >
${_macro_base_name}_EXCLUDE_DEPRECATED_BEFORE_AND_AT)
+#define ${_macro_base_name}_BUILD_DEPRECATED_SINCE(major, minor)
(((major<<16)|(minor<<8)) >
${_macro_base_name}_EXCLUDE_DEPRECATED_BEFORE_AND_AT)
"
)
else()
@@ -663,7 +716,7 @@
#endif
#ifdef ${_deprecated_macro_name}
-# define ${_macro_base_name}_ENABLE_DEPRECATED_SINCE(major, minor)
(ECM_GENERATEEXPORTHEADER_VERSION_VALUE(major, minor, 0) >
${_macro_base_name}_DISABLE_DEPRECATED_BEFORE_AND_AT)
+# define ${_macro_base_name}_ENABLE_DEPRECATED_SINCE(major, minor)
(((major<<16)|(minor<<8)) >
${_macro_base_name}_DISABLE_DEPRECATED_BEFORE_AND_AT)
#else
# define ${_macro_base_name}_ENABLE_DEPRECATED_SINCE(major, minor) 0
#endif
@@ -782,3 +835,5 @@
CUSTOM_CONTENT_FROM_VARIABLE _output
)
endfunction()
+
+cmake_policy(POP)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.105.0/modules/ECMPoQmTools.cmake
new/extra-cmake-modules-5.106.0/modules/ECMPoQmTools.cmake
--- old/extra-cmake-modules-5.105.0/modules/ECMPoQmTools.cmake 2023-03-26
16:18:14.000000000 +0200
+++ new/extra-cmake-modules-5.106.0/modules/ECMPoQmTools.cmake 2023-04-29
18:44:55.000000000 +0200
@@ -170,9 +170,12 @@
get_filename_component(po_file ${po_file} ABSOLUTE)
get_filename_component(filename_base ${po_file} NAME_WE)
+ # Use own ECMPoQm/ subfolder for processing the files, to avoid
cluttering
+ # the default build dir as well as potential file/dir name clashes from
+ # other build artifacts.
# Include ${lang} in build dir because we might be called multiple
times
# with the same ${filename_base}
- set(build_dir ${CMAKE_CURRENT_BINARY_DIR}/${lang})
+ set(build_dir ${CMAKE_CURRENT_BINARY_DIR}/ECMPoQm/${lang})
set(ts_file ${build_dir}/${filename_base}.ts)
set(qm_file ${build_dir}/${filename_base}.qm)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.105.0/tests/ECMGenerateExportHeaderTest/CMakeLists.txt
new/extra-cmake-modules-5.106.0/tests/ECMGenerateExportHeaderTest/CMakeLists.txt
---
old/extra-cmake-modules-5.105.0/tests/ECMGenerateExportHeaderTest/CMakeLists.txt
2023-03-26 16:18:14.000000000 +0200
+++
new/extra-cmake-modules-5.106.0/tests/ECMGenerateExportHeaderTest/CMakeLists.txt
2023-04-29 18:44:55.000000000 +0200
@@ -49,6 +49,8 @@
${_extra_build_options}
--test-command dummy
)
+ set_tests_properties(ecm_generate_export_header-${_consumer_build}
+ PROPERTIES DEPENDS "ecm_generate_export_header-build-${_library}")
endmacro()
macro(add_generate_export_header_consumer_disable_deprecated_before_and_at_test
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.105.0/tests/ECMPoQmToolsTest/check.cmake.in
new/extra-cmake-modules-5.106.0/tests/ECMPoQmToolsTest/check.cmake.in
--- old/extra-cmake-modules-5.105.0/tests/ECMPoQmToolsTest/check.cmake.in
2023-03-26 16:18:14.000000000 +0200
+++ new/extra-cmake-modules-5.106.0/tests/ECMPoQmToolsTest/check.cmake.in
2023-04-29 18:44:55.000000000 +0200
@@ -16,7 +16,7 @@
endif()
endmacro()
-check_exists(${BINARY_DIR}/fr/only-process.qm)
+check_exists(${BINARY_DIR}/ECMPoQm/fr/only-process.qm)
set(exp_files
"share/locale/fr/LC_MESSAGES/process-and-install.qm"
