Hello community,
here is the log from the commit of package extra-cmake-modules for
openSUSE:Leap:15.2 checked in at 2020-06-17 11:34:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.2/extra-cmake-modules (Old)
and /work/SRC/openSUSE:Leap:15.2/.extra-cmake-modules.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "extra-cmake-modules"
Wed Jun 17 11:34:50 2020 rev:54 rq:814412 version:5.71.0
Changes:
--------
---
/work/SRC/openSUSE:Leap:15.2/extra-cmake-modules/extra-cmake-modules.changes
2020-05-12 11:38:42.344539087 +0200
+++
/work/SRC/openSUSE:Leap:15.2/.extra-cmake-modules.new.3606/extra-cmake-modules.changes
2020-06-17 11:36:03.843801506 +0200
@@ -1,0 +2,15 @@
+Sun Jun 7 08:06:14 UTC 2020 - Christophe Giboudeaux <[email protected]>
+
+- Update to 5.71.0
+ * New feature release
+ * For more details please see:
+ * https://kde.org/announcements/kde-frameworks-5.71.0
+- Changes since 5.70.0:
+ * [android] Use newer Qt version in example
+ * ECMGenerateExportHeader: add generation of *_DEPRECATED_VERSION_BELATED()
+ * [android] Allow specifying APK install location
+ * ECMGeneratePriFile: fix for ECM_MKSPECS_INSTALL_DIR being absolute
+ * ECMGeneratePriFile: make the pri files relocatable
+ * Suppress find_package_handle_standard_args package name mismatch warning.
+
+-------------------------------------------------------------------
Old:
----
extra-cmake-modules-5.70.0.tar.xz
extra-cmake-modules-5.70.0.tar.xz.sig
New:
----
extra-cmake-modules-5.71.0.tar.xz
extra-cmake-modules-5.71.0.tar.xz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ extra-cmake-modules.spec ++++++
--- /var/tmp/diff_new_pack.vP3Bs0/_old 2020-06-17 11:36:04.195802571 +0200
+++ /var/tmp/diff_new_pack.vP3Bs0/_new 2020-06-17 11:36:04.199802583 +0200
@@ -16,7 +16,7 @@
#
-%define _tar_path 5.70
+%define _tar_path 5.71
# 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.70.0
+Version: 5.71.0
Release: 0
Summary: CMake modules
License: BSD-3-Clause
++++++ extra-cmake-modules-5.70.0.tar.xz -> extra-cmake-modules-5.71.0.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-5.70.0/.arcconfig
new/extra-cmake-modules-5.71.0/.arcconfig
--- old/extra-cmake-modules-5.70.0/.arcconfig 2020-04-29 01:16:47.000000000
+0200
+++ new/extra-cmake-modules-5.71.0/.arcconfig 1970-01-01 01:00:00.000000000
+0100
@@ -1,3 +0,0 @@
-{
- "phabricator.uri" : "https://phabricator.kde.org/project/view/90/";
-}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-5.70.0/CMakeLists.txt
new/extra-cmake-modules-5.71.0/CMakeLists.txt
--- old/extra-cmake-modules-5.70.0/CMakeLists.txt 2020-04-29
01:16:47.000000000 +0200
+++ new/extra-cmake-modules-5.71.0/CMakeLists.txt 2020-05-19
17:05:50.000000000 +0200
@@ -32,7 +32,7 @@
# Preliminary setup
#
-set(VERSION "5.70.0") # handled by release scripts
+set(VERSION "5.71.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.70.0/modules/ECMFindModuleHelpers.cmake
new/extra-cmake-modules-5.71.0/modules/ECMFindModuleHelpers.cmake
--- old/extra-cmake-modules-5.70.0/modules/ECMFindModuleHelpers.cmake
2020-04-29 01:16:47.000000000 +0200
+++ new/extra-cmake-modules-5.71.0/modules/ECMFindModuleHelpers.cmake
2020-05-19 17:05:50.000000000 +0200
@@ -245,6 +245,7 @@
set(${module_name}_VERSION
${${module_name}_${ecm_fpwc_comp}_VERSION})
endif()
+ set(FPHSA_NAME_MISMATCHED 1)
find_package_handle_standard_args(${module_name}_${ecm_fpwc_comp}
FOUND_VAR
${module_name}_${ecm_fpwc_comp}_FOUND
@@ -255,6 +256,7 @@
VERSION_VAR
${module_name}_${ecm_fpwc_comp}_VERSION
)
+ unset(FPHSA_NAME_MISMATCHED)
mark_as_advanced(
${module_name}_${ecm_fpwc_comp}_LIBRARY
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.70.0/modules/ECMGenerateExportHeader.cmake
new/extra-cmake-modules-5.71.0/modules/ECMGenerateExportHeader.cmake
--- old/extra-cmake-modules-5.70.0/modules/ECMGenerateExportHeader.cmake
2020-04-29 01:16:47.000000000 +0200
+++ new/extra-cmake-modules-5.71.0/modules/ECMGenerateExportHeader.cmake
2020-05-19 17:05:50.000000000 +0200
@@ -51,6 +51,7 @@
# ``DEPRECATION_VERSIONS`` specifies versions in "<major>.<minor>" format in
# which API was declared deprecated. Any version used with the generated
# macro ``<prefix_name><base_name>_DEPRECATED_VERSION(major, minor, text)``
+# or ``<prefix_name><base_name>_DEPRECATED_VERSION_BELATED(major, minor,
textmajor, textminor, text)``
# needs to be listed here, otherwise the macro will fail to work.
#
# ``EXCLUDE_DEPRECATED_BEFORE_AND_AT`` specifies the version for which all API
@@ -94,6 +95,16 @@
# or function (other elements to be supported in future versions), depending
# on the visibility macro flags set (see below)
#
+# ``<prefix_name><uppercase_base_name>_DEPRECATED_VERSION_BELATED(major,
minor, textmajor, textminor, text)``
+# to use to conditionally set a
+# ``<prefix_name><uppercase_base_name>_DEPRECATED`` macro for a class, struct
+# or function (other elements to be supported in future versions), depending
+# on the visibility macro flags set (see below), with ``major`` & ``minor``
+# applied for the logic and ``textmajor`` & ``textminor`` for the warnings
message.
+# Useful for retroactive tagging of API for the compiler without injecting
the
+# API into the compiler warning conditions of already released versions.
+# Since 5.71.
+#
# ``<prefix_name><uppercase_base_name>_ENABLE_DEPRECATED_SINCE(major, minor)``
# evaluates to ``TRUE`` or ``FALSE`` depending on the visibility macro flags
# set (see below). To be used mainly with ``#if``/``#endif`` to mark sections
@@ -684,6 +695,10 @@
"#define ${_macro_base_name}_DEPRECATED_VERSION(major, minor, text)
${_macro_base_name}_DEPRECATED_VERSION_##major(minor, \"Since
\"#major\".\"#minor\". \" text)
"
)
+ string(APPEND _output
+"#define ${_macro_base_name}_DEPRECATED_VERSION_BELATED(major, minor,
textmajor, textminor, text)
${_macro_base_name}_DEPRECATED_VERSION_##major(minor, \"Since
\"#textmajor\".\"#textminor\". \" text)
+"
+ )
endif()
if (ARGS_CUSTOM_CONTENT_FROM_VARIABLE)
string(APPEND _output "${ARGS_CUSTOM_CONTENT_FROM_VARIABLE}\n")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.70.0/modules/ECMGeneratePriFile.cmake
new/extra-cmake-modules-5.71.0/modules/ECMGeneratePriFile.cmake
--- old/extra-cmake-modules-5.70.0/modules/ECMGeneratePriFile.cmake
2020-04-29 01:16:47.000000000 +0200
+++ new/extra-cmake-modules-5.71.0/modules/ECMGeneratePriFile.cmake
2020-05-19 17:05:50.000000000 +0200
@@ -159,18 +159,27 @@
string(REGEX REPLACE "^[0-9]+\\.([0-9]+)\\.[0-9]+.*" "\\1"
PROJECT_VERSION_MINOR "${PROJECT_VERSION_STRING}")
string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1"
PROJECT_VERSION_PATCH "${PROJECT_VERSION_STRING}")
+ # Prepare the right number of "../.." to go from ECM_MKSPECS_INSTALL_DIR to
the install prefix
+ # This allows to make the generated pri files relocatable (no absolute paths)
+ if (IS_ABSOLUTE ${ECM_MKSPECS_INSTALL_DIR})
+ set(BASEPATH ${CMAKE_INSTALL_PREFIX})
+ else()
+ string(REGEX REPLACE "[^/]+" ".." PRI_ROOT_RELATIVE_TO_MKSPECS
${ECM_MKSPECS_INSTALL_DIR})
+ set(BASEPATH "$$PWD/${PRI_ROOT_RELATIVE_TO_MKSPECS}")
+ endif()
+
set(PRI_TARGET_BASENAME ${EGPF_BASE_NAME})
set(PRI_TARGET_LIBNAME ${EGPF_LIB_NAME})
set(PRI_TARGET_QTDEPS ${EGPF_DEPS})
if(IS_ABSOLUTE "${EGPF_INCLUDE_INSTALL_DIR}")
set(PRI_TARGET_INCLUDES "${EGPF_INCLUDE_INSTALL_DIR}")
else()
- set(PRI_TARGET_INCLUDES
"${CMAKE_INSTALL_PREFIX}/${EGPF_INCLUDE_INSTALL_DIR}")
+ set(PRI_TARGET_INCLUDES "${BASEPATH}/${EGPF_INCLUDE_INSTALL_DIR}")
endif()
if(IS_ABSOLUTE "${EGPF_LIB_INSTALL_DIR}")
set(PRI_TARGET_LIBS "${EGPF_LIB_INSTALL_DIR}")
else()
- set(PRI_TARGET_LIBS "${CMAKE_INSTALL_PREFIX}/${EGPF_LIB_INSTALL_DIR}")
+ set(PRI_TARGET_LIBS "${BASEPATH}/${EGPF_LIB_INSTALL_DIR}")
endif()
set(PRI_TARGET_DEFINES "")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-5.70.0/toolchain/Android.cmake
new/extra-cmake-modules-5.71.0/toolchain/Android.cmake
--- old/extra-cmake-modules-5.70.0/toolchain/Android.cmake 2020-04-29
01:16:47.000000000 +0200
+++ new/extra-cmake-modules-5.71.0/toolchain/Android.cmake 2020-05-19
17:05:50.000000000 +0200
@@ -55,13 +55,13 @@
# prefixes of those libraries would be passed as alternative roots as list via
# ``ECM_ADDITIONAL_FIND_ROOT_PATH``. Since 5.30.0.
#
-# For example, for integrating a Qt5 for Android with armv7 target present at
-# ``/opt/android/Qt5/5.7/android_armv7`` and some other libraries installed to
+# For example, for integrating a Qt5 for Android present at
+# ``~/Qt/5.14.2/android/`` and some other libraries installed to
# the prefix ``/opt/android/foo``, you would use::
#
# cmake \
# -DCMAKE_TOOLCHAIN_FILE=/usr/share/ECM/toolchain/Android.cmake \
-#
-DECM_ADDITIONAL_FIND_ROOT_PATH="/opt/android/Qt5/5.7/android_armv7;/opt/android/foo"
+# -DECM_ADDITIONAL_FIND_ROOT_PATH="~/Qt/5.14.2/android/;/opt/android/foo"
#
# If your project uses ``find_package()`` to locate build tools on the host
# system, make sure to pass ``CMAKE_FIND_ROOT_PATH_BOTH`` or
@@ -90,7 +90,8 @@
# make
# make create-apk-myapp
#
-# The APK would then be found in ``myapp_build_apk/bin`` in the build
directory.
+# You can specify the APK output directory by setting
``ANDROID_APK_OUTPUT_DIR``.
+# Otherwise the APK can be found in ``myapp_build_apk/`` in the build
directory.
#
# The create-apk-myapp target will be able to take an ARGS parameter with
further
# arguments for androiddeployqt. For example, one can use::
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.70.0/toolchain/ECMAndroidDeployQt.cmake
new/extra-cmake-modules-5.71.0/toolchain/ECMAndroidDeployQt.cmake
--- old/extra-cmake-modules-5.70.0/toolchain/ECMAndroidDeployQt.cmake
2020-04-29 01:16:47.000000000 +0200
+++ new/extra-cmake-modules-5.71.0/toolchain/ECMAndroidDeployQt.cmake
2020-05-19 17:05:50.000000000 +0200
@@ -66,6 +66,10 @@
add_custom_target(create-apk)
endif()
+ if (NOT DEFINED ANDROID_APK_OUTPUT_DIR)
+ set(ANDROID_APK_OUTPUT_DIR ${EXPORT_DIR})
+ endif()
+
set(CREATEAPK_TARGET_NAME "create-apk-${QTANDROID_EXPORTED_TARGET}")
add_custom_target(${CREATEAPK_TARGET_NAME}
COMMAND cmake -E echo "Generating
$<TARGET_NAME:${QTANDROID_EXPORTED_TARGET}> with
$<TARGET_FILE_DIR:Qt5::qmake>/androiddeployqt"
@@ -74,11 +78,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" --apk
"${EXPORT_DIR}/${QTANDROID_EXPORTED_TARGET}-${CMAKE_ANDROID_ARCH_ABI}.apk"
--output "${EXPORT_DIR}" --deployment bundled ${arguments}
+ COMMAND $<TARGET_FILE_DIR:Qt5::qmake>/androiddeployqt --gradle --input
"${QTANDROID_EXPORTED_TARGET}-deployment.json" --apk
"${ANDROID_APK_OUTPUT_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}/${QTANDROID_EXPORTED_TARGET}-${CMAKE_ANDROID_ARCH_ABI}.apk"
+ COMMAND adb install -r
"${ANDROID_APK_OUTPUT_DIR}/${QTANDROID_EXPORTED_TARGET}-${CMAKE_ANDROID_ARCH_ABI}.apk"
)
add_dependencies(create-apk ${CREATEAPK_TARGET_NAME})
endfunction()
