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 2024-09-15 12:33:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kf6-extra-cmake-modules (Old)
and /work/SRC/openSUSE:Factory/.kf6-extra-cmake-modules.new.29891 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kf6-extra-cmake-modules"
Sun Sep 15 12:33:31 2024 rev:7 rq:1200991 version:6.6.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/kf6-extra-cmake-modules/kf6-extra-cmake-modules.changes
2024-08-10 19:09:49.882842485 +0200
+++
/work/SRC/openSUSE:Factory/.kf6-extra-cmake-modules.new.29891/kf6-extra-cmake-modules.changes
2024-09-15 12:37:11.850516686 +0200
@@ -1,0 +2,20 @@
+Sat Sep 7 09:03:04 UTC 2024 - Christophe Marin <[email protected]>
+
+- Update to 6.6.0
+ * New feature release
+ * For more details please see:
+ * https://kde.org/announcements/frameworks/6/6.6.0
+- Changes since 6.5.0:
+ * ECMQueryQt: don't cache QUERY_EXECUTABLE
+ * Add fallback value for SASL_PATH
+ * Add SASL_PATH to prefix.sh so that libkdexoauth2.so is found
+ * Allow qml target to be actually optional
+ * Fix FindLibExiv2 version detection from header
+ * ci: add Alpine/musl job
+ * ECMEnableSanitizers: fix greedy linker parameter replacment
+ * Add private code option to ecm_add_qtwayland_(client/server)_protocol
+ * Update version to 6.6.0
+ * Add a PRIVATE_CODE option to ecm_add_wayland_server_protocol
+ * Add [PRIVATE_CODE] also to the second signature of
ecm_add_wayland_server_protocol
+
+-------------------------------------------------------------------
Old:
----
extra-cmake-modules-6.5.0.tar.xz
extra-cmake-modules-6.5.0.tar.xz.sig
New:
----
extra-cmake-modules-6.6.0.tar.xz
extra-cmake-modules-6.6.0.tar.xz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kf6-extra-cmake-modules.spec ++++++
--- /var/tmp/diff_new_pack.16NWuD/_old 2024-09-15 12:37:12.418540487 +0200
+++ /var/tmp/diff_new_pack.16NWuD/_new 2024-09-15 12:37:12.418540487 +0200
@@ -23,14 +23,14 @@
%define rname extra-cmake-modules
-# Full KF6 version (e.g. 6.5.0)
+# Full KF6 version (e.g. 6.6.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.5.0
+Version: 6.6.0
Release: 0
Summary: CMake modules
License: BSD-3-Clause
++++++ extra-cmake-modules-6.5.0.tar.xz -> extra-cmake-modules-6.6.0.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-6.5.0/.gitlab-ci.yml
new/extra-cmake-modules-6.6.0/.gitlab-ci.yml
--- old/extra-cmake-modules-6.5.0/.gitlab-ci.yml 2024-08-02
13:11:27.000000000 +0200
+++ new/extra-cmake-modules-6.6.0/.gitlab-ci.yml 2024-09-06
13:35:47.000000000 +0200
@@ -15,4 +15,5 @@
- /gitlab-templates/windows-static.yml
- /gitlab-templates/freebsd-qt6.yml
- /gitlab-templates/windows-qt6.yml
+ - /gitlab-templates/alpine-qt6.yml
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-6.5.0/CMakeLists.txt
new/extra-cmake-modules-6.6.0/CMakeLists.txt
--- old/extra-cmake-modules-6.5.0/CMakeLists.txt 2024-08-02
13:11:27.000000000 +0200
+++ new/extra-cmake-modules-6.6.0/CMakeLists.txt 2024-09-06
13:35:47.000000000 +0200
@@ -11,7 +11,7 @@
# Preliminary setup
#
-set(VERSION "6.5.0") # handled by release scripts
+set(VERSION "6.6.0") # handled by release scripts
project(ECM
VERSION "${VERSION}"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-6.5.0/find-modules/FindLibExiv2.cmake
new/extra-cmake-modules-6.6.0/find-modules/FindLibExiv2.cmake
--- old/extra-cmake-modules-6.5.0/find-modules/FindLibExiv2.cmake
2024-08-02 13:11:27.000000000 +0200
+++ new/extra-cmake-modules-6.6.0/find-modules/FindLibExiv2.cmake
2024-09-06 13:35:47.000000000 +0200
@@ -57,13 +57,13 @@
foreach(_exiv2_version_file "version.hpp" "exv_conf.h")
if(EXISTS "${LibExiv2_INCLUDE_DIRS}/exiv2/${_exiv2_version_file}")
file(READ "${LibExiv2_INCLUDE_DIRS}/exiv2/${_exiv2_version_file}"
_exiv_version_file_content)
- string(REGEX MATCH "#define EXIV2_MAJOR_VERSION[ ]+\\([0-9]+\\)"
EXIV2_MAJOR_VERSION_MATCH ${_exiv_version_file_content})
- string(REGEX MATCH "#define EXIV2_MINOR_VERSION[ ]+\\([0-9]+\\)"
EXIV2_MINOR_VERSION_MATCH ${_exiv_version_file_content})
- string(REGEX MATCH "#define EXIV2_PATCH_VERSION[ ]+\\([0-9]+\\)"
EXIV2_PATCH_VERSION_MATCH ${_exiv_version_file_content})
+ string(REGEX MATCH "#define EXIV2_MAJOR_VERSION[ ]+\\([0-9]+U?\\)"
EXIV2_MAJOR_VERSION_MATCH ${_exiv_version_file_content})
+ string(REGEX MATCH "#define EXIV2_MINOR_VERSION[ ]+\\([0-9]+U?\\)"
EXIV2_MINOR_VERSION_MATCH ${_exiv_version_file_content})
+ string(REGEX MATCH "#define EXIV2_PATCH_VERSION[ ]+\\([0-9]+U?\\)"
EXIV2_PATCH_VERSION_MATCH ${_exiv_version_file_content})
if(EXIV2_MAJOR_VERSION_MATCH)
- string(REGEX REPLACE ".*_MAJOR_VERSION[ ]+\\((.*)\\)" "\\1"
EXIV2_MAJOR_VERSION ${EXIV2_MAJOR_VERSION_MATCH})
- string(REGEX REPLACE ".*_MINOR_VERSION[ ]+\\((.*)\\)" "\\1"
EXIV2_MINOR_VERSION ${EXIV2_MINOR_VERSION_MATCH})
- string(REGEX REPLACE ".*_PATCH_VERSION[ ]+\\((.*)\\)" "\\1"
EXIV2_PATCH_VERSION ${EXIV2_PATCH_VERSION_MATCH})
+ string(REGEX REPLACE ".*_MAJOR_VERSION[ ]+\\(([0-9]*)U?\\)"
"\\1" EXIV2_MAJOR_VERSION ${EXIV2_MAJOR_VERSION_MATCH})
+ string(REGEX REPLACE ".*_MINOR_VERSION[ ]+\\(([0-9]*)U?\\)"
"\\1" EXIV2_MINOR_VERSION ${EXIV2_MINOR_VERSION_MATCH})
+ string(REGEX REPLACE ".*_PATCH_VERSION[ ]+\\(([0-9]*)U?\\)"
"\\1" EXIV2_PATCH_VERSION ${EXIV2_PATCH_VERSION_MATCH})
endif()
endif()
endforeach()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-6.5.0/find-modules/FindQtWaylandScanner.cmake
new/extra-cmake-modules-6.6.0/find-modules/FindQtWaylandScanner.cmake
--- old/extra-cmake-modules-6.5.0/find-modules/FindQtWaylandScanner.cmake
2024-08-02 13:11:27.000000000 +0200
+++ new/extra-cmake-modules-6.6.0/find-modules/FindQtWaylandScanner.cmake
2024-09-06 13:35:47.000000000 +0200
@@ -37,17 +37,22 @@
ecm_add_qtwayland_client_protocol(<target>
PROTOCOL <xmlfile>
BASENAME <basename>
- [PREFIX <prefix>])
+ [PREFIX <prefix>]
+ [PRIVATE_CODE])
ecm_add_qtwayland_client_protocol(<source_files_var>
PROTOCOL <xmlfile>
BASENAME <basename>
- [PREFIX <prefix>])
+ [PREFIX <prefix>]
+ [PRIVATE_CODE])
Generate C++ wrapper to Wayland client protocol files from ``<xmlfile>``
XML definition for the ``<basename>`` interface and append those files
to ``<source_files_var>`` or ``<target>``. Pass the ``<prefix>`` argument if
the interface
names don't start with ``qt_`` or ``wl_``.
+``PRIVATE_CODE`` instructs wayland-scanner to hide marshalling code
+from the compiled DSO for use in other DSOs. The default is to
+export this code.
WaylandScanner is required and will be searched for.
@@ -56,17 +61,22 @@
ecm_add_qtwayland_server_protocol(<target>
PROTOCOL <xmlfile>
BASENAME <basename>
- [PREFIX <prefix>])
+ [PREFIX <prefix>]
+ [PRIVATE_CODE])
ecm_add_qtwayland_server_protocol(<source_files_var>
PROTOCOL <xmlfile>
BASENAME <basename>
- [PREFIX <prefix>])
+ [PREFIX <prefix>]
+ [PRIVATE_CODE])
Generate C++ wrapper to Wayland server protocol files from ``<xmlfile>``
XML definition for the ``<basename>`` interface and append those files
to ``<source_files_var>`` or ``<target>``. Pass the ``<prefix>`` argument if
the interface
names don't start with ``qt_`` or ``wl_``.
+``PRIVATE_CODE`` instructs wayland-scanner to hide marshalling code
+from the compiled DSO for use in other DSOs. The default is to
+export this code.
WaylandScanner is required and will be searched for.
@@ -113,18 +123,23 @@
function(ecm_add_qtwayland_client_protocol target_or_sources_var)
# Parse arguments
set(oneValueArgs PROTOCOL BASENAME PREFIX)
- cmake_parse_arguments(ARGS "" "${oneValueArgs}" "" ${ARGN})
+ set(options PRIVATE_CODE)
+ cmake_parse_arguments(ARGS "${options}" "${oneValueArgs}" "" ${ARGN})
if(ARGS_UNPARSED_ARGUMENTS)
message(FATAL_ERROR "Unknown keywords given to
ecm_add_qtwayland_client_protocol(): \"${ARGS_UNPARSED_ARGUMENTS}\"")
endif()
set(_prefix "${ARGS_PREFIX}")
+ if(ARGS_PRIVATE_CODE)
+ set(_private_code_option PRIVATE_CODE)
+ endif()
find_package(WaylandScanner REQUIRED QUIET)
ecm_add_wayland_client_protocol(${target_or_sources_var}
PROTOCOL ${ARGS_PROTOCOL}
- BASENAME ${ARGS_BASENAME})
+ BASENAME ${ARGS_BASENAME}
+ ${_private_code_option})
get_filename_component(_infile ${ARGS_PROTOCOL} ABSOLUTE)
set(_header "${CMAKE_CURRENT_BINARY_DIR}/qwayland-${ARGS_BASENAME}.h")
@@ -154,18 +169,23 @@
function(ecm_add_qtwayland_server_protocol target_or_sources_var)
# Parse arguments
set(oneValueArgs PROTOCOL BASENAME PREFIX)
- cmake_parse_arguments(ARGS "" "${oneValueArgs}" "" ${ARGN})
+ set(options PRIVATE_CODE)
+ cmake_parse_arguments(ARGS "${options}" "${oneValueArgs}" "" ${ARGN})
if(ARGS_UNPARSED_ARGUMENTS)
message(FATAL_ERROR "Unknown keywords given to
ecm_add_qtwayland_server_protocol(): \"${ARGS_UNPARSED_ARGUMENTS}\"")
endif()
set(_prefix "${ARGS_PREFIX}")
+ if(ARGS_PRIVATE_CODE)
+ set(_private_code_option PRIVATE_CODE)
+ endif()
find_package(WaylandScanner REQUIRED QUIET)
ecm_add_wayland_server_protocol(${target_or_sources_var}
PROTOCOL ${ARGS_PROTOCOL}
- BASENAME ${ARGS_BASENAME})
+ BASENAME ${ARGS_BASENAME}
+ ${_private_code_option})
get_filename_component(_infile ${ARGS_PROTOCOL} ABSOLUTE)
set(_header
"${CMAKE_CURRENT_BINARY_DIR}/qwayland-server-${ARGS_BASENAME}.h")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-6.5.0/find-modules/FindWaylandScanner.cmake
new/extra-cmake-modules-6.6.0/find-modules/FindWaylandScanner.cmake
--- old/extra-cmake-modules-6.5.0/find-modules/FindWaylandScanner.cmake
2024-08-02 13:11:27.000000000 +0200
+++ new/extra-cmake-modules-6.6.0/find-modules/FindWaylandScanner.cmake
2024-09-06 13:35:47.000000000 +0200
@@ -41,7 +41,8 @@
ecm_add_wayland_client_protocol(<source_files_var>
PROTOCOL <xmlfile>
- BASENAME <basename>)
+ BASENAME <basename>
+ [PRIVATE_CODE])
Generate Wayland client protocol files from ``<xmlfile>`` XML
definition for the ``<basename>`` interface and append those files
@@ -55,16 +56,22 @@
ecm_add_wayland_server_protocol(<target>
PROTOCOL <xmlfile>
- BASENAME <basename>)
+ BASENAME <basename>
+ [PRIVATE_CODE])
ecm_add_wayland_server_protocol(<source_files_var>
PROTOCOL <xmlfile>
- BASENAME <basename>)
+ BASENAME <basename>
+ [PRIVATE_CODE])
Generate Wayland server protocol files from ``<xmlfile>`` XML
definition for the ``<basename>`` interface and append those files
to ``<source_files_var>`` or ``<target>``.
+``PRIVATE_CODE`` instructs wayland-scanner to hide marshalling code
+from the compiled DSO for use in other DSOs. The default is to
+export this code.
+
Since 1.4.0.
#]=======================================================================]
@@ -140,16 +147,22 @@
function(ecm_add_wayland_server_protocol target_or_sources_var)
# Parse arguments
+ set(options PRIVATE_CODE)
set(oneValueArgs PROTOCOL BASENAME)
- cmake_parse_arguments(ARGS "" "${oneValueArgs}" "" ${ARGN})
+ cmake_parse_arguments(ARGS "${options}" "${oneValueArgs}" "" ${ARGN})
if(ARGS_UNPARSED_ARGUMENTS)
message(FATAL_ERROR "Unknown keywords given to
ecm_add_wayland_server_protocol(): \"${ARGS_UNPARSED_ARGUMENTS}\"")
endif()
+ if(ARGS_PRIVATE_CODE)
+ set(_private_code_option PRIVATE_CODE)
+ endif()
+
ecm_add_wayland_client_protocol(${target_or_sources_var}
PROTOCOL ${ARGS_PROTOCOL}
- BASENAME ${ARGS_BASENAME})
+ BASENAME ${ARGS_BASENAME}
+ ${_private_code_option})
get_filename_component(_infile ${ARGS_PROTOCOL} ABSOLUTE)
set(_server_header
"${CMAKE_CURRENT_BINARY_DIR}/wayland-${ARGS_BASENAME}-server-protocol.h")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-6.5.0/kde-modules/prefix.sh.cmake
new/extra-cmake-modules-6.6.0/kde-modules/prefix.sh.cmake
--- old/extra-cmake-modules-6.5.0/kde-modules/prefix.sh.cmake 2024-08-02
13:11:27.000000000 +0200
+++ new/extra-cmake-modules-6.6.0/kde-modules/prefix.sh.cmake 2024-09-06
13:35:47.000000000 +0200
@@ -12,3 +12,5 @@
export
QT_QUICK_CONTROLS_STYLE_PATH=@KDE_INSTALL_FULL_QMLDIR@/QtQuick/Controls.2/:$QT_QUICK_CONTROLS_STYLE_PATH
export
MANPATH=@KDE_INSTALL_FULL_DATADIR@/man:${MANPATH:-/usr/local/share/man:/usr/share/man}
+
+export
SASL_PATH=@KDE_INSTALL_FULL_LIBDIR@/sasl2:${SASL_PATH:-/usr/@CMAKE_INSTALL_LIBDIR@/sasl2}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-6.5.0/modules/ECMEnableSanitizers.cmake
new/extra-cmake-modules-6.6.0/modules/ECMEnableSanitizers.cmake
--- old/extra-cmake-modules-6.5.0/modules/ECMEnableSanitizers.cmake
2024-08-02 13:11:27.000000000 +0200
+++ new/extra-cmake-modules-6.6.0/modules/ECMEnableSanitizers.cmake
2024-09-06 13:35:47.000000000 +0200
@@ -156,8 +156,8 @@
link_libraries(${XSAN_LINKER_FLAGS})
endif()
if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
- string(REPLACE "-Wl,--no-undefined" ""
CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}")
- string(REPLACE "-Wl,--no-undefined" ""
CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS}")
+ string(REPLACE "-Wl,--no-undefined " ""
CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ")
+ string(REPLACE "-Wl,--no-undefined " ""
CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ")
endif ()
endforeach()
else()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-6.5.0/modules/ECMQmlModule.cmake
new/extra-cmake-modules-6.6.0/modules/ECMQmlModule.cmake
--- old/extra-cmake-modules-6.5.0/modules/ECMQmlModule.cmake 2024-08-02
13:11:27.000000000 +0200
+++ new/extra-cmake-modules-6.6.0/modules/ECMQmlModule.cmake 2024-09-06
13:35:47.000000000 +0200
@@ -179,9 +179,6 @@
# so it has been split to separate files.
if ("${QT_MAJOR_VERSION}" STREQUAL "6")
include(${CMAKE_CURRENT_LIST_DIR}/ECMQmlModule6.cmake)
- if (NOT COMMAND ecm_add_qml_module)
- message(FATAL_ERROR "Failed setting up ECMQmlModule")
- endif()
elseif("${QT_MAJOR_VERSION}" STREQUAL "5")
include(${CMAKE_CURRENT_LIST_DIR}/ECMQmlModule5.cmake)
else()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-6.5.0/modules/ECMQueryQt.cmake
new/extra-cmake-modules-6.6.0/modules/ECMQueryQt.cmake
--- old/extra-cmake-modules-6.5.0/modules/ECMQueryQt.cmake 2024-08-02
13:11:27.000000000 +0200
+++ new/extra-cmake-modules-6.6.0/modules/ECMQueryQt.cmake 2024-09-06
13:35:47.000000000 +0200
@@ -51,8 +51,7 @@
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(QUERY_EXECUTABLE ${_qmake_executable_default})
set(_cli_option "-query")
endif()
elseif(QT_MAJOR_VERSION STREQUAL "6")
@@ -62,8 +61,7 @@
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(QUERY_EXECUTABLE ${_qtpaths_executable})
set(_cli_option "--query")
endif()
endif()
