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 2022-06-17 21:18:52
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/extra-cmake-modules (Old)
and /work/SRC/openSUSE:Factory/.extra-cmake-modules.new.1548 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "extra-cmake-modules"
Fri Jun 17 21:18:52 2022 rev:102 rq:982236 version:5.95.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/extra-cmake-modules/extra-cmake-modules.changes
2022-05-16 18:08:07.241251550 +0200
+++
/work/SRC/openSUSE:Factory/.extra-cmake-modules.new.1548/extra-cmake-modules.changes
2022-06-17 21:20:38.338712401 +0200
@@ -1,0 +2,17 @@
+Fri Jun 10 14:12:13 UTC 2022 - Christophe Giboudeaux <[email protected]>
+
+- Update to 5.95.0
+ * New feature release
+ * For more details please see:
+ * https://kde.org/announcements/frameworks/5/5.95.0
+- Changes since 5.94.0:
+ * FindXCB: fix typo in warning
+ * fix linking on OpenBSD
+ * ECMQtDeclareLoggingCategory: drop support for Qt < 5.4
+ * ECMAddQtDesignerPlugin: drop support for Qt < 5.9
+ * ECMAddQtDesignerPlugin: fix support for Qt6
+ * ECMAddQtDesignerPlugin: fix missing FeatureSummary include
+ * KDEGitCommitHooks: Check if KDEClangFormat was included
+ * KDEGitCommitHooks: Fix quoting of variables
+
+-------------------------------------------------------------------
Old:
----
extra-cmake-modules-5.94.0.tar.xz
extra-cmake-modules-5.94.0.tar.xz.sig
New:
----
extra-cmake-modules-5.95.0.tar.xz
extra-cmake-modules-5.95.0.tar.xz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ extra-cmake-modules.spec ++++++
--- /var/tmp/diff_new_pack.ftGMkG/_old 2022-06-17 21:20:38.754712627 +0200
+++ /var/tmp/diff_new_pack.ftGMkG/_new 2022-06-17 21:20:38.758712628 +0200
@@ -21,7 +21,7 @@
%global pkg_suffix -doc
%endif
-%define _tar_path 5.94
+%define _tar_path 5.95
# Full KF5 version (e.g. 5.33.0)
%{!?_kf5_version: %global _kf5_version %{version}}
# Last major and minor KF5 version (e.g. 5.33)
@@ -30,7 +30,7 @@
# Only needed for the package signature condition
%bcond_without released
Name: extra-cmake-modules%{?pkg_suffix}
-Version: 5.94.0
+Version: 5.95.0
Release: 0
Summary: CMake modules
License: BSD-3-Clause
++++++ extra-cmake-modules-5.94.0.tar.xz -> extra-cmake-modules-5.95.0.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-5.94.0/CMakeLists.txt
new/extra-cmake-modules-5.95.0/CMakeLists.txt
--- old/extra-cmake-modules-5.94.0/CMakeLists.txt 2022-05-01
13:10:11.000000000 +0200
+++ new/extra-cmake-modules-5.95.0/CMakeLists.txt 2022-06-07
17:56:00.000000000 +0200
@@ -11,7 +11,7 @@
# Preliminary setup
#
-set(VERSION "5.94.0") # handled by release scripts
+set(VERSION "5.95.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.94.0/find-modules/FindXCB.cmake
new/extra-cmake-modules-5.95.0/find-modules/FindXCB.cmake
--- old/extra-cmake-modules-5.94.0/find-modules/FindXCB.cmake 2022-05-01
13:10:11.000000000 +0200
+++ new/extra-cmake-modules-5.95.0/find-modules/FindXCB.cmake 2022-06-07
17:56:00.000000000 +0200
@@ -155,7 +155,7 @@
list(FIND XCB_components "XINPUT" _XCB_XINPUT_index)
if (NOT _XCB_XINPUT_index EQUAL -1)
- message(AUTHOR_WARNING "XINPUT from XCB was requested: this is
EXPERIMENTAL and is likely to unavailable on many systems!")
+ message(AUTHOR_WARNING "XINPUT from XCB was requested: this is
EXPERIMENTAL and is likely to be unavailable on many systems!")
endif()
ecm_find_package_handle_library_components(XCB
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.94.0/kde-modules/KDECompilerSettings.cmake
new/extra-cmake-modules-5.95.0/kde-modules/KDECompilerSettings.cmake
--- old/extra-cmake-modules-5.94.0/kde-modules/KDECompilerSettings.cmake
2022-05-01 13:10:11.000000000 +0200
+++ new/extra-cmake-modules-5.95.0/kde-modules/KDECompilerSettings.cmake
2022-06-07 17:56:00.000000000 +0200
@@ -538,8 +538,11 @@
set(CMAKE_MODULE_LINKER_FLAGS "-Wl,--fatal-warnings
${CMAKE_MODULE_LINKER_FLAGS}")
# Do not allow undefined symbols, even in non-symbolic shared libraries
- set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined
${CMAKE_SHARED_LINKER_FLAGS}")
- set(CMAKE_MODULE_LINKER_FLAGS "-Wl,--no-undefined
${CMAKE_MODULE_LINKER_FLAGS}")
+ # On OpenBSD we must disable this to allow the stuff to properly compile
without explicit libc specification
+ if (NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
+ set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined
${CMAKE_SHARED_LINKER_FLAGS}")
+ set(CMAKE_MODULE_LINKER_FLAGS "-Wl,--no-undefined
${CMAKE_MODULE_LINKER_FLAGS}")
+ endif()
endif()
set(_KDE_GCC_COMMON_WARNING_FLAGS "-Wall -Wextra -Wcast-align
-Wchar-subscripts -Wformat-security -Wno-long-long -Wpointer-arith -Wundef")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.94.0/kde-modules/KDEGitCommitHooks.cmake
new/extra-cmake-modules-5.95.0/kde-modules/KDEGitCommitHooks.cmake
--- old/extra-cmake-modules-5.94.0/kde-modules/KDEGitCommitHooks.cmake
2022-05-01 13:10:11.000000000 +0200
+++ new/extra-cmake-modules-5.95.0/kde-modules/KDEGitCommitHooks.cmake
2022-06-07 17:56:00.000000000 +0200
@@ -61,6 +61,11 @@
)
return()
endif()
+ if (COMMAND KDE_CLANG_FORMAT)
+ set(HAS_CLANG_FORMAT_COMMAND_INCLUDED TRUE)
+ else()
+ set(HAS_CLANG_FORMAT_COMMAND_INCLUDED FALSE)
+ endif()
set(_write_hook FALSE)
if(KDE_CLANG_FORMAT_EXECUTABLE)
@@ -89,17 +94,17 @@
# For when CLANG_FORMAT_SCRIPT didn't have the 'git rev-parse
--git-common-dir' part
set(_old_cmd "./.git/hooks/scripts/clang-format.sh")
- string(FIND ${_contents} ${_old_cmd} _idx)
+ string(FIND "${_contents}" "${_old_cmd}" _idx)
if (${_idx} GREATER -1)
string(REPLACE "${_old_cmd}" "${CLANG_FORMAT_SCRIPT}" _contents
"${_contents}")
- file(WRITE ${_hook_file} ${_contents})
+ file(WRITE ${_hook_file} "${_contents}")
return()
endif()
- string(FIND ${_contents} ${CLANG_FORMAT_SCRIPT} _idx)
+ string(FIND "${_contents}" "${CLANG_FORMAT_SCRIPT}" _idx)
# File exists and doesn't have the clang-format.sh line, append it
# so as to not overwrite users' customisations
if (_idx EQUAL -1)
- file(APPEND ${_hook_file} ${CLANG_FORMAT_SCRIPT})
+ file(APPEND ${_hook_file} "${CLANG_FORMAT_SCRIPT}")
endif()
endfunction()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.94.0/kde-modules/kde-git-commit-hooks/clang-format.sh
new/extra-cmake-modules-5.95.0/kde-modules/kde-git-commit-hooks/clang-format.sh
---
old/extra-cmake-modules-5.94.0/kde-modules/kde-git-commit-hooks/clang-format.sh
2022-05-01 13:10:11.000000000 +0200
+++
new/extra-cmake-modules-5.95.0/kde-modules/kde-git-commit-hooks/clang-format.sh
2022-06-07 17:56:00.000000000 +0200
@@ -5,8 +5,14 @@
readonly output=$(git clang-format --extensions 'cpp,h,hpp,c' -v --diff)
if [[ ! -f .clang-format ]]; then
- echo "ERROR: no .clang-format file found in repository root, abort format"
- echo " run cmake for this repository to generate it"
+ if [[ @HAS_CLANG_FORMAT_COMMAND_INCLUDED@ = TRUE ]]; then
+ echo "ERROR: no .clang-format file found in repository root, abort
format"
+ echo " run cmake for this repository to generate it"
+ else
+ echo "ERROR: no .clang-format file found in repository root, abort
format"
+ echo "Make sure the KDEClangFormat CMake module is included, which
will copy the KDE .clang-format file during the CMake configuration."
+ echo "Alternatively you can manually copy a .clang-format file to the
repository root directory."
+ fi
exit 1
fi
if [[ "$output" == *"no modified files to format"* ]]; then exit 0; fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.94.0/modules/ECMAddQtDesignerPlugin.cmake
new/extra-cmake-modules-5.95.0/modules/ECMAddQtDesignerPlugin.cmake
--- old/extra-cmake-modules-5.94.0/modules/ECMAddQtDesignerPlugin.cmake
2022-05-01 13:10:11.000000000 +0200
+++ new/extra-cmake-modules-5.95.0/modules/ECMAddQtDesignerPlugin.cmake
2022-06-07 17:56:00.000000000 +0200
@@ -179,6 +179,7 @@
#]=======================================================================]
include(CMakeParseArguments)
+include(FeatureSummary)
include(${CMAKE_CURRENT_LIST_DIR}/QtVersionOption.cmake)
# helper method
@@ -441,44 +442,16 @@
endif()
# Check deps
- # peek at Qt5Core to learn about the version to decide whether Qt5UiPlugin
is enough
- if(NOT Qt5Core_FOUND)
- find_package(Qt${QT_MAJOR_VERSION}Core QUIET CONFIG)
- endif()
- if(Qt5Core_VERSION VERSION_LESS "5.5.0")
- set(_qtdesigner_tobefound TRUE)
- elseif(Qt5Core_VERSION VERSION_LESS "5.9.0")
- set(_qtdesigner_tobefound TRUE)
- set(_qtuiplugin_tobefound TRUE)
- else()
- # Since Qt 5.9 only Qt5UiPlugin is needed
- set(_qtuiplugin_tobefound TRUE)
- endif()
- if(NOT Qt5Designer_FOUND AND _qtdesigner_tobefound)
- find_package(Qt${QT_MAJOR_VERSION}Designer QUIET CONFIG)
- set_package_properties(Qt${QT_MAJOR_VERSION}Designer PROPERTIES
- PURPOSE "Required to build Qt Designer plugins"
- TYPE REQUIRED
- )
- endif()
- if(NOT Qt5UiPlugin_FOUND AND _qtuiplugin_tobefound)
+ if(NOT Qt${QT_MAJOR_VERSION}UiPlugin_FOUND)
find_package(Qt${QT_MAJOR_VERSION}UiPlugin QUIET CONFIG)
set_package_properties(Qt${QT_MAJOR_VERSION}UiPlugin PROPERTIES
PURPOSE "Required to build Qt Designer plugins"
TYPE REQUIRED
)
endif()
- if (Qt5Designer_FOUND)
- set(_qtdesigner_tobefound FALSE)
- endif()
- if (Qt5UiPlugin_FOUND)
- set(_qtuiplugin_tobefound FALSE)
- # in some old versions Qt5UiPlugin does not set its _INCLUDE_DIRS
variable. Fill it manually
- get_target_property(Qt5UiPlugin_INCLUDE_DIRS Qt5::UiPlugin
INTERFACE_INCLUDE_DIRECTORIES)
- endif()
- # setup plugin only if designer/uiplugin libs were found, as we do not
abort hard the cmake run otherwise
- if(NOT _qtdesigner_tobefound AND NOT _qtuiplugin_tobefound)
+ # setup plugin only if uiplugin lib was found, as we do not abort hard the
cmake run otherwise
+ if (Qt${QT_MAJOR_VERSION}UiPlugin_FOUND)
set(_generation_dir
"${CMAKE_CURRENT_BINARY_DIR}/${target}_ECMQtDesignerPlugin")
file(MAKE_DIRECTORY "${_generation_dir}")
set(_rc_icon_dir "/${ARGS_NAME}/designer")
@@ -535,7 +508,11 @@
)
file(REMOVE "${_rc_work_file}")
- qt5_add_resources(_srcs ${_rc_file})
+ if (QT_MAJOR_VERSION EQUAL "5")
+ qt5_add_resources(_srcs ${_rc_file})
+ else()
+ qt6_add_resources(_srcs ${_rc_file})
+ endif()
endif()
# generate source file
@@ -619,15 +596,6 @@
# setup plugin binary
add_library(${target} MODULE ${_srcs})
- if(Qt5UiPlugin_VERSION AND Qt5UiPlugin_VERSION VERSION_GREATER_EQUAL
5.9.0)
- list(APPEND ARGS_LINK_LIBRARIES Qt5::UiPlugin)
- else()
- # For Qt <5.9 include dir variables needed
- target_include_directories(${target}
- PRIVATE ${Qt5UiPlugin_INCLUDE_DIRS}
- PRIVATE ${Qt5Designer_INCLUDE_DIRS}
- )
- endif()
if(NOT WIN32)
# Since there are no libraries provided by this module,
# there is no point including the build tree in RPath,
@@ -642,7 +610,7 @@
OUTPUT_NAME ${ARGS_OUTPUT_NAME}
)
endif()
- target_link_libraries(${target} ${ARGS_LINK_LIBRARIES})
+ target_link_libraries(${target} ${ARGS_LINK_LIBRARIES}
Qt${QT_MAJOR_VERSION}::UiPlugin)
if (DEFINED ARGS_COMPONENT)
set(_component COMPONENT ${ARGS_COMPONENT})
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.94.0/modules/ECMQtDeclareLoggingCategory.cpp.in
new/extra-cmake-modules-5.95.0/modules/ECMQtDeclareLoggingCategory.cpp.in
--- old/extra-cmake-modules-5.94.0/modules/ECMQtDeclareLoggingCategory.cpp.in
2022-05-01 13:10:11.000000000 +0200
+++ new/extra-cmake-modules-5.95.0/modules/ECMQtDeclareLoggingCategory.cpp.in
2022-06-07 17:56:00.000000000 +0200
@@ -3,9 +3,5 @@
#include "@HEADER_NAME@"
@OPEN_NAMESPACES@
-#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)
Q_LOGGING_CATEGORY(@IDENTIFIER@, "@ARG_CATEGORY_NAME@",
Qt@ARG_DEFAULT_SEVERITY@Msg)
-#else
-Q_LOGGING_CATEGORY(@IDENTIFIER@, "@ARG_CATEGORY_NAME@")
-#endif
@CLOSE_NAMESPACES@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.94.0/tests/ECMQtDeclareLoggingCategoryTest/testmain.cpp
new/extra-cmake-modules-5.95.0/tests/ECMQtDeclareLoggingCategoryTest/testmain.cpp
---
old/extra-cmake-modules-5.94.0/tests/ECMQtDeclareLoggingCategoryTest/testmain.cpp
2022-05-01 13:10:11.000000000 +0200
+++
new/extra-cmake-modules-5.95.0/tests/ECMQtDeclareLoggingCategoryTest/testmain.cpp
2022-06-07 17:56:00.000000000 +0200
@@ -28,12 +28,6 @@
qWarning("log1 category was \"%s\", expected \"log.one\"",
log1().categoryName());
success = false;
}
-#if QT_VERSION < QT_VERSION_CHECK(5, 4, 0)
- if (!log1().isDebugEnabled()) {
- qWarning("log1 debug messages were not enabled");
- success = false;
- }
-#else
if (log1().isDebugEnabled()) {
qWarning("log1 debug messages were enabled");
success = false;
@@ -42,18 +36,11 @@
qWarning("log1 warning messages were not enabled");
success = false;
}
-#endif
if (foo::bar::log2().categoryName() != QLatin1String("log.two")) {
qWarning("log2 category was \"%s\", expected \"log.two\"",
foo::bar::log2().categoryName());
success = false;
}
-#if QT_VERSION < QT_VERSION_CHECK(5, 4, 0)
- if (!foo::bar::log2().isDebugEnabled()) {
- qWarning("log2 debug messages were not enabled");
- success = false;
- }
-#else
if (foo::bar::log2().isDebugEnabled()) {
qWarning("log2 debug messages were enabled");
success = false;
@@ -62,18 +49,11 @@
qWarning("log2 warning messages were not enabled");
success = false;
}
-#endif
if (log3().categoryName() != QLatin1String("three")) {
qWarning("log3 category was \"%s\", expected \"three\"",
log3().categoryName());
success = false;
}
-#if QT_VERSION < QT_VERSION_CHECK(5, 4, 0)
- if (!log3().isDebugEnabled()) {
- qWarning("log3 debug messages were not enabled");
- success = false;
- }
-#else
if (log3().isDebugEnabled()) {
qWarning("log3 debug messages were enabled");
success = false;
@@ -86,7 +66,6 @@
qWarning("log3 critical messages were not enabled");
success = false;
}
-#endif
return success ? 0 : 1;
}
