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-09-16 23:13:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/extra-cmake-modules (Old)
and /work/SRC/openSUSE:Factory/.extra-cmake-modules.new.1899 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "extra-cmake-modules"
Thu Sep 16 23:13:31 2021 rev:93 rq:918540 version:5.86.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/extra-cmake-modules/extra-cmake-modules.changes
2021-08-16 10:11:10.291127685 +0200
+++
/work/SRC/openSUSE:Factory/.extra-cmake-modules.new.1899/extra-cmake-modules.changes
2021-09-16 23:14:54.483813004 +0200
@@ -1,0 +2,12 @@
+Mon Sep 6 06:21:50 UTC 2021 - Christophe Giboudeaux <[email protected]>
+
+- Update to 5.86.0
+ * New feature release
+ * For more details please see:
+ * https://kde.org/announcements/frameworks/5/5.86.0
+- Changes since 5.85.0:
+ * ECMSetupQtPluginMacroNames: avoid adding duplicates to vars in config code
+ * Enable KDEGitCommitHooks on Windows
+ * Add LicenseRef-KDE-Accepted-LGPL to license compatibility matrix
+
+-------------------------------------------------------------------
Old:
----
extra-cmake-modules-5.85.0.tar.xz
extra-cmake-modules-5.85.0.tar.xz.sig
New:
----
extra-cmake-modules-5.86.0.tar.xz
extra-cmake-modules-5.86.0.tar.xz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ extra-cmake-modules.spec ++++++
--- /var/tmp/diff_new_pack.if2a3I/_old 2021-09-16 23:14:54.987813525 +0200
+++ /var/tmp/diff_new_pack.if2a3I/_new 2021-09-16 23:14:54.987813525 +0200
@@ -16,7 +16,7 @@
#
-%define _tar_path 5.85
+%define _tar_path 5.86
# Full KF5 version (e.g. 5.33.0)
%{!?_kf5_version: %global _kf5_version %{version}}
# Last major and minor KF5 version (e.g. 5.33)
@@ -25,7 +25,7 @@
# Only needed for the package signature condition
%bcond_without lang
Name: extra-cmake-modules
-Version: 5.85.0
+Version: 5.86.0
Release: 0
Summary: CMake modules
License: BSD-3-Clause
++++++ extra-cmake-modules-5.85.0.tar.xz -> extra-cmake-modules-5.86.0.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-5.85.0/CMakeLists.txt
new/extra-cmake-modules-5.86.0/CMakeLists.txt
--- old/extra-cmake-modules-5.85.0/CMakeLists.txt 2021-08-06
01:39:58.000000000 +0200
+++ new/extra-cmake-modules-5.86.0/CMakeLists.txt 2021-09-01
06:23:13.000000000 +0200
@@ -11,7 +11,7 @@
# Preliminary setup
#
-set(VERSION "5.85.0") # handled by release scripts
+set(VERSION "5.86.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.85.0/kde-modules/KDEGitCommitHooks.cmake
new/extra-cmake-modules-5.86.0/kde-modules/KDEGitCommitHooks.cmake
--- old/extra-cmake-modules-5.85.0/kde-modules/KDEGitCommitHooks.cmake
2021-08-06 01:39:58.000000000 +0200
+++ new/extra-cmake-modules-5.86.0/kde-modules/KDEGitCommitHooks.cmake
2021-09-01 06:23:13.000000000 +0200
@@ -58,7 +58,8 @@
# In case of tarballs there is no .git directory
if (EXISTS ${GIT_DIR})
# The pre-commit hook is a bash script, consequently it won't work on
non-unix platforms
- if (UNIX)
+ # git on Windows provides its own bash
+ if (UNIX OR WIN32)
if(KDE_CLANG_FORMAT_EXECUTABLE)
list(FIND ARG_CHECKS "CLANG_FORMAT" _index)
if (${_index} GREATER -1)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.85.0/modules/ECMSetupQtPluginMacroNames.cmake
new/extra-cmake-modules-5.86.0/modules/ECMSetupQtPluginMacroNames.cmake
--- old/extra-cmake-modules-5.85.0/modules/ECMSetupQtPluginMacroNames.cmake
2021-08-06 01:39:58.000000000 +0200
+++ new/extra-cmake-modules-5.86.0/modules/ECMSetupQtPluginMacroNames.cmake
2021-09-01 06:23:13.000000000 +0200
@@ -141,6 +141,13 @@
endforeach()
if (ESQMN_CONFIG_CODE_VARIABLE)
+ # As CMake config files of one project can be included multiple times,
+ # the code to add entries to CMAKE_AUTOMOC_MACRO_NAMES &
CMAKE_AUTOMOC_DEPEND_FILTERS
+ # would then be also executed multiple times.
+ # While there currently is no simple way known to have a unique flag
to track
+ # if the code was already executed, at least by the data currently
passed to this macro,
+ # simply check for the presence of the new entries before adding them
for now.
+ # Not using IN_LIST in generated code, as projects might have CMP0057
set to OLD
set(_content
"####################################################################################
# CMAKE_AUTOMOC
@@ -154,7 +161,13 @@
string(APPEND _content "
# CMake 3.9+ warns about automoc on files without Q_OBJECT, and doesn't know
about other macros.
# 3.10+ lets us provide more macro names that require automoc.
-list(APPEND CMAKE_AUTOMOC_MACRO_NAMES ${_all_macro_names})
+foreach(macro_name ${_all_macro_names})
+ # we can be run multiple times, so add only once
+ list (FIND CMAKE_AUTOMOC_MACRO_NAMES \"\${macro_name}\" _index)
+ if(_index LESS 0)
+ list(APPEND CMAKE_AUTOMOC_MACRO_NAMES \${macro_name})
+ endif()
+endforeach()
")
if(ESQMN_JSON_ARG1 OR ESQMN_JSON_ARG2 OR ESQMN_JSON_ARG3)
@@ -165,30 +178,42 @@
if(ESQMN_JSON_ARG1)
string(APPEND _content
"foreach(macro_name ${ESQMN_JSON_ARG1})
- list(APPEND CMAKE_AUTOMOC_DEPEND_FILTERS
- \"\${macro_name}\"
- \"[\\n^][ \\t]*\${macro_name}[ \\t\\n]*\\\\([
\\t\\n]*\\\"([^\\\"]+)\\\"\"
- )
+ # we can be run multiple times, so add only once
+ list (FIND CMAKE_AUTOMOC_DEPEND_FILTERS \"\${macro_name}\" _index)
+ if(_index LESS 0)
+ list(APPEND CMAKE_AUTOMOC_DEPEND_FILTERS
+ \"\${macro_name}\"
+ \"[\\n^][ \\t]*\${macro_name}[ \\t\\n]*\\\\([
\\t\\n]*\\\"([^\\\"]+)\\\"\"
+ )
+ endif()
endforeach()
")
endif()
if(ESQMN_JSON_ARG2)
string(APPEND _content
"foreach(macro_name ${ESQMN_JSON_ARG2})
- list(APPEND CMAKE_AUTOMOC_DEPEND_FILTERS
- \"\${macro_name}\"
- \"[\\n^][ \\t]*\${macro_name}[ \\t\\n]*\\\\([^,]*,[
\\t\\n]*\\\"([^\\\"]+)\\\"\"
- )
+ # we can be run multiple times, so add only once
+ list (FIND CMAKE_AUTOMOC_DEPEND_FILTERS \"\${macro_name}\" _index)
+ if(_index LESS 0)
+ list(APPEND CMAKE_AUTOMOC_DEPEND_FILTERS
+ \"\${macro_name}\"
+ \"[\\n^][ \\t]*\${macro_name}[ \\t\\n]*\\\\([^,]*,[
\\t\\n]*\\\"([^\\\"]+)\\\"\"
+ )
+ endif()
endforeach()
")
endif()
if(ESQMN_JSON_ARG3)
string(APPEND _content
"foreach(macro_name ${ESQMN_JSON_ARG3})
- list(APPEND CMAKE_AUTOMOC_DEPEND_FILTERS
- \"\${macro_name}\"
- \"[\\n^][ \\t]*\${macro_name}[ \\t\\n]*\\\\([^,]*,[^,]*,[
\\t\\n]*\\\"([^\\\"]+)\\\"\"
- )
+ # we can be run multiple times, so add only once
+ list (FIND CMAKE_AUTOMOC_DEPEND_FILTERS \"\${macro_name}\" _index)
+ if(_index LESS 0)
+ list(APPEND CMAKE_AUTOMOC_DEPEND_FILTERS
+ \"\${macro_name}\"
+ \"[\\n^][ \\t]*\${macro_name}[ \\t\\n]*\\\\([^,]*,[^,]*,[
\\t\\n]*\\\"([^\\\"]+)\\\"\"
+ )
+ endif()
endforeach()
")
endif()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.85.0/modules/check-outbound-license.py
new/extra-cmake-modules-5.86.0/modules/check-outbound-license.py
--- old/extra-cmake-modules-5.85.0/modules/check-outbound-license.py
2021-08-06 01:39:58.000000000 +0200
+++ new/extra-cmake-modules-5.86.0/modules/check-outbound-license.py
2021-09-01 06:23:13.000000000 +0200
@@ -40,6 +40,7 @@
"LGPL-2.1-or-later",
"LGPL-3.0-only",
"LGPL-3.0-or-later",
+ "LicenseRef-KDE-Accepted-LGPL",
"MIT",
"BSD-2-Clause",
"BSD-3-Clause",
@@ -66,6 +67,7 @@
"GPL-3.0-only",
"GPL-3.0-or-later",
"LicenseRef-KDE-Accepted-GPL",
+ "LicenseRef-KDE-Accepted-LGPL",
"MIT",
"BSD-2-Clause",
"BSD-3-Clause",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.85.0/tests/ECMSetupVersionTest/CMakeLists.txt
new/extra-cmake-modules-5.86.0/tests/ECMSetupVersionTest/CMakeLists.txt
--- old/extra-cmake-modules-5.85.0/tests/ECMSetupVersionTest/CMakeLists.txt
2021-08-06 01:39:58.000000000 +0200
+++ new/extra-cmake-modules-5.86.0/tests/ECMSetupVersionTest/CMakeLists.txt
2021-09-01 06:23:13.000000000 +0200
@@ -36,6 +36,7 @@
add_version_test(new_project_header_abspath check_header)
add_version_test(new_project_header_prefix check_header)
add_version_test(new_project_header_zero_prefixed_version check_header)
+ add_version_test(new_project_header_expected_zero_version check_header)
add_version_test(new_project_simple dummy)
add_version_test(new_project_simple_no_version_string_vars dummy)
add_version_test(new_project_simple_prefix dummy)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.85.0/tests/ECMSetupVersionTest/new_project_header_expected_zero_version/CMakeLists.txt
new/extra-cmake-modules-5.86.0/tests/ECMSetupVersionTest/new_project_header_expected_zero_version/CMakeLists.txt
---
old/extra-cmake-modules-5.85.0/tests/ECMSetupVersionTest/new_project_header_expected_zero_version/CMakeLists.txt
1970-01-01 01:00:00.000000000 +0100
+++
new/extra-cmake-modules-5.86.0/tests/ECMSetupVersionTest/new_project_header_expected_zero_version/CMakeLists.txt
2021-09-01 06:23:13.000000000 +0200
@@ -0,0 +1,18 @@
+cmake_minimum_required(VERSION 3.16.0)
+
+project(new_project_header_expected_zero_version VERSION "08.00.0")
+
+set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../modules)
+
+include(ECMSetupVersion)
+
+ecm_setup_version(PROJECT
+ VERSION_HEADER "new_project_header_expected_zero_version.h"
+)
+
+include(../version_helpers.cmake)
+# NB: name comes from project() command
+standard_version_var_checks(new_project_header_expected_zero_version "08.00.0")
+
+add_executable(check_header main.c)
+target_include_directories(check_header PRIVATE "${CMAKE_CURRENT_BINARY_DIR}")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.85.0/tests/ECMSetupVersionTest/new_project_header_expected_zero_version/main.c
new/extra-cmake-modules-5.86.0/tests/ECMSetupVersionTest/new_project_header_expected_zero_version/main.c
---
old/extra-cmake-modules-5.85.0/tests/ECMSetupVersionTest/new_project_header_expected_zero_version/main.c
1970-01-01 01:00:00.000000000 +0100
+++
new/extra-cmake-modules-5.86.0/tests/ECMSetupVersionTest/new_project_header_expected_zero_version/main.c
2021-09-01 06:23:13.000000000 +0200
@@ -0,0 +1,24 @@
+#include <new_project_header_expected_zero_version.h>
+#include <string.h>
+#include <stdio.h>
+
+#define intcheck(macro,val) \
+ if (macro != val) { \
+ printf(#macro " was %d instead of %d", macro, val); \
+ return 1; \
+ }
+#define strcheck(macro,val) \
+ if (strcmp(macro,val) != 0) { \
+ printf(#macro " was %s instead of %s", macro, val); \
+ return 1; \
+ }
+
+int main()
+{
+ intcheck(new_project_header_expected_zero_version_VERSION_MAJOR,8)
+ intcheck(new_project_header_expected_zero_version_VERSION_MINOR,0)
+ intcheck(new_project_header_expected_zero_version_VERSION_PATCH,0)
+ intcheck(new_project_header_expected_zero_version_VERSION,((8 << 16) + (0
<< 8) + 0))
+ strcheck(new_project_header_expected_zero_version_VERSION_STRING,"08.00.0")
+ return 0;
+}
