Hello community,
here is the log from the commit of package extra-cmake-modules for
openSUSE:Factory checked in at 2016-05-19 12:04:47
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/extra-cmake-modules (Old)
and /work/SRC/openSUSE:Factory/.extra-cmake-modules.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "extra-cmake-modules"
Changes:
--------
--- /work/SRC/openSUSE:Factory/extra-cmake-modules/extra-cmake-modules.changes
2016-04-12 19:07:52.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.extra-cmake-modules.new/extra-cmake-modules.changes
2016-05-19 12:04:48.000000000 +0200
@@ -1,0 +2,13 @@
+Sat May 7 18:29:15 UTC 2016 - [email protected]
+
+- Update to 5.22.0 (boo#980066)
+ * Android deployment: support projects without things in share
+ or lib/qml (kde#362578)
+ * Enables KDE_INSTALL_USE_QT_SYS_PATHS if CMAKE_INSTALL_PREFIX
+ Qt5 prefix
+ * ecm_qt_declare_logging_category: improve error message when
+ using without including
+ * For more details please see:
+ https://www.kde.org/announcements/kde-frameworks-5.22.0.php
+
+-------------------------------------------------------------------
Old:
----
extra-cmake-modules-5.21.0.tar.xz
New:
----
extra-cmake-modules-5.22.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ extra-cmake-modules.spec ++++++
--- /var/tmp/diff_new_pack.Ad1eD1/_old 2016-05-19 12:04:49.000000000 +0200
+++ /var/tmp/diff_new_pack.Ad1eD1/_new 2016-05-19 12:04:49.000000000 +0200
@@ -16,13 +16,13 @@
#
-%define _tar_path 5.21
+%define _tar_path 5.22
Name: extra-cmake-modules
Summary: CMake modules
License: BSD-3-Clause
Group: Development/Tools/Other
Url:
https://projects.kde.org/projects/kdesupport/extra-cmake-modules
-Version: 5.21.0
+Version: 5.22.0
Release: 0
Source:
http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ extra-cmake-modules-5.21.0.tar.xz -> extra-cmake-modules-5.22.0.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-5.21.0/CMakeLists.txt
new/extra-cmake-modules-5.22.0/CMakeLists.txt
--- old/extra-cmake-modules-5.21.0/CMakeLists.txt 2016-03-29
20:13:23.000000000 +0200
+++ new/extra-cmake-modules-5.22.0/CMakeLists.txt 2016-05-03
17:00:24.000000000 +0200
@@ -16,7 +16,7 @@
# Preliminary setup
#
-set(VERSION "5.21.0") # handled by release scripts
+set(VERSION "5.22.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.21.0/kde-modules/KDEInstallDirs.cmake
new/extra-cmake-modules-5.22.0/kde-modules/KDEInstallDirs.cmake
--- old/extra-cmake-modules-5.21.0/kde-modules/KDEInstallDirs.cmake
2016-03-29 20:13:23.000000000 +0200
+++ new/extra-cmake-modules-5.22.0/kde-modules/KDEInstallDirs.cmake
2016-05-03 17:00:24.000000000 +0200
@@ -424,11 +424,20 @@
"CMake packages, including config files"
CMAKECONFIG_INSTALL_PREFIX)
-option (KDE_INSTALL_USE_QT_SYS_PATHS "Install mkspecs files, Plugins and
Imports to the Qt 5 install dir")
-if(KDE_INSTALL_USE_QT_SYS_PATHS)
-# Qt-specific vars
- include("${ECM_MODULE_DIR}/ECMQueryQmake.cmake")
+include("${ECM_MODULE_DIR}/ECMQueryQmake.cmake")
+
+set(_default_KDE_INSTALL_USE_QT_SYS_PATHS OFF)
+if(NOT DEFINED KDE_INSTALL_USE_QT_SYS_PATHS)
+ query_qmake(qt_install_prefix_dir QT_INSTALL_PREFIX)
+ if(qt_install_prefix_dir STREQUAL "${CMAKE_INSTALL_PREFIX}")
+ message(STATUS "Installing in the same prefix as Qt, adopting their
path scheme.")
+ set(_default_KDE_INSTALL_USE_QT_SYS_PATHS ON)
+ endif()
+endif()
+option (KDE_INSTALL_USE_QT_SYS_PATHS "Install mkspecs files, Plugins and
Imports to the Qt 5 install dir" "${_default_KDE_INSTALL_USE_QT_SYS_PATHS}")
+if(KDE_INSTALL_USE_QT_SYS_PATHS)
+ # Qt-specific vars
query_qmake(qt_plugins_dir QT_INSTALL_PLUGINS)
_define_absolute(QTPLUGINDIR ${qt_plugins_dir}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.21.0/modules/ECMQtDeclareLoggingCategory.cmake
new/extra-cmake-modules-5.22.0/modules/ECMQtDeclareLoggingCategory.cmake
--- old/extra-cmake-modules-5.21.0/modules/ECMQtDeclareLoggingCategory.cmake
2016-03-29 20:13:23.000000000 +0200
+++ new/extra-cmake-modules-5.22.0/modules/ECMQtDeclareLoggingCategory.cmake
2016-05-03 17:00:24.000000000 +0200
@@ -108,6 +108,10 @@
string(REPLACE "::" "_" GUARD_NAME "${ARG_IDENTIFIER}_H")
string(TOUPPER "${GUARD_NAME}" GUARD_NAME)
+ if (NOT _ECM_QT_DECLARE_LOGGING_CATEGORY_TEMPLATE_CPP)
+ message(FATAL_ERROR "You must include(ECMQtDeclareLoggingCategory)
before using ecm_qt_declare_logging_category")
+ endif()
+
configure_file("${_ECM_QT_DECLARE_LOGGING_CATEGORY_TEMPLATE_CPP}"
"${cpp_filename}")
configure_file("${_ECM_QT_DECLARE_LOGGING_CATEGORY_TEMPLATE_H}"
"${ARG_HEADER}")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-5.21.0/toolchain/Android.cmake
new/extra-cmake-modules-5.22.0/toolchain/Android.cmake
--- old/extra-cmake-modules-5.21.0/toolchain/Android.cmake 2016-03-29
20:13:23.000000000 +0200
+++ new/extra-cmake-modules-5.22.0/toolchain/Android.cmake 2016-05-03
17:00:24.000000000 +0200
@@ -183,7 +183,7 @@
COMMAND cmake -E remove_directory "${EXPORT_DIR}"
COMMAND cmake -E copy_directory "${ANDROID_APK_DIR}" "${EXPORT_DIR}"
COMMAND cmake -E copy "$<TARGET_FILE:${QTANDROID_EXPORTED_TARGET}>"
"${EXECUTABLE_DESTINATION_PATH}"
- COMMAND cmake
-DINPUT_FILE="${QTANDROID_EXPORTED_TARGET}-deployment.json.in"
-DOUTPUT_FILE="${QTANDROID_EXPORTED_TARGET}-deployment.json"
"-DTARGET_DIR=$<TARGET_FILE_DIR:${QTANDROID_EXPORTED_TARGET}>"
"-DTARGET_NAME=${QTANDROID_EXPORTED_TARGET}" -P
${_CMAKE_ANDROID_DIR}/specifydependencies.cmake
+ COMMAND cmake
-DINPUT_FILE="${QTANDROID_EXPORTED_TARGET}-deployment.json.in"
-DOUTPUT_FILE="${QTANDROID_EXPORTED_TARGET}-deployment.json"
"-DTARGET_DIR=$<TARGET_FILE_DIR:${QTANDROID_EXPORTED_TARGET}>"
"-DTARGET_NAME=${QTANDROID_EXPORTED_TARGET}"
"-DEXPORT_DIR=${CMAKE_INSTALL_PREFIX}" -P
${_CMAKE_ANDROID_DIR}/specifydependencies.cmake
COMMAND $<TARGET_FILE_DIR:Qt5::qmake>/androiddeployqt --input
"${QTANDROID_EXPORTED_TARGET}-deployment.json" --output "${EXPORT_DIR}"
--deployment bundled "\\$(ARGS)"
)
else()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.21.0/toolchain/deployment-file.json.in
new/extra-cmake-modules-5.22.0/toolchain/deployment-file.json.in
--- old/extra-cmake-modules-5.21.0/toolchain/deployment-file.json.in
2016-03-29 20:13:23.000000000 +0200
+++ new/extra-cmake-modules-5.22.0/toolchain/deployment-file.json.in
2016-05-03 17:00:24.000000000 +0200
@@ -8,8 +8,8 @@
"ndk-host": "@_HOST@",
"target-architecture": "@ANDROID_ABI@",
"application-binary": "@EXECUTABLE_DESTINATION_PATH@",
- "android-extra-libs": "##EXTRALIBS##",
- "android-extra-plugins":
"@CMAKE_INSTALL_PREFIX@/share,@CMAKE_INSTALL_PREFIX@/lib/qml",
+ ##EXTRALIBS##
+ ##EXTRAPLUGINS##
"android-package-source-directory": "@ANDROID_APK_DIR@",
"sdkBuildToolsRevision": "@ANDROID_SDK_BUILD_TOOLS_REVISION@"
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.21.0/toolchain/specifydependencies.cmake
new/extra-cmake-modules-5.22.0/toolchain/specifydependencies.cmake
--- old/extra-cmake-modules-5.21.0/toolchain/specifydependencies.cmake
2016-03-29 20:13:23.000000000 +0200
+++ new/extra-cmake-modules-5.22.0/toolchain/specifydependencies.cmake
2016-05-03 17:00:24.000000000 +0200
@@ -16,7 +16,26 @@
endif()
endif()
endforeach()
+if(extralibs)
+ set(extralibs "\"android-extra-libs\": \"${extralibs}\",")
+endif()
+
+set(extraplugins)
+foreach(folder "share" "lib/qml") #now we check for folders with extra stuff
+ set(plugin "${EXPORT_DIR}/${folder}")
+ if(EXISTS "${plugin}")
+ if(extraplugins)
+ set(extraplugins "${extraplugins},${plugin}")
+ else()
+ set(extraplugins "${plugin}")
+ endif()
+ endif()
+endforeach()
+if(extraplugins)
+ set(extraplugins "\"android-extra-plugins\": \"${extraplugins}\",")
+endif()
file(READ "${INPUT_FILE}" CONTENTS)
string(REPLACE "##EXTRALIBS##" "${extralibs}" NEWCONTENTS "${CONTENTS}")
+string(REPLACE "##EXTRAPLUGINS##" "${extraplugins}" NEWCONTENTS
"${NEWCONTENTS}")
file(WRITE "${OUTPUT_FILE}" ${NEWCONTENTS})
