Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package kf6-extra-cmake-modules for
openSUSE:Factory checked in at 2025-02-16 22:37:33
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kf6-extra-cmake-modules (Old)
and /work/SRC/openSUSE:Factory/.kf6-extra-cmake-modules.new.8181 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kf6-extra-cmake-modules"
Sun Feb 16 22:37:33 2025 rev:12 rq:1245919 version:6.11.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/kf6-extra-cmake-modules/kf6-extra-cmake-modules.changes
2025-01-12 11:14:17.302760394 +0100
+++
/work/SRC/openSUSE:Factory/.kf6-extra-cmake-modules.new.8181/kf6-extra-cmake-modules.changes
2025-02-16 22:42:10.968167950 +0100
@@ -1,0 +2,18 @@
+Sat Feb 8 12:16:40 UTC 2025 - Christophe Marin <[email protected]>
+
+- Update to 6.11.0
+ * New feature release
+ * For more details please see:
+ * https://kde.org/announcements/frameworks/6/6.11.0
+- Changes since 6.10.0:
+ * Fix FindEGL compile check when using Emscripten
+ * Add xml/yaml linting
+ * ECMAddAndroidApk.cmake: use APK_NAME for APK_OUTPUT_DIR
+ * Add ECMGenerateQDoc
+ * CI: Add linux-qt6-next build
+ * ECMQmLoader.cpp.in: Use qAsConst instead of std::as_const in Qt5 codepath
+ * Lower Python requirement to 3.9
+ * ECMQmLoader.cpp.in: Add std::as_const for enhanced for loop
+ * Update version to 6.11.0
+
+-------------------------------------------------------------------
Old:
----
extra-cmake-modules-6.10.0.tar.xz
extra-cmake-modules-6.10.0.tar.xz.sig
New:
----
extra-cmake-modules-6.11.0.tar.xz
extra-cmake-modules-6.11.0.tar.xz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kf6-extra-cmake-modules.spec ++++++
--- /var/tmp/diff_new_pack.KXEag4/_old 2025-02-16 22:42:12.612236304 +0100
+++ /var/tmp/diff_new_pack.KXEag4/_new 2025-02-16 22:42:12.620236637 +0100
@@ -23,14 +23,14 @@
%define rname extra-cmake-modules
-# Full KF6 version (e.g. 6.10.0)
+# Full KF6 version (e.g. 6.11.0)
%{!?_kf6_version: %global _kf6_version %{version}}
# Last major and minor KF6 version (e.g. 6.0)
%{!?_kf6_bugfix_version: %define _kf6_bugfix_version %(echo %{_kf6_version} |
awk -F. '{print $1"."$2}')}
%bcond_without doc
%bcond_without released
Name: kf6-extra-cmake-modules%{?pkg_suffix}
-Version: 6.10.0
+Version: 6.11.0
Release: 0
Summary: CMake modules
License: BSD-3-Clause
++++++ extra-cmake-modules-6.10.0.tar.xz -> extra-cmake-modules-6.11.0.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-6.10.0/.gitlab-ci.yml
new/extra-cmake-modules-6.11.0/.gitlab-ci.yml
--- old/extra-cmake-modules-6.10.0/.gitlab-ci.yml 2025-01-03
16:24:39.000000000 +0100
+++ new/extra-cmake-modules-6.11.0/.gitlab-ci.yml 2025-02-07
14:59:25.000000000 +0100
@@ -9,6 +9,7 @@
- /gitlab-templates/freebsd.yml
- /gitlab-templates/android-qt6.yml
- /gitlab-templates/linux-qt6.yml
+ - /gitlab-templates/linux-qt6-next.yml
- /gitlab-templates/linux-qt6-static.yml
- /gitlab-templates/windows.yml
- /gitlab-templates/windows-static.yml
@@ -16,3 +17,5 @@
- /gitlab-templates/windows-qt6.yml
- /gitlab-templates/alpine-qt6.yml
+ - /gitlab-templates/xml-lint.yml
+ - /gitlab-templates/yaml-lint.yml
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-6.10.0/.kde-ci.yml
new/extra-cmake-modules-6.11.0/.kde-ci.yml
--- old/extra-cmake-modules-6.10.0/.kde-ci.yml 2025-01-03 16:24:39.000000000
+0100
+++ new/extra-cmake-modules-6.11.0/.kde-ci.yml 2025-02-07 14:59:25.000000000
+0100
@@ -3,4 +3,4 @@
Options:
per-test-timeout: 120
- require-passing-tests-on: [ 'Linux', 'FreeBSD', 'Windows' ]
+ require-passing-tests-on: ['Linux', 'FreeBSD', 'Windows']
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-6.10.0/CMakeLists.txt
new/extra-cmake-modules-6.11.0/CMakeLists.txt
--- old/extra-cmake-modules-6.10.0/CMakeLists.txt 2025-01-03
16:24:39.000000000 +0100
+++ new/extra-cmake-modules-6.11.0/CMakeLists.txt 2025-02-07
14:59:25.000000000 +0100
@@ -11,7 +11,7 @@
# Preliminary setup
#
-set(VERSION "6.10.0") # handled by release scripts
+set(VERSION "6.11.0") # handled by release scripts
project(ECM
VERSION "${VERSION}"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-6.10.0/docs/module/ECMGenerateQDoc.rst
new/extra-cmake-modules-6.11.0/docs/module/ECMGenerateQDoc.rst
--- old/extra-cmake-modules-6.10.0/docs/module/ECMGenerateQDoc.rst
1970-01-01 01:00:00.000000000 +0100
+++ new/extra-cmake-modules-6.11.0/docs/module/ECMGenerateQDoc.rst
2025-02-07 14:59:25.000000000 +0100
@@ -0,0 +1 @@
+.. ecm-module:: ../../modules/ECMGenerateQDoc.cmake
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-6.10.0/find-modules/FindEGL.cmake
new/extra-cmake-modules-6.11.0/find-modules/FindEGL.cmake
--- old/extra-cmake-modules-6.10.0/find-modules/FindEGL.cmake 2025-01-03
16:24:39.000000000 +0100
+++ new/extra-cmake-modules-6.11.0/find-modules/FindEGL.cmake 2025-02-07
14:59:25.000000000 +0100
@@ -57,13 +57,15 @@
HINTS
${PKG_EGL_INCLUDE_DIRS}
)
-find_library(EGL_LIBRARY
- NAMES
- EGL
- libEGL
- HINTS
- ${PKG_EGL_LIBRARY_DIRS}
-)
+if(NOT EMSCRIPTEN)
+ find_library(EGL_LIBRARY
+ NAMES
+ EGL
+ libEGL
+ HINTS
+ ${PKG_EGL_LIBRARY_DIRS}
+ )
+endif()
# NB: We do *not* use the version information from pkg-config, as that
# is the implementation version (eg: the Mesa version)
@@ -95,7 +97,9 @@
endif()
cmake_push_check_state(RESET)
-list(APPEND CMAKE_REQUIRED_LIBRARIES "${EGL_LIBRARY}")
+if(NOT EMSCRIPTEN)
+ list(APPEND CMAKE_REQUIRED_LIBRARIES "${EGL_LIBRARY}")
+endif()
list(APPEND CMAKE_REQUIRED_INCLUDES "${EGL_INCLUDE_DIR}")
check_cxx_source_compiles("
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-6.10.0/modules/ECMAddAndroidApk.cmake
new/extra-cmake-modules-6.11.0/modules/ECMAddAndroidApk.cmake
--- old/extra-cmake-modules-6.10.0/modules/ECMAddAndroidApk.cmake
2025-01-03 16:24:39.000000000 +0100
+++ new/extra-cmake-modules-6.11.0/modules/ECMAddAndroidApk.cmake
2025-02-07 14:59:25.000000000 +0100
@@ -74,7 +74,7 @@
set(APK_NAME "${ARGS_PACKAGE_NAME}")
endif()
- set(APK_OUTPUT_DIR "${CMAKE_BINARY_DIR}/${TARGET}_build_apk/")
+ set(APK_OUTPUT_DIR "${CMAKE_BINARY_DIR}/${APK_NAME}_build_apk/")
set(APK_EXECUTABLE_PATH
"${APK_OUTPUT_DIR}/libs/${CMAKE_ANDROID_ARCH_ABI}/lib${APK_NAME}_${CMAKE_ANDROID_ARCH_ABI}.so")
set(QML_IMPORT_PATHS "")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-6.10.0/modules/ECMGeneratePythonBindings.toml.in
new/extra-cmake-modules-6.11.0/modules/ECMGeneratePythonBindings.toml.in
--- old/extra-cmake-modules-6.10.0/modules/ECMGeneratePythonBindings.toml.in
2025-01-03 16:24:39.000000000 +0100
+++ new/extra-cmake-modules-6.11.0/modules/ECMGeneratePythonBindings.toml.in
2025-02-07 14:59:25.000000000 +0100
@@ -6,7 +6,7 @@
]
description = "Python bindings for ${PB_PACKAGE_NAME}"
readme = "README.md"
-requires-python = ">=3.10"
+requires-python = ">=3.9"
dependencies = [
"PySide6>=${PB_QT_VERSION},<7",
]
@@ -16,6 +16,7 @@
"Environment :: X11 Applications :: Qt",
"Operating System :: POSIX :: Linux",
"Programming Language :: Python :: 3",
+ "Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-6.10.0/modules/ECMGenerateQDoc.cmake
new/extra-cmake-modules-6.11.0/modules/ECMGenerateQDoc.cmake
--- old/extra-cmake-modules-6.10.0/modules/ECMGenerateQDoc.cmake
1970-01-01 01:00:00.000000000 +0100
+++ new/extra-cmake-modules-6.11.0/modules/ECMGenerateQDoc.cmake
2025-02-07 14:59:25.000000000 +0100
@@ -0,0 +1,202 @@
+# SPDX-FileCopyrightText: 2025 Nicolas Fella <[email protected]>
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
+#[=======================================================================[.rst:
+ECMGenerateQDoc
+------------------
+
+This module provides the ``ecm_generate_qdoc`` function for generating API
+documentation files for projects based on qdoc.
+
+It allows to generate both online HTML documentation as well as
+(installed) QCH files.
+
+::
+
+ ecm_generate_qdoc(<target_name> <qdocconf_file>)
+
+``target_name`` is the library target for which the documentation is generated.
+
+``qdocconf_file`` is the .qdocconf file that controls the documentation
generation.
+
+If the project contains multiple libraries with documented APIs
``ecm_generate_qdoc``
+should be called for each one.
+
+Example usage:
+
+.. code-block:: cmake
+
+ ecm_add_qch(KF6::CoreAddons kcoreaddons.qdocconf)
+
+Documentation is not built as part of the normal build, it needs to be
explicity
+invoked using the following build targets:
+
+* ``prepare_docs`` runs the prepare step from qdoc, which processes sources
and creates index files
+* ``generate_docs`` runs the generate step from qdoc, generating the final
documentation from the index files
+* ``install_html_docs`` installs the generated HTML documentation into
``KDE_INSTALL_QTQCHDIR`` from :kde-module:`KDEInstallDirs`
+* ``generate_qch`` creates QCH files out of the HTML documentation
+* ``install_qch_docs`` installs the QCH files into ``KDE_INSTALL_QTQCHDIR``
from :kde-module:`KDEInstallDirs`
+
+The following global parameters are understood:
+
+* ``QDOC_BIN``: This can be used to select another qdoc executable than the
one found by find_package. This is useful to test with different versions of
the qdoc tool.
+* ``DOC_DESTDIR``: This is where the HTML and index files will be generated.
This is useful to aggregate results from multiple projects into a single
directory.
+
+When combining documentation from multiple projects the recommended procedure
is to use a common ``DOC_DESTDIR`` and run the prepare stage for all before
running the generate stage for all. This ensures that the index files are all
available during the generate phase and cross-linking works as expected.
+
+Since 6.11.0.
+#]=======================================================================]
+
+add_custom_target(prepare_docs)
+add_custom_target(generate_docs)
+add_custom_target(install_html_docs)
+add_custom_target(generate_qch)
+add_custom_target(install_qch_docs)
+
+function(ecm_generate_qdoc target qdocconf_file)
+ find_package(Qt6Tools CONFIG REQUIRED)
+ find_package(Qt6 COMPONENTS ToolsTools CONFIG REQUIRED)
+
+ if (NOT TARGET ${target})
+ message(FATAL_ERROR "${target} is not a target")
+ endif()
+
+ file(REAL_PATH ${qdocconf_file} full_qdocconf_path)
+
+ if (NOT EXISTS ${full_qdocconf_path})
+ message(FATAL_ERROR "Cannot find qdocconf file: ${qdocconf_file}")
+ endif()
+
+ set(qdoc_extra_args "")
+
+ if (NOT QDOC_BIN)
+ get_target_property(QDOC_BIN Qt6::qdoc LOCATION)
+ endif()
+
+ get_target_property(target_type ${target} TYPE)
+ get_target_property(target_bin_dir ${target} BINARY_DIR)
+ get_target_property(target_source_dir ${target} SOURCE_DIR)
+ set(doc_output_dir "${target_bin_dir}/.doc")
+
+ # Generate include dir list
+ set(target_include_dirs_file "${doc_output_dir}/$<CONFIG>/includes.txt")
+
+ set(include_paths_property
"$<TARGET_PROPERTY:${target},INCLUDE_DIRECTORIES>")
+
+ file(GENERATE
+ OUTPUT ${target_include_dirs_file}
+ CONTENT
"$<$<BOOL:${include_paths_property}>:-I$<JOIN:${include_paths_property},\n-I>>\n-I$<TARGET_PROPERTY:${target},BINARY_DIR>"
+ )
+ set(include_path_args "@${target_include_dirs_file}")
+
+ set(dest_dir ${doc_output_dir})
+
+ if (DOC_DESTDIR)
+ set(dest_dir ${DOC_DESTDIR})
+ endif()
+
+ ecm_query_qt(docs_dir QT_INSTALL_DOCS)
+
+ set(index_dirs ${dest_dir};${docs_dir})
+
+ foreach(path ${CMAKE_PREFIX_PATH} ${CMAKE_INSTALL_PREFIX})
+ if (EXISTS ${path}/${KDE_INSTALL_DATAROOTDIR}/doc)
+ list(APPEND ${index_dirs} "${path}/${KDE_INSTALL_DATAROOTDIR}/doc")
+ endif()
+ endforeach()
+
+ set(index_dir_arg)
+ foreach(index_directory ${index_dirs})
+ list(APPEND index_dir_arg "--indexdir" ${index_directory})
+ endforeach()
+
+
+ get_filename_component(doc_target "${qdocconf_file}" NAME_WLE)
+ set(qdoc_qch_output_dir "${CMAKE_BINARY_DIR}/${INSTALL_DOCDIR}")
+ set(index_dir "${CMAKE_BINARY_DIR}/${INSTALL_DOCDIR}")
+
+ # prepare docs target
+ set(prepare_qdoc_args
+ -outputdir ${dest_dir}/${doc_target}
+ "${target_source_dir}/${qdocconf_file}"
+ -prepare
+ ${index_dir_arg}
+ -no-link-errors
+ -installdir ${dest_dir}
+ "${include_path_args}"
+ )
+
+ set(qdoc_env_args
+
"QT_VERSION=${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}"
+ "QT_VER=${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}"
+
"QT_VERSION_TAG=${PROJECT_VERSION_MAJOR}${PROJECT_VERSION_MINOR}${PROJECT_VERSION_PATCH}"
+ "BUILDDIR=${target_bin_dir}"
+ )
+
+ add_custom_target(prepare_docs_${target}
+ COMMAND ${CMAKE_COMMAND} -E env ${qdoc_env_args}
+ ${QDOC_BIN}
+ ${prepare_qdoc_args}
+ )
+
+ # generate docs target
+ set(generate_qdoc_args
+ -outputdir ${dest_dir}/${doc_target}
+ "${target_source_dir}/${qdocconf_file}"
+ -generate
+ ${index_dir_arg}
+ -installdir ${dest_dir}
+ "${include_path_args}"
+ )
+
+ add_custom_target(generate_docs_${target}
+ COMMAND ${CMAKE_COMMAND} -E env ${qdoc_env_args}
+ ${QDOC_BIN}
+ ${generate_qdoc_args}
+ )
+
+ # generate .qch
+ set(qch_file_name ${doc_target}.qch)
+ set(qch_file_path ${dest_dir}/${doc_target}/${qch_file_name})
+
+ get_target_property(QHelpGenerator_EXECUTABLE Qt6::qhelpgenerator LOCATION)
+
+ add_custom_target(generate_qch_${target}
+ COMMAND ${QHelpGenerator_EXECUTABLE}
+ "${dest_dir}/html/${doc_target}.qhp"
+ -o "${qch_file_path}"
+ )
+
+ add_dependencies(prepare_docs prepare_docs_${target})
+ add_dependencies(generate_docs generate_docs_${target})
+ add_dependencies(generate_qch generate_qch_${target})
+ add_dependencies(install_html_docs install_html_docs_${target})
+ add_dependencies(install_qch_docs install_qch_docs_${target})
+
+ install(DIRECTORY "${dest_dir}/html/"
+ DESTINATION "${KDE_INSTALL_QTQCHDIR}/${doc_target}"
+ COMPONENT _install_html_docs_${target}
+ EXCLUDE_FROM_ALL
+ )
+
+ add_custom_target(install_html_docs_${target}
+ COMMAND ${CMAKE_COMMAND}
+ --install "${CMAKE_BINARY_DIR}"
+ --component _install_html_docs_${target}
+ COMMENT "Installing html docs for target ${target}"
+ )
+
+ install(FILES "${qch_file_path}"
+ DESTINATION "${KDE_INSTALL_QTQCHDIR}"
+ COMPONENT _install_qch_docs_${target}
+ EXCLUDE_FROM_ALL
+ )
+
+ add_custom_target(install_qch_docs_${target}
+ COMMAND ${CMAKE_COMMAND}
+ --install "${CMAKE_BINARY_DIR}"
+ --component _install_qch_docs_${target}
+ COMMENT "Installing qch docs for target ${target}"
+ )
+endfunction()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-6.10.0/modules/ECMQmLoader.cpp.in
new/extra-cmake-modules-6.11.0/modules/ECMQmLoader.cpp.in
--- old/extra-cmake-modules-6.10.0/modules/ECMQmLoader.cpp.in 2025-01-03
16:24:39.000000000 +0100
+++ new/extra-cmake-modules-6.11.0/modules/ECMQmLoader.cpp.in 2025-02-07
14:59:25.000000000 +0100
@@ -109,7 +109,13 @@
}
}
langs.removeDuplicates();
- for (const auto &lang : langs) {
+ for (const auto &lang :
+#if QT_VERSION_MAJOR == 5
+ qAsConst(langs)
+#else
+ std::as_const(langs)
+#endif
+ ) {
if (lang == QLatin1String("en") || loadTranslation(lang)) {
break;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-6.10.0/tests/ECMGeneratePkgConfigFile/metainfo_with_description.yaml
new/extra-cmake-modules-6.11.0/tests/ECMGeneratePkgConfigFile/metainfo_with_description.yaml
---
old/extra-cmake-modules-6.10.0/tests/ECMGeneratePkgConfigFile/metainfo_with_description.yaml
2025-01-03 16:24:39.000000000 +0100
+++
new/extra-cmake-modules-6.11.0/tests/ECMGeneratePkgConfigFile/metainfo_with_description.yaml
2025-02-07 14:59:25.000000000 +0100
@@ -12,8 +12,8 @@
deprecated: false
release: true
libraries:
- - qmake: KCoreAddons
- cmake: "KF5::CoreAddons"
+ - qmake: KCoreAddons
+ cmake: "KF5::CoreAddons"
cmakename: KF5CoreAddons
public_lib: true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-6.10.0/tests/ECMGeneratePkgConfigFile/metainfo_with_empty_description.yaml
new/extra-cmake-modules-6.11.0/tests/ECMGeneratePkgConfigFile/metainfo_with_empty_description.yaml
---
old/extra-cmake-modules-6.10.0/tests/ECMGeneratePkgConfigFile/metainfo_with_empty_description.yaml
2025-01-03 16:24:39.000000000 +0100
+++
new/extra-cmake-modules-6.11.0/tests/ECMGeneratePkgConfigFile/metainfo_with_empty_description.yaml
2025-02-07 14:59:25.000000000 +0100
@@ -12,8 +12,8 @@
deprecated: false
release: true
libraries:
- - qmake: KCoreAddons
- cmake: "KF5::CoreAddons"
+ - qmake: KCoreAddons
+ cmake: "KF5::CoreAddons"
cmakename: KF5CoreAddons
public_lib: true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-6.10.0/tests/ECMGeneratePkgConfigFile/metainfo_without_description.yaml
new/extra-cmake-modules-6.11.0/tests/ECMGeneratePkgConfigFile/metainfo_without_description.yaml
---
old/extra-cmake-modules-6.10.0/tests/ECMGeneratePkgConfigFile/metainfo_without_description.yaml
2025-01-03 16:24:39.000000000 +0100
+++
new/extra-cmake-modules-6.11.0/tests/ECMGeneratePkgConfigFile/metainfo_without_description.yaml
2025-02-07 14:59:25.000000000 +0100
@@ -11,8 +11,8 @@
deprecated: false
release: true
libraries:
- - qmake: KCoreAddons
- cmake: "KF5::CoreAddons"
+ - qmake: KCoreAddons
+ cmake: "KF5::CoreAddons"
cmakename: KF5CoreAddons
public_lib: true
