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-12-16 15:50:12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kf6-extra-cmake-modules (Old)
and /work/SRC/openSUSE:Factory/.kf6-extra-cmake-modules.new.1939 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kf6-extra-cmake-modules"
Tue Dec 16 15:50:12 2025 rev:22 rq:1322689 version:6.21.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/kf6-extra-cmake-modules/kf6-extra-cmake-modules.changes
2025-11-17 12:13:58.545979818 +0100
+++
/work/SRC/openSUSE:Factory/.kf6-extra-cmake-modules.new.1939/kf6-extra-cmake-modules.changes
2025-12-16 15:54:34.406592438 +0100
@@ -1,0 +2,14 @@
+Fri Dec 12 20:17:18 UTC 2025 - Christophe Marin <[email protected]>
+
+- Update to 6.21.0
+ * New feature release
+ * For more details please see:
+ * https://kde.org/announcements/frameworks/6/6.21.0
+- Changes since 6.20.0:
+ * typo--
+ * FindInotify: Fix behavior on the CMake reconfiguration
+ * FindInotify: Teach to locate the native inotify impl on systems
+ * ecm_add_test: make TARGET_NAME_VAR & TEST_NAME_VAR official
+ * Update version to 6.21.0
+
+-------------------------------------------------------------------
Old:
----
extra-cmake-modules-6.20.0.tar.xz
extra-cmake-modules-6.20.0.tar.xz.sig
New:
----
extra-cmake-modules-6.21.0.tar.xz
extra-cmake-modules-6.21.0.tar.xz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kf6-extra-cmake-modules.spec ++++++
--- /var/tmp/diff_new_pack.CVOQNh/_old 2025-12-16 15:54:35.826652571 +0100
+++ /var/tmp/diff_new_pack.CVOQNh/_new 2025-12-16 15:54:35.826652571 +0100
@@ -23,12 +23,12 @@
%define rname extra-cmake-modules
-# Full KF6 version (e.g. 6.20.0)
+# Full KF6 version (e.g. 6.21.0)
%{!?_kf6_version: %global _kf6_version %{version}}
%bcond_without doc
%bcond_without released
Name: kf6-extra-cmake-modules%{?pkg_suffix}
-Version: 6.20.0
+Version: 6.21.0
Release: 0
Summary: CMake modules
License: BSD-3-Clause
++++++ extra-cmake-modules-6.20.0.tar.xz -> extra-cmake-modules-6.21.0.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-6.20.0/CMakeLists.txt
new/extra-cmake-modules-6.21.0/CMakeLists.txt
--- old/extra-cmake-modules-6.20.0/CMakeLists.txt 2025-11-07
19:58:15.000000000 +0100
+++ new/extra-cmake-modules-6.21.0/CMakeLists.txt 2025-12-05
14:18:18.000000000 +0100
@@ -11,7 +11,7 @@
# Preliminary setup
#
-set(VERSION "6.20.0") # handled by release scripts
+set(VERSION "6.21.0") # handled by release scripts
project(ECM
VERSION "${VERSION}"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-6.20.0/find-modules/FindInotify.cmake
new/extra-cmake-modules-6.21.0/find-modules/FindInotify.cmake
--- old/extra-cmake-modules-6.20.0/find-modules/FindInotify.cmake
2025-11-07 19:58:15.000000000 +0100
+++ new/extra-cmake-modules-6.21.0/find-modules/FindInotify.cmake
2025-12-05 14:18:18.000000000 +0100
@@ -9,7 +9,7 @@
Try to find inotify on this system. This finds:
- libinotify on Unix like systems, or
- - the kernel's inotify on Linux systems.
+ - the kernel's inotify.
This will define the following variables:
@@ -20,8 +20,8 @@
``Inotify_INCLUDE_DIRS``
This has to be passed to target_include_directories()
-On Linux and SunOS, the libraries and include directories are empty,
-even though ``Inotify_FOUND`` may be set to TRUE. This is because
+On some platforms like Linux and SunOS, the libraries and include directories
+are empty, even though ``Inotify_FOUND`` may be set to TRUE. This is because
no special includes or libraries are needed. On other systems
these may be needed to use inotify.
@@ -30,31 +30,53 @@
cmake_policy(VERSION 3.16)
+# Reset the cache var before searching for sys/inotify.h
+# This is required, because on systems with native inotify we reset
Inotify_INCLUDE_DIRS
+# to an empty string. Rerunning CMake in this case will reuse the empty
variable
+# and we will not get into if(Inotify_INCLUDE_DIRS) the second time
+unset(Inotify_INCLUDE_DIRS CACHE)
+find_path(Inotify_INCLUDE_DIRS sys/inotify.h PATHS /usr/include
NO_DEFAULT_PATH)
find_path(Inotify_INCLUDE_DIRS sys/inotify.h)
if(Inotify_INCLUDE_DIRS)
-# On Linux and SunOS, there is no library to link against, on the BSDs there
is.
-# On the BSD's, inotify is implemented through a library, libinotify.
- if(CMAKE_SYSTEM_NAME MATCHES "Linux" OR CMAKE_SYSTEM_NAME MATCHES "SunOS")
+ # On OSes with a kernel implementation, there is no library to link
against.
+ # On some others inotify is implemented through a library, libinotify.
+ # If we found a header, but not a library, assume a kernel implementation
+ find_library(Inotify_LIBRARIES NAMES inotify)
+ if(NOT Inotify_LIBRARIES)
set(Inotify_FOUND TRUE)
- set(Inotify_LIBRARIES "")
- set(Inotify_INCLUDE_DIRS "")
+ set(Inotify_LIBRARIES "" CACHE STRING "" FORCE)
+ set(Inotify_INCLUDE_DIRS "" CACHE STRING "" FORCE)
else()
- find_library(Inotify_LIBRARIES NAMES inotify)
- include(FindPackageHandleStandardArgs)
- find_package_handle_standard_args(Inotify
- FOUND_VAR
- Inotify_FOUND
- REQUIRED_VARS
- Inotify_LIBRARIES
- Inotify_INCLUDE_DIRS
- )
- mark_as_advanced(Inotify_LIBRARIES Inotify_INCLUDE_DIRS)
- include(FeatureSummary)
- set_package_properties(Inotify PROPERTIES
- URL "https://github.com/libinotify-kqueue/";
- DESCRIPTION "inotify API on the *BSD family of operating systems."
- )
+ # On FreeBSD 15+ we may end up with both in-kernel and libinotify
+ # implementation. To discern between them, compare prefixes of
+ # ${Inotify_INCLUDE_DIRS} and ${Inotify_LIBRARIES}: if we get
+ # /usr/include and /usr/local/lib/libinotify.so then assume that the
+ # kernel implementation is available and user wants it, instead of
libinotify
+ cmake_path(GET Inotify_INCLUDE_DIRS PARENT_PATH includes_prefix)
+ cmake_path(GET Inotify_LIBRARIES PARENT_PATH lib_prefix)
+ cmake_path(GET lib_prefix PARENT_PATH lib_prefix)
+ cmake_path(COMPARE includes_prefix EQUAL lib_prefix prefixes_match)
+
+ if(NOT prefixes_match)
+ set(Inotify_FOUND TRUE)
+ set(Inotify_LIBRARIES "" CACHE STRING "" FORCE)
+ set(Inotify_INCLUDE_DIRS "" CACHE STRING "" FORCE)
+ else()
+ include(FindPackageHandleStandardArgs)
+ find_package_handle_standard_args(Inotify
+ FOUND_VAR
+ Inotify_FOUND
+ REQUIRED_VARS
+ Inotify_LIBRARIES
+ Inotify_INCLUDE_DIRS
+ )
+ include(FeatureSummary)
+ set_package_properties(Inotify PROPERTIES
+ URL "https://github.com/libinotify-kqueue/";
+ DESCRIPTION "inotify API on the *BSD family of operating
systems."
+ )
+ endif()
endif()
if(NOT TARGET Inotify::Inotify)
add_library(Inotify::Inotify INTERFACE IMPORTED)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-6.20.0/modules/ECMAddTests.cmake
new/extra-cmake-modules-6.21.0/modules/ECMAddTests.cmake
--- old/extra-cmake-modules-6.20.0/modules/ECMAddTests.cmake 2025-11-07
19:58:15.000000000 +0100
+++ new/extra-cmake-modules-6.21.0/modules/ECMAddTests.cmake 2025-12-05
14:18:18.000000000 +0100
@@ -68,6 +68,8 @@
[TEST_NAME <name>]
[NAME_PREFIX <prefix>]
[GUI]
+ [TARGET_NAME_VAR <target_name_var>]
+ [TEST_NAME_VAR <test_name_var>]
[WORKING_DIRECTORY <dir>] # Since 5.111
)
@@ -76,6 +78,11 @@
be given; this will be used for both the target and test names (and, as with
``ecm_add_tests()``, the ``NAME_PREFIX`` argument will be prepended to the
test name).
+The ``TARGET_NAME_VAR`` and ``TEST_NAME_VAR`` arguments, if given, should
specify a
+variable name to receive the generated target and test name,
+respectively. This makes it convenient to apply properties to them as a
+whole, for example, using ``set_target_properties()`` or
``set_tests_properties()``.
+
``WORKING_DIRECTORY`` sets the test property `WORKING_DIRECTORY
<https://cmake.org/cmake/help/latest/prop_test/WORKING_DIRECTORY.html>`_
in which to execute the test. By default the test will be run in
@@ -92,8 +99,6 @@
function(ecm_add_test)
set(options GUI)
- # TARGET_NAME_VAR and TEST_NAME_VAR are undocumented args used by
- # ecm_add_tests
set(oneValueArgs TEST_NAME NAME_PREFIX TARGET_NAME_VAR TEST_NAME_VAR
WORKING_DIRECTORY)
set(multiValueArgs COMPILE_DEFINITIONS ENVIRONMENT LINK_LIBRARIES)
cmake_parse_arguments(ARG "${options}" "${oneValueArgs}" "${multiValueArgs}"
${ARGN})
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-6.20.0/modules/ECMQmlModule.cmake
new/extra-cmake-modules-6.21.0/modules/ECMQmlModule.cmake
--- old/extra-cmake-modules-6.20.0/modules/ECMQmlModule.cmake 2025-11-07
19:58:15.000000000 +0100
+++ new/extra-cmake-modules-6.21.0/modules/ECMQmlModule.cmake 2025-12-05
14:18:18.000000000 +0100
@@ -227,7 +227,7 @@
Since 6.18.0
Generate code from qmlcachegen is put into the same ``UNITY_GROUP``. Unity
builds
-using this can either be activated manueally per target or with the
``ECM_QMLCACHE_UNITY_BUILD``
+using this can either be activated manually per target or with the
``ECM_QMLCACHE_UNITY_BUILD``
option globally. This can speed up clean builds at the expense of needing more
memory
and making incremental builds slower.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-6.20.0/tests/ECMAddTests/single_tests/CMakeLists.txt
new/extra-cmake-modules-6.21.0/tests/ECMAddTests/single_tests/CMakeLists.txt
---
old/extra-cmake-modules-6.20.0/tests/ECMAddTests/single_tests/CMakeLists.txt
2025-11-07 19:58:15.000000000 +0100
+++
new/extra-cmake-modules-6.21.0/tests/ECMAddTests/single_tests/CMakeLists.txt
2025-12-05 14:18:18.000000000 +0100
@@ -30,9 +30,15 @@
"${CMAKE_CURRENT_BINARY_DIR}/test7_dir"
)
+set(exp_target_name "test1")
+set(exp_test_name "test1")
ecm_add_test(test1.cpp
LINK_LIBRARIES testhelper
+ TARGET_NAME_VAR target_name
+ TEST_NAME_VAR test_name
)
+assert_vars_setequal(target_name exp_target_name)
+assert_vars_setequal(test_name exp_test_name)
# check target exists
get_property(_dummy TARGET test1 PROPERTY TYPE)
# check test exists
@@ -63,10 +69,16 @@
endif()
+set(exp_target_name "test3")
+set(exp_test_name "prefix_test3")
ecm_add_test(test3.cpp
LINK_LIBRARIES testhelper
NAME_PREFIX prefix_
+ TARGET_NAME_VAR target_name
+ TEST_NAME_VAR test_name
)
+assert_vars_setequal(target_name exp_target_name)
+assert_vars_setequal(test_name exp_test_name)
get_property(_dummy TARGET test3 PROPERTY TYPE)
get_property(_dummy TEST prefix_test3 PROPERTY TIMEOUT)
get_property(_is_win32 TARGET test3 PROPERTY WIN32_EXECUTABLE)
