Hello community,
here is the log from the commit of package extra-cmake-modules for
openSUSE:Factory checked in at 2020-05-11 13:26:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/extra-cmake-modules (Old)
and /work/SRC/openSUSE:Factory/.extra-cmake-modules.new.2738 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "extra-cmake-modules"
Mon May 11 13:26:58 2020 rev:77 rq:802057 version:5.70.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/extra-cmake-modules/extra-cmake-modules.changes
2020-04-15 20:01:57.729909543 +0200
+++
/work/SRC/openSUSE:Factory/.extra-cmake-modules.new.2738/extra-cmake-modules.changes
2020-05-11 13:28:13.607466531 +0200
@@ -1,0 +2,15 @@
+Sun May 3 09:39:40 UTC 2020 - Christophe Giboudeaux <[email protected]>
+
+- Update to 5.70.0
+ * New feature release
+ * For more details please see:
+ * https://kde.org/announcements/kde-frameworks-5.70.0
+- Changes since 5.69.0:
+ * android: include the architecture on the apk name
+ * ECMAddQch: fix use of quotation marks with PREDEFINED in doxygen config
+ * Adapt FindKF5 to stricter checks in newer find_package_handle_standard_args
+ * ECMAddQch: help doxygen to handle Q_DECLARE_FLAGS, so such types get docs
+ * Fix wayland scanner warnings
+ * ECM: attempt to fix KDEInstallDirsTest.relative_or_absolute on Windows
+
+-------------------------------------------------------------------
Old:
----
extra-cmake-modules-5.69.0.tar.xz
extra-cmake-modules-5.69.0.tar.xz.sig
New:
----
extra-cmake-modules-5.70.0.tar.xz
extra-cmake-modules-5.70.0.tar.xz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ extra-cmake-modules.spec ++++++
--- /var/tmp/diff_new_pack.4Ay1gZ/_old 2020-05-11 13:28:14.643468703 +0200
+++ /var/tmp/diff_new_pack.4Ay1gZ/_new 2020-05-11 13:28:14.643468703 +0200
@@ -16,7 +16,7 @@
#
-%define _tar_path 5.69
+%define _tar_path 5.70
# Full KF5 version (e.g. 5.33.0)
%{!?_kf5_version: %global _kf5_version %{version}}
# Last major and minor KF5 version (e.g. 5.33)
@@ -29,7 +29,7 @@
# Only needed for the package signature condition
%bcond_without lang
Name: extra-cmake-modules
-Version: 5.69.0
+Version: 5.70.0
Release: 0
Summary: CMake modules
License: BSD-3-Clause
++++++ extra-cmake-modules-5.69.0.tar.xz -> extra-cmake-modules-5.70.0.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-5.69.0/CMakeLists.txt
new/extra-cmake-modules-5.70.0/CMakeLists.txt
--- old/extra-cmake-modules-5.69.0/CMakeLists.txt 2020-03-24
20:47:59.000000000 +0100
+++ new/extra-cmake-modules-5.70.0/CMakeLists.txt 2020-04-29
01:16:47.000000000 +0200
@@ -32,7 +32,7 @@
# Preliminary setup
#
-set(VERSION "5.69.0") # handled by release scripts
+set(VERSION "5.70.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.69.0/find-modules/FindKF5.cmake
new/extra-cmake-modules-5.70.0/find-modules/FindKF5.cmake
--- old/extra-cmake-modules-5.69.0/find-modules/FindKF5.cmake 2020-03-24
20:47:59.000000000 +0100
+++ new/extra-cmake-modules-5.70.0/find-modules/FindKF5.cmake 2020-04-29
01:16:47.000000000 +0200
@@ -75,7 +75,12 @@
${_exact_arg} ${_quiet_arg}
CONFIG
)
- find_package_handle_standard_args(KF5${_module} CONFIG_MODE)
+ # CMake >= 3.17 wants to be explictly told we are fine with name mismatch
here
+ set(_name_mismatched_arg)
+ if(NOT CMAKE_VERSION VERSION_LESS 3.17)
+ set(_name_mismatched_arg NAME_MISMATCHED)
+ endif()
+ find_package_handle_standard_args(KF5${_module} CONFIG_MODE
${_name_mismatched_arg})
if (KF5_FIND_REQUIRED AND KF5_FIND_REQUIRED_${_module})
# If the component was required, we tell FeatureSummary so that it
# will be displayed in the correct list. We do not use the REQUIRED
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.69.0/find-modules/FindQtWaylandScanner.cmake
new/extra-cmake-modules-5.70.0/find-modules/FindQtWaylandScanner.cmake
--- old/extra-cmake-modules-5.69.0/find-modules/FindQtWaylandScanner.cmake
2020-03-24 20:47:59.000000000 +0100
+++ new/extra-cmake-modules-5.70.0/find-modules/FindQtWaylandScanner.cmake
2020-04-29 01:16:47.000000000 +0200
@@ -138,6 +138,7 @@
BASENAME ${ARGS_BASENAME})
get_filename_component(_infile ${ARGS_PROTOCOL} ABSOLUTE)
+ set(_ccode
"${CMAKE_CURRENT_BINARY_DIR}/wayland-${ARGS_BASENAME}-client-protocol.c")
set(_cheader
"${CMAKE_CURRENT_BINARY_DIR}/wayland-${ARGS_BASENAME}-client-protocol.h")
set(_header "${CMAKE_CURRENT_BINARY_DIR}/qwayland-${ARGS_BASENAME}.h")
set(_code "${CMAKE_CURRENT_BINARY_DIR}/qwayland-${ARGS_BASENAME}.cpp")
@@ -152,6 +153,8 @@
COMMAND ${QtWaylandScanner_EXECUTABLE} client-code ${_infile} ""
${_prefix} > ${_code}
DEPENDS ${_infile} ${_header} VERBATIM)
+ set_property(SOURCE ${_header} ${_code} ${_cheader} ${_ccode} PROPERTY
SKIP_AUTOMOC ON)
+
list(APPEND ${out_var} "${_code}")
set(${out_var} ${${out_var}} PARENT_SCOPE)
endfunction()
@@ -187,6 +190,8 @@
COMMAND ${QtWaylandScanner_EXECUTABLE} server-code ${_infile} ""
${_prefix} > ${_code}
DEPENDS ${_infile} ${_header} VERBATIM)
+ set_property(SOURCE ${_header} ${_code} PROPERTY SKIP_AUTOMOC ON)
+
list(APPEND ${out_var} "${_code}")
set(${out_var} ${${out_var}} PARENT_SCOPE)
endfunction()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.69.0/find-modules/FindWaylandScanner.cmake
new/extra-cmake-modules-5.70.0/find-modules/FindWaylandScanner.cmake
--- old/extra-cmake-modules-5.69.0/find-modules/FindWaylandScanner.cmake
2020-03-24 20:47:59.000000000 +0100
+++ new/extra-cmake-modules-5.70.0/find-modules/FindWaylandScanner.cmake
2020-04-29 01:16:47.000000000 +0200
@@ -125,7 +125,7 @@
set_source_files_properties(${_client_header} GENERATED)
set_source_files_properties(${_code} GENERATED)
- set_property(SOURCE ${_client_header} PROPERTY SKIP_AUTOMOC ON)
+ set_property(SOURCE ${_client_header} ${_code} PROPERTY SKIP_AUTOMOC ON)
add_custom_command(OUTPUT "${_client_header}"
COMMAND ${WaylandScanner_EXECUTABLE} client-header ${_infile}
${_client_header}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.69.0/modules/ECMQchDoxygen.config.in
new/extra-cmake-modules-5.70.0/modules/ECMQchDoxygen.config.in
--- old/extra-cmake-modules-5.69.0/modules/ECMQchDoxygen.config.in
2020-03-24 20:47:59.000000000 +0100
+++ new/extra-cmake-modules-5.70.0/modules/ECMQchDoxygen.config.in
2020-04-29 01:16:47.000000000 +0200
@@ -227,14 +227,15 @@
Q_OS_SOLARIS= \
Q_OS_IRIX= \
\
- Q_SLOTS="slots" \
- Q_SIGNALS="signals" \
- Q_DECL_CONSTEXPR= \
+ Q_SLOTS=slots \
+ Q_SIGNALS=signals \
+ "Q_DECLARE_FLAGS(Flags, Enum)=typedef QFlags<Enum> Flags;" \
+ Q_DECL_CONSTEXPR=constexpr \
Q_DECL_RELAXED_CONSTEXPR= \
- Q_DECL_OVERRIDE="override" \
- Q_DECL_FINAL="final" \
- Q_DECL_EQ_DEFAULT="= default" \
- Q_DECL_EQ_DELETE="= delete" \
+ Q_DECL_OVERRIDE=override \
+ Q_DECL_FINAL=final \
+ "Q_DECL_EQ_DEFAULT= = default" \
+ "Q_DECL_EQ_DELETE= = delete" \
Q_DECL_NOEXCEPT= \
Q_DECL_DEPRECATED= \
Q_DECL_UNUSED_MEMBER= \
@@ -242,7 +243,7 @@
Q_DECL_EXPORT= \
Q_DECL_IMPORT= \
Q_DECL_HIDDEN= \
- Q_DECL_NULLPTR="nullptr" \
+ Q_DECL_NULLPTR=nullptr \
Q_REQUIRED_RESULT= \
Q_SCRIPTABLE= \
Q_INVOKABLE= \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-5.69.0/tests/CMakeLists.txt
new/extra-cmake-modules-5.70.0/tests/CMakeLists.txt
--- old/extra-cmake-modules-5.69.0/tests/CMakeLists.txt 2020-03-24
20:47:59.000000000 +0100
+++ new/extra-cmake-modules-5.70.0/tests/CMakeLists.txt 2020-04-29
01:16:47.000000000 +0200
@@ -114,7 +114,6 @@
add_test_macro(ExecuteKDEModules dummy)
add_test_macro(KDEFetchTranslations dummy)
-add_test_macro(KDEInstallDirsTest.relative_or_absolute dummy)
add_test_variant(KDEInstallDirsTest.vars_in_sync_no_args
KDEInstallDirsTest.vars_in_sync dummy)
add_test_macro(KDEInstallDirsTest.not_cache_variable dummy)
@@ -155,7 +154,8 @@
if (TARGET Qt5::qmake)
set(KDEInstallDirsTest.relative_or_absolute_qt_EXTRA_OPTIONS
- --build-options -DKDE_INSTALL_USE_QT_SYS_PATHS=TRUE
+ --build-options -DCMAKE_INSTALL_PREFIX=/tmp
+ -DKDE_INSTALL_USE_QT_SYS_PATHS=TRUE
-DPLUGINDIR_should_be_absolute=TRUE
-DQMLDIR_should_be_absolute=TRUE
-DQTQCHDIR_should_be_absolute=TRUE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.69.0/toolchain/ECMAndroidDeployQt.cmake
new/extra-cmake-modules-5.70.0/toolchain/ECMAndroidDeployQt.cmake
--- old/extra-cmake-modules-5.69.0/toolchain/ECMAndroidDeployQt.cmake
2020-03-24 20:47:59.000000000 +0100
+++ new/extra-cmake-modules-5.70.0/toolchain/ECMAndroidDeployQt.cmake
2020-04-29 01:16:47.000000000 +0200
@@ -74,11 +74,11 @@
COMMAND cmake -E copy "$<TARGET_FILE:${QTANDROID_EXPORTED_TARGET}>"
"${EXECUTABLE_DESTINATION_PATH}"
COMMAND LANG=C cmake
"-DTARGET=$<TARGET_FILE:${QTANDROID_EXPORTED_TARGET}>" -P
${_CMAKE_ANDROID_DIR}/hasMainSymbol.cmake
COMMAND LANG=C cmake
-DINPUT_FILE="${QTANDROID_EXPORTED_TARGET}-deployment.json.in2"
-DOUTPUT_FILE="${QTANDROID_EXPORTED_TARGET}-deployment.json"
"-DTARGET=$<TARGET_FILE:${QTANDROID_EXPORTED_TARGET}>"
"-DOUTPUT_DIR=$<TARGET_FILE_DIR:${QTANDROID_EXPORTED_TARGET}>"
"-DEXPORT_DIR=${CMAKE_INSTALL_PREFIX}"
"-DECM_ADDITIONAL_FIND_ROOT_PATH=\"${ECM_ADDITIONAL_FIND_ROOT_PATH}\""
"-DANDROID_EXTRA_LIBS=\"${ANDROID_EXTRA_LIBS}\"" -P
${_CMAKE_ANDROID_DIR}/specifydependencies.cmake
- COMMAND $<TARGET_FILE_DIR:Qt5::qmake>/androiddeployqt --gradle --input
"${QTANDROID_EXPORTED_TARGET}-deployment.json" --output "${EXPORT_DIR}"
--deployment bundled ${arguments}
+ COMMAND $<TARGET_FILE_DIR:Qt5::qmake>/androiddeployqt --gradle --input
"${QTANDROID_EXPORTED_TARGET}-deployment.json" --apk
"${EXPORT_DIR}/${QTANDROID_EXPORTED_TARGET}-${CMAKE_ANDROID_ARCH_ABI}.apk"
--output "${EXPORT_DIR}" --deployment bundled ${arguments}
)
add_custom_target(install-apk-${QTANDROID_EXPORTED_TARGET}
- COMMAND adb install -r
"${EXPORT_DIR}/build/outputs/apk/debug/${QTANDROID_EXPORTED_TARGET}_build_apk-debug.apk"
+ COMMAND adb install -r
"${EXPORT_DIR}/${QTANDROID_EXPORTED_TARGET}-${CMAKE_ANDROID_ARCH_ABI}.apk"
)
add_dependencies(create-apk ${CREATEAPK_TARGET_NAME})
endfunction()
