Hello community,
here is the log from the commit of package extra-cmake-modules for
openSUSE:Factory checked in at 2018-06-22 13:17:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/extra-cmake-modules (Old)
and /work/SRC/openSUSE:Factory/.extra-cmake-modules.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "extra-cmake-modules"
Fri Jun 22 13:17:16 2018 rev:54 rq:616733 version:5.47.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/extra-cmake-modules/extra-cmake-modules.changes
2018-05-18 14:19:55.583935268 +0200
+++
/work/SRC/openSUSE:Factory/.extra-cmake-modules.new/extra-cmake-modules.changes
2018-06-22 13:18:41.579674125 +0200
@@ -1,0 +2,13 @@
+Tue Jun 12 21:26:01 UTC 2018 - [email protected]
+
+- Update to 5.47.0
+ * New feature release
+ * For more details please see:
+ * https://www.kde.org/announcements/kde-frameworks-5.47.0.php
+- Changes since 5.46.0:
+ * Android toolchain: allow to specify extra libs manually
+ * Android: fix typo
+ * Android: Don't define qml-import-paths if it's empty
+ * Fix minor documentation typos
+
+-------------------------------------------------------------------
Old:
----
extra-cmake-modules-5.46.0.tar.xz
New:
----
extra-cmake-modules-5.47.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ extra-cmake-modules.spec ++++++
--- /var/tmp/diff_new_pack.7raGjG/_old 2018-06-22 13:18:42.379644463 +0200
+++ /var/tmp/diff_new_pack.7raGjG/_new 2018-06-22 13:18:42.383644315 +0200
@@ -16,7 +16,7 @@
#
-%define _tar_path 5.46
+%define _tar_path 5.47
# Full KF5 version (e.g. 5.33.0)
%{!?_kf5_version: %global _kf5_version %{version}}
# Last major and minor KF5 version (e.g. 5.33)
@@ -27,7 +27,7 @@
%bcond_with doc
%endif
Name: extra-cmake-modules
-Version: 5.46.0
+Version: 5.47.0
Release: 0
Summary: CMake modules
License: BSD-3-Clause
++++++ extra-cmake-modules-5.46.0.tar.xz -> extra-cmake-modules-5.47.0.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-5.46.0/CMakeLists.txt
new/extra-cmake-modules-5.47.0/CMakeLists.txt
--- old/extra-cmake-modules-5.46.0/CMakeLists.txt 2018-05-04
19:34:33.000000000 +0200
+++ new/extra-cmake-modules-5.47.0/CMakeLists.txt 2018-05-31
10:10:15.000000000 +0200
@@ -32,7 +32,7 @@
# Preliminary setup
#
-set(VERSION "5.46.0") # handled by release scripts
+set(VERSION "5.47.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.46.0/modules/ECMAddQch.cmake
new/extra-cmake-modules-5.47.0/modules/ECMAddQch.cmake
--- old/extra-cmake-modules-5.46.0/modules/ECMAddQch.cmake 2018-05-04
19:34:33.000000000 +0200
+++ new/extra-cmake-modules-5.47.0/modules/ECMAddQch.cmake 2018-05-31
10:10:15.000000000 +0200
@@ -105,7 +105,7 @@
# Needs to be used when NAMESPACE is not used.
#
# LINK_QCHS specifies a list of other QCH targets which should be used for
-# creating references to API documenation of code in external libraries.
+# creating references to API documentation of code in external libraries.
# For each target <qch> in the list these target properties are expected to be
# defined: DOXYGEN_TAGFILE, QHP_NAMESPACE and QHP_VIRTUALFOLDER.
# If any of these is not existing, <qch> will be ignored.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.46.0/modules/ECMSetupVersion.cmake
new/extra-cmake-modules-5.47.0/modules/ECMSetupVersion.cmake
--- old/extra-cmake-modules-5.46.0/modules/ECMSetupVersion.cmake
2018-05-04 19:34:33.000000000 +0200
+++ new/extra-cmake-modules-5.47.0/modules/ECMSetupVersion.cmake
2018-05-31 10:10:15.000000000 +0200
@@ -75,7 +75,7 @@
#
# Since pre-1.0.0.
#
-# COMPATIBLITY option available since 1.6.0.
+# COMPATIBILITY option available since 1.6.0.
#=============================================================================
# Copyright 2014 Alex Merry <[email protected]>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-5.46.0/toolchain/Android.cmake
new/extra-cmake-modules-5.47.0/toolchain/Android.cmake
--- old/extra-cmake-modules-5.46.0/toolchain/Android.cmake 2018-05-04
19:34:33.000000000 +0200
+++ new/extra-cmake-modules-5.47.0/toolchain/Android.cmake 2018-05-31
10:10:15.000000000 +0200
@@ -53,6 +53,8 @@
# directories in the NDK. Default: ``armeabi-v7a``.
# ``ANDROID_SDK_BUILD_TOOLS_REVISION``
# The build tools version to use. Default: ``21.1.1``.
+# ``ANDROID_EXTRA_LIBS``
+# The ";"-separated list of full paths to libs to include in resulting APK.
#
# For integrating other libraries which are not part of the Android toolchain,
# like Qt5, and installed to a separate prefix on the host system, the install
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.46.0/toolchain/ECMAndroidDeployQt.cmake
new/extra-cmake-modules-5.47.0/toolchain/ECMAndroidDeployQt.cmake
--- old/extra-cmake-modules-5.46.0/toolchain/ECMAndroidDeployQt.cmake
2018-05-04 19:34:33.000000000 +0200
+++ new/extra-cmake-modules-5.47.0/toolchain/ECMAndroidDeployQt.cmake
2018-05-31 10:10:15.000000000 +0200
@@ -20,6 +20,9 @@
endif()
endif()
endforeach()
+ if (QML_IMPORT_PATHS)
+ set(DEFINE_QML_IMPORT_PATHS "\"qml-import-paths\":
\"${QML_IMPORT_PATHS}\",")
+ endif()
set(EXTRA_PREFIX_DIRS "")
foreach(prefix ${ECM_ADDITIONAL_FIND_ROOT_PATH})
@@ -54,7 +57,7 @@
COMMAND cmake -E copy_directory "${ANDROID_APK_DIR}" "${EXPORT_DIR}"
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.in"
-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}\"" -P
${_CMAKE_ANDROID_DIR}/specifydependencies.cmake
+ COMMAND LANG=C cmake
-DINPUT_FILE="${QTANDROID_EXPORTED_TARGET}-deployment.json.in"
-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}
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.46.0/toolchain/deployment-file.json.in
new/extra-cmake-modules-5.47.0/toolchain/deployment-file.json.in
--- old/extra-cmake-modules-5.46.0/toolchain/deployment-file.json.in
2018-05-04 19:34:33.000000000 +0200
+++ new/extra-cmake-modules-5.47.0/toolchain/deployment-file.json.in
2018-05-31 10:10:15.000000000 +0200
@@ -9,7 +9,7 @@
"target-architecture": "@ANDROID_ABI@",
"application-binary": "@EXECUTABLE_DESTINATION_PATH@",
"qml-root-path": "@CMAKE_SOURCE_DIR@",
- "qml-import-paths": "@QML_IMPORT_PATHS@",
+ @DEFINE_QML_IMPORT_PATHS@
##EXTRALIBS##
##EXTRAPLUGINS##
"android-package-source-directory": "@ANDROID_APK_DIR@",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.46.0/toolchain/specifydependencies.cmake
new/extra-cmake-modules-5.47.0/toolchain/specifydependencies.cmake
--- old/extra-cmake-modules-5.46.0/toolchain/specifydependencies.cmake
2018-05-04 19:34:33.000000000 +0200
+++ new/extra-cmake-modules-5.47.0/toolchain/specifydependencies.cmake
2018-05-31 10:10:15.000000000 +0200
@@ -21,6 +21,13 @@
endif()
endforeach()
+if (ANDROID_EXTRA_LIBS)
+ foreach (extralib ${ANDROID_EXTRA_LIBS})
+ message(STATUS "manually specified extra library: " ${extralib})
+ list(APPEND extralibs ${extralib})
+ endforeach()
+endif()
+
if(extralibs)
string(REPLACE ";" "," libs "${extralibs}")
set(extralibs "\"android-extra-libs\": \"${libs}\",")
