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-05-16 18:06:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/extra-cmake-modules (Old)
and /work/SRC/openSUSE:Factory/.extra-cmake-modules.new.1538 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "extra-cmake-modules"
Mon May 16 18:06:31 2022 rev:101 rq:977143 version:5.94.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/extra-cmake-modules/extra-cmake-modules.changes
2022-04-11 23:47:50.612030523 +0200
+++
/work/SRC/openSUSE:Factory/.extra-cmake-modules.new.1538/extra-cmake-modules.changes
2022-05-16 18:08:07.241251550 +0200
@@ -1,0 +2,18 @@
+Tue May 10 08:17:43 UTC 2022 - Christophe Giboudeaux <[email protected]>
+
+- Update to 5.94.0
+ * New feature release
+ * For more details please see:
+ * https://kde.org/announcements/frameworks/5/5.94.0
+- Changes since 5.93.0:
+ * typo--
+ * [KDEMetaInfoPlatformCheck] Add missing doc link
+ * Drop lib prefix when building for Windows (MinGW)
+ * Allow ecm_add_qtwayland_{client,server}_protocol take targets
+ * Allow ecm_add_wayland_{client,server}_protocol take targets
+ * ECMQueryQt: always use CMake target to find the qmake/qtpaths binary
+ * KDEGitCommitHooks: don't overwrite git pre-commit hook script
+ * KDEGitCommitHooks: only configure pre-commit hook if needed
+ * Add Windows CI
+
+-------------------------------------------------------------------
Old:
----
extra-cmake-modules-5.93.0.tar.xz
extra-cmake-modules-5.93.0.tar.xz.sig
New:
----
extra-cmake-modules-5.94.0.tar.xz
extra-cmake-modules-5.94.0.tar.xz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ extra-cmake-modules.spec ++++++
--- /var/tmp/diff_new_pack.9Sy6z4/_old 2022-05-16 18:08:07.733252016 +0200
+++ /var/tmp/diff_new_pack.9Sy6z4/_new 2022-05-16 18:08:07.737252019 +0200
@@ -21,7 +21,7 @@
%global pkg_suffix -doc
%endif
-%define _tar_path 5.93
+%define _tar_path 5.94
# 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.93.0
+Version: 5.94.0
Release: 0
Summary: CMake modules
License: BSD-3-Clause
++++++ extra-cmake-modules-5.93.0.tar.xz -> extra-cmake-modules-5.94.0.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-5.93.0/.gitlab-ci.yml
new/extra-cmake-modules-5.94.0/.gitlab-ci.yml
--- old/extra-cmake-modules-5.93.0/.gitlab-ci.yml 2022-03-30
15:04:06.000000000 +0200
+++ new/extra-cmake-modules-5.94.0/.gitlab-ci.yml 2022-05-01
13:10:11.000000000 +0200
@@ -7,6 +7,7 @@
-
https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd.yml
-
https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/android-qt6.yml
-
https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux-qt6.yml
+ -
https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/windows.yml
docs:
# only:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-5.93.0/CMakeLists.txt
new/extra-cmake-modules-5.94.0/CMakeLists.txt
--- old/extra-cmake-modules-5.93.0/CMakeLists.txt 2022-03-30
15:04:06.000000000 +0200
+++ new/extra-cmake-modules-5.94.0/CMakeLists.txt 2022-05-01
13:10:11.000000000 +0200
@@ -11,7 +11,7 @@
# Preliminary setup
#
-set(VERSION "5.93.0") # handled by release scripts
+set(VERSION "5.94.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.93.0/docs/kde-module/KDEMetaInfoPlatformCheck.rst
new/extra-cmake-modules-5.94.0/docs/kde-module/KDEMetaInfoPlatformCheck.rst
--- old/extra-cmake-modules-5.93.0/docs/kde-module/KDEMetaInfoPlatformCheck.rst
1970-01-01 01:00:00.000000000 +0100
+++ new/extra-cmake-modules-5.94.0/docs/kde-module/KDEMetaInfoPlatformCheck.rst
2022-05-01 13:10:11.000000000 +0200
@@ -0,0 +1 @@
+.. ecm-module:: ../../kde-modules/KDEMetaInfoPlatformCheck.cmake
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.93.0/find-modules/FindQtWaylandScanner.cmake
new/extra-cmake-modules-5.94.0/find-modules/FindQtWaylandScanner.cmake
--- old/extra-cmake-modules-5.93.0/find-modules/FindQtWaylandScanner.cmake
2022-03-30 15:04:06.000000000 +0200
+++ new/extra-cmake-modules-5.94.0/find-modules/FindQtWaylandScanner.cmake
2022-05-01 13:10:11.000000000 +0200
@@ -34,6 +34,11 @@
::
+ ecm_add_qtwayland_client_protocol(<target>
+ PROTOCOL <xmlfile>
+ BASENAME <basename>
+ [PREFIX <prefix>])
+
ecm_add_qtwayland_client_protocol(<source_files_var>
PROTOCOL <xmlfile>
BASENAME <basename>
@@ -41,13 +46,18 @@
Generate C++ wrapper to Wayland client protocol files from ``<xmlfile>``
XML definition for the ``<basename>`` interface and append those files
-to ``<source_files_var>``. Pass the ``<prefix>`` argument if the interface
+to ``<source_files_var>`` or ``<target>``. Pass the ``<prefix>`` argument if
the interface
names don't start with ``qt_`` or ``wl_``.
WaylandScanner is required and will be searched for.
::
+ ecm_add_qtwayland_server_protocol(<target>
+ PROTOCOL <xmlfile>
+ BASENAME <basename>
+ [PREFIX <prefix>])
+
ecm_add_qtwayland_server_protocol(<source_files_var>
PROTOCOL <xmlfile>
BASENAME <basename>
@@ -55,7 +65,7 @@
Generate C++ wrapper to Wayland server protocol files from ``<xmlfile>``
XML definition for the ``<basename>`` interface and append those files
-to ``<source_files_var>``. Pass the ``<prefix>`` argument if the interface
+to ``<source_files_var>`` or ``<target>``. Pass the ``<prefix>`` argument if
the interface
names don't start with ``qt_`` or ``wl_``.
WaylandScanner is required and will be searched for.
@@ -99,7 +109,7 @@
include(CMakeParseArguments)
-function(ecm_add_qtwayland_client_protocol out_var)
+function(ecm_add_qtwayland_client_protocol target_or_sources_var)
# Parse arguments
set(oneValueArgs PROTOCOL BASENAME PREFIX)
cmake_parse_arguments(ARGS "" "${oneValueArgs}" "" ${ARGN})
@@ -111,7 +121,7 @@
set(_prefix "${ARGS_PREFIX}")
find_package(WaylandScanner REQUIRED QUIET)
- ecm_add_wayland_client_protocol(${out_var}
+ ecm_add_wayland_client_protocol(${target_or_sources_var}
PROTOCOL ${ARGS_PROTOCOL}
BASENAME ${ARGS_BASENAME})
@@ -131,12 +141,16 @@
set_property(SOURCE ${_header} ${_code} PROPERTY SKIP_AUTOMOC ON)
- list(APPEND ${out_var} "${_code}")
- set(${out_var} ${${out_var}} PARENT_SCOPE)
+ if (TARGET ${target_or_sources_var})
+ target_sources(${target_or_sources_var} PRIVATE "${_code}")
+ else()
+ list(APPEND ${target_or_sources_var} "${_code}")
+ set(${target_or_sources_var} ${${target_or_sources_var}} PARENT_SCOPE)
+ endif()
endfunction()
-function(ecm_add_qtwayland_server_protocol out_var)
+function(ecm_add_qtwayland_server_protocol target_or_sources_var)
# Parse arguments
set(oneValueArgs PROTOCOL BASENAME PREFIX)
cmake_parse_arguments(ARGS "" "${oneValueArgs}" "" ${ARGN})
@@ -148,7 +162,7 @@
set(_prefix "${ARGS_PREFIX}")
find_package(WaylandScanner REQUIRED QUIET)
- ecm_add_wayland_server_protocol(${out_var}
+ ecm_add_wayland_server_protocol(${target_or_sources_var}
PROTOCOL ${ARGS_PROTOCOL}
BASENAME ${ARGS_BASENAME})
@@ -168,6 +182,10 @@
set_property(SOURCE ${_header} ${_code} PROPERTY SKIP_AUTOMOC ON)
- list(APPEND ${out_var} "${_code}")
- set(${out_var} ${${out_var}} PARENT_SCOPE)
+ if (TARGET ${target_or_sources_var})
+ target_sources(${target_or_sources_var} PRIVATE "${_code}")
+ else()
+ list(APPEND ${target_or_sources_var} "${_code}")
+ set(${target_or_sources_var} ${${target_or_sources_var}} PARENT_SCOPE)
+ endif()
endfunction()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.93.0/find-modules/FindWaylandScanner.cmake
new/extra-cmake-modules-5.94.0/find-modules/FindWaylandScanner.cmake
--- old/extra-cmake-modules-5.93.0/find-modules/FindWaylandScanner.cmake
2022-03-30 15:04:06.000000000 +0200
+++ new/extra-cmake-modules-5.94.0/find-modules/FindWaylandScanner.cmake
2022-05-01 13:10:11.000000000 +0200
@@ -34,23 +34,31 @@
::
+ ecm_add_wayland_client_protocol(<target>
+ PROTOCOL <xmlfile>
+ BASENAME <basename>)
+
ecm_add_wayland_client_protocol(<source_files_var>
PROTOCOL <xmlfile>
BASENAME <basename>)
Generate Wayland client protocol files from ``<xmlfile>`` XML
definition for the ``<basename>`` interface and append those files
-to ``<source_files_var>``.
+to ``<source_files_var>`` or ``<target>``.
::
+ ecm_add_wayland_server_protocol(<target>
+ PROTOCOL <xmlfile>
+ BASENAME <basename>)
+
ecm_add_wayland_server_protocol(<source_files_var>
PROTOCOL <xmlfile>
BASENAME <basename>)
Generate Wayland server protocol files from ``<xmlfile>`` XML
definition for the ``<basename>`` interface and append those files
-to ``<source_files_var>``.
+to ``<source_files_var>`` or ``<target>``.
Since 1.4.0.
#]=======================================================================]
@@ -88,7 +96,7 @@
include(CMakeParseArguments)
-function(ecm_add_wayland_client_protocol out_var)
+function(ecm_add_wayland_client_protocol target_or_sources_var)
# Parse arguments
set(oneValueArgs PROTOCOL BASENAME)
cmake_parse_arguments(ARGS "" "${oneValueArgs}" "" ${ARGN})
@@ -113,12 +121,16 @@
COMMAND ${WaylandScanner_EXECUTABLE} public-code ${_infile} ${_code}
DEPENDS ${_infile} ${_client_header} VERBATIM)
- list(APPEND ${out_var} "${_client_header}" "${_code}")
- set(${out_var} ${${out_var}} PARENT_SCOPE)
+ if (TARGET ${target_or_sources_var})
+ target_sources(${target_or_sources_var} PRIVATE "${_client_header}"
"${_code}")
+ else()
+ list(APPEND ${target_or_sources_var} "${_client_header}" "${_code}")
+ set(${target_or_sources_var} ${${target_or_sources_var}} PARENT_SCOPE)
+ endif()
endfunction()
-function(ecm_add_wayland_server_protocol out_var)
+function(ecm_add_wayland_server_protocol target_or_sources_var)
# Parse arguments
set(oneValueArgs PROTOCOL BASENAME)
cmake_parse_arguments(ARGS "" "${oneValueArgs}" "" ${ARGN})
@@ -127,7 +139,7 @@
message(FATAL_ERROR "Unknown keywords given to
ecm_add_wayland_server_protocol(): \"${ARGS_UNPARSED_ARGUMENTS}\"")
endif()
- ecm_add_wayland_client_protocol(${out_var}
+ ecm_add_wayland_client_protocol(${target_or_sources_var}
PROTOCOL ${ARGS_PROTOCOL}
BASENAME ${ARGS_BASENAME})
@@ -141,6 +153,10 @@
COMMAND ${WaylandScanner_EXECUTABLE} server-header ${_infile}
${_server_header}
DEPENDS ${_infile} VERBATIM)
- list(APPEND ${out_var} "${_server_header}")
- set(${out_var} ${${out_var}} PARENT_SCOPE)
+ if (TARGET ${target_or_sources_var})
+ target_sources(${target_or_sources_var} PRIVATE "${_server_header}")
+ else()
+ list(APPEND ${target_or_sources_var} "${_server_header}")
+ set(${target_or_sources_var} ${${target_or_sources_var}} PARENT_SCOPE)
+ endif()
endfunction()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.93.0/kde-modules/KDEGitCommitHooks.cmake
new/extra-cmake-modules-5.94.0/kde-modules/KDEGitCommitHooks.cmake
--- old/extra-cmake-modules-5.93.0/kde-modules/KDEGitCommitHooks.cmake
2022-03-30 15:04:06.000000000 +0200
+++ new/extra-cmake-modules-5.94.0/kde-modules/KDEGitCommitHooks.cmake
2022-05-01 13:10:11.000000000 +0200
@@ -1,4 +1,5 @@
# SPDX-FileCopyrightText: 2020 Alexander Lohnau <[email protected]>
+# SPDX-FileCopyrightText: 2022 Ahmad Samir <[email protected]>
#
# SPDX-License-Identifier: BSD-3-Clause
@@ -55,22 +56,50 @@
endif()
set(GIT_DIR "${CMAKE_SOURCE_DIR}/.git")
- # In case of tarballs there is no .git directory
- if (IS_DIRECTORY ${GIT_DIR})
- # The pre-commit hook is a bash script, consequently it won't work on
non-unix platforms
- # 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)
- set(CLANG_FORMAT_SCRIPT "\"$(git rev-parse
--git-common-dir)\"/hooks/scripts/clang-format.sh")
- configure_file(${CLANG_FORMAT_UNIX}
"${GIT_DIR}/hooks/scripts/clang-format.sh" @ONLY)
- endif()
- else()
- message(WARNING "No clang-format executable was found,
skipping the formatting pre-commit hook")
- endif()
+ if (NOT IS_DIRECTORY ${GIT_DIR} # In case of tarballs there is no .git
directory
+ OR NOT (UNIX OR WIN32)
+ )
+ return()
+ endif()
- configure_file(${PRE_COMMIT_HOOK_UNIX}
"${GIT_DIR}/hooks/pre-commit")
+ set(_write_hook FALSE)
+ if(KDE_CLANG_FORMAT_EXECUTABLE)
+ list(FIND ARG_CHECKS "CLANG_FORMAT" _index)
+ if (${_index} GREATER -1)
+ set(CLANG_FORMAT_SCRIPT "\"$(git rev-parse
--git-common-dir)\"/hooks/scripts/clang-format.sh")
+ configure_file(${CLANG_FORMAT_UNIX}
"${GIT_DIR}/hooks/scripts/clang-format.sh" @ONLY)
+ set(_write_hook TRUE)
endif()
+ else()
+ message(WARNING "No clang-format executable was found, skipping the
formatting pre-commit hook")
+ endif()
+
+ if(NOT _write_hook)
+ return()
+ endif()
+
+ set(_hook_file "${GIT_DIR}/hooks/pre-commit")
+ # Doesn't exist? write away
+ if(NOT EXISTS ${_hook_file})
+ configure_file(${PRE_COMMIT_HOOK_UNIX} "${GIT_DIR}/hooks/pre-commit")
+ return()
+ endif()
+
+ file(READ ${_hook_file} _contents)
+
+ # 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)
+ if (${_idx} GREATER -1)
+ string(REPLACE "${_old_cmd}" "${CLANG_FORMAT_SCRIPT}" _contents
"${_contents}")
+ file(WRITE ${_hook_file} ${_contents})
+ return()
+ endif()
+
+ 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})
endif()
endfunction()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.93.0/modules/ECMFindQmlModule.cmake
new/extra-cmake-modules-5.94.0/modules/ECMFindQmlModule.cmake
--- old/extra-cmake-modules-5.93.0/modules/ECMFindQmlModule.cmake
2022-03-30 15:04:06.000000000 +0200
+++ new/extra-cmake-modules-5.94.0/modules/ECMFindQmlModule.cmake
2022-05-01 13:10:11.000000000 +0200
@@ -10,7 +10,7 @@
It uses the qmlplugindump application to find the plugins and sets them up as
runtime dependencies.
-This is useful so that when we configure a project we are noified when some
+This is useful so that when we configure a project we are notified when some
QML imports are not present in the system, thus having the application
compilable
but fail at runtime.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.93.0/modules/ECMQmlModule.cmake
new/extra-cmake-modules-5.94.0/modules/ECMQmlModule.cmake
--- old/extra-cmake-modules-5.93.0/modules/ECMQmlModule.cmake 2022-03-30
15:04:06.000000000 +0200
+++ new/extra-cmake-modules-5.94.0/modules/ECMQmlModule.cmake 2022-05-01
13:10:11.000000000 +0200
@@ -266,6 +266,12 @@
${_ECM_QMLMODULE_PROPERTY_DEPENDS} ""
)
+ # QQmlImportDatabase::resolvePlugin doesn't accept lib prefixes under
+ # Windows, causing to fail to import when using as a dynamic plugin.
+ if (MINGW)
+ set_target_properties(${ARG_TARGET} PROPERTIES PREFIX "")
+ endif()
+
# -Muri is required for static QML plugins to work properly, see
# https://bugreports.qt.io/browse/QTBUG-82598
set_target_properties(${ARG_TARGET} PROPERTIES AUTOMOC_MOC_OPTIONS
-Muri=${ARG_URI})
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-5.93.0/modules/ECMQueryQt.cmake
new/extra-cmake-modules-5.94.0/modules/ECMQueryQt.cmake
--- old/extra-cmake-modules-5.93.0/modules/ECMQueryQt.cmake 2022-03-30
15:04:06.000000000 +0200
+++ new/extra-cmake-modules-5.94.0/modules/ECMQueryQt.cmake 2022-05-01
13:10:11.000000000 +0200
@@ -36,35 +36,36 @@
#]=======================================================================]
include(${CMAKE_CURRENT_LIST_DIR}/QtVersionOption.cmake)
+include(CheckLanguage)
+check_language(CXX)
+if (CMAKE_CXX_COMPILER)
+ # Enable the CXX language to let CMake look for config files in library
dirs.
+ # See: https://gitlab.kitware.com/cmake/cmake/-/issues/23266
+ enable_language(CXX)
+endif()
if (QT_MAJOR_VERSION STREQUAL "5")
- find_program(_qmake_executable_default NAMES qmake qmake-qt5 qmake5)
- if(NOT _qmake_executable_default)
- # Enable the CXX language to let CMake look for config files
- # into library dirs
- enable_language(CXX)
- find_package(Qt${QT_MAJOR_VERSION}Core QUIET)
- if(TARGET Qt5::qmake)
- get_target_property(_qmake_executable_default Qt5::qmake LOCATION)
- endif()
+ # QUIET to accommodate the TRY option
+ find_package(Qt${QT_MAJOR_VERSION}Core QUIET)
+ if(TARGET Qt5::qmake)
+ get_target_property(_qmake_executable_default Qt5::qmake LOCATION)
+
+ set(QUERY_EXECUTABLE ${_qmake_executable_default}
+ CACHE FILEPATH "Location of the Qt5 qmake executable")
+ set(_exec_name_text "Qt5 qmake")
+ set(_cli_option "-query")
endif()
- set(QUERY_EXECUTABLE ${_qmake_executable_default}
- CACHE FILEPATH "Location of the Qt5 qmake executable")
- set(_exec_name_text "Qt5 qmake")
- set(_cli_option "-query")
elseif(QT_MAJOR_VERSION STREQUAL "6")
- find_program(_qtpaths_executable NAMES qtpaths6)
- if(NOT _qtpaths_executable)
- enable_language(CXX)
- find_package(Qt6 COMPONENTS CoreTools QUIET CONFIG)
- if (TARGET Qt6::qtpaths)
- get_target_property(_qtpaths_executable Qt6::qtpaths LOCATION)
- endif()
+ # QUIET to accommodate the TRY option
+ find_package(Qt6 COMPONENTS CoreTools QUIET CONFIG)
+ if (TARGET Qt6::qtpaths)
+ get_target_property(_qtpaths_executable Qt6::qtpaths LOCATION)
+
+ set(QUERY_EXECUTABLE ${_qtpaths_executable}
+ CACHE FILEPATH "Location of the Qt6 qtpaths executable")
+ set(_exec_name_text "Qt6 qtpaths")
+ set(_cli_option "--query")
endif()
- set(QUERY_EXECUTABLE ${_qtpaths_executable}
- CACHE FILEPATH "Location of the Qt6 qtpaths executable")
- set(_exec_name_text "Qt6 qtpaths")
- set(_cli_option "--query")
endif()
function(ecm_query_qt result_variable qt_variable)
