Hello community,
here is the log from the commit of package extra-cmake-modules for
openSUSE:Factory checked in at 2015-10-19 22:21:27
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
2015-09-24 07:09:24.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.extra-cmake-modules.new/extra-cmake-modules.changes
2015-10-19 22:21:28.000000000 +0200
@@ -1,0 +2,14 @@
+Mon Oct 5 17:36:58 UTC 2015 - [email protected]
+
+- Update to 5.15.0
+ * Update GTK icon cache when installing icons.
+ * Remove workaround to delay execution on Android
+ * ECMEnableSanitizers: The undefined sanitizer is supported by gcc 4.9
+ * Disable X11,XCB etc. detection on OS X
+ * Look for the files in the installed prefix rather the prefix path
+ * Use Qt5 to specify what's Qt5 installation prefix
+ * Add definition ANDROID as needed in qsystemdetection.h.
+ * For more details please see:
+ https://www.kde.org/announcements/kde-frameworks-5.15.0.php
+
+-------------------------------------------------------------------
Old:
----
extra-cmake-modules-5.14.0.tar.xz
New:
----
extra-cmake-modules-5.15.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ extra-cmake-modules.spec ++++++
--- /var/tmp/diff_new_pack.K3wGwP/_old 2015-10-19 22:21:28.000000000 +0200
+++ /var/tmp/diff_new_pack.K3wGwP/_new 2015-10-19 22:21:28.000000000 +0200
@@ -16,13 +16,13 @@
#
-%define _tar_path 5.14
+%define _tar_path 5.15
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.14.0
+Version: 5.15.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.14.0.tar.xz -> extra-cmake-modules-5.15.0.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-5.14.0/CMakeLists.txt
new/extra-cmake-modules-5.15.0/CMakeLists.txt
--- old/extra-cmake-modules-5.14.0/CMakeLists.txt 2015-08-25
11:38:37.000000000 +0200
+++ new/extra-cmake-modules-5.15.0/CMakeLists.txt 2015-10-03
11:48:31.000000000 +0200
@@ -3,7 +3,7 @@
project(extra-cmake-modules NONE)
set(ECM_MAJOR_VERSION 5)
-set(ECM_MINOR_VERSION 14)
+set(ECM_MINOR_VERSION 15)
set(ECM_PATCH_VERSION 0)
set(ECM_VERSION ${ECM_MAJOR_VERSION}.${ECM_MINOR_VERSION}.${ECM_PATCH_VERSION})
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.14.0/kde-modules/KDECMakeSettings.cmake
new/extra-cmake-modules-5.15.0/kde-modules/KDECMakeSettings.cmake
--- old/extra-cmake-modules-5.14.0/kde-modules/KDECMakeSettings.cmake
2015-08-25 11:38:37.000000000 +0200
+++ new/extra-cmake-modules-5.15.0/kde-modules/KDECMakeSettings.cmake
2015-10-03 11:48:31.000000000 +0200
@@ -46,9 +46,18 @@
# disabled by setting ``KDE_SKIP_UNINSTALL_TARGET`` to TRUE before including
# this module.
#
+# By default on OS X, X11 and XCB related detections are disabled. However if
+# the need would arise to use these technologies, the detection can be enabled
+# by setting ``APPLE_FORCE_X11`` to ``ON``.
+#
+# A warning is printed for the developer to know that the detection is
disabled on OS X.
+# This message can be turned off by setting ``APPLE_SUPPRESS_X11_WARNING`` to
``ON``.
+#
# Since pre-1.0.0.
#
-# Uninstall target functionality since 1.7.0.
+# - Uninstall target functionality since 1.7.0.
+# - ``APPLE_FORCE_X11`` option since 5.14.0 (detecting X11 was previously the
default behavior)
+# - ``APPLE_SUPPRESS_X11_WARNING`` option since 5.14.0
#=============================================================================
# Copyright 2014 Alex Merry <[email protected]>
@@ -185,6 +194,21 @@
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
endif()
+ # Disable detection of X11 and related package on OS X because when using
+ # brew or macports, X11 can be installed and thus is detected.
+ option(APPLE_FORCE_X11 "Force enable X11 related detection on OS X" OFF)
+ option(APPLE_SUPPRESS_X11_WARNING "Suppress X11 and related technologies
search disabling warning on OS X" OFF)
+
+ if(APPLE AND NOT APPLE_FORCE_X11)
+ if (NOT APPLE_SUPPRESS_X11_WARNING)
+ message(WARNING "Searching for X11 and related technologies is
disabled on Apple systems. Set APPLE_FORCE_X11 to ON to change this behaviour.
Set APPLE_SUPPRESS_X11_WARNING to ON to hide this warning.")
+ endif()
+
+ set(CMAKE_DISABLE_FIND_PACKAGE_X11 true)
+ set(CMAKE_DISABLE_FIND_PACKAGE_XCB true)
+ set(CMAKE_DISABLE_FIND_PACKAGE_Qt5X11Extras true)
+ endif()
+
option(KDE_SKIP_UNINSTALL_TARGET "Prevent an \"uninstall\" target from
being generated." OFF)
if(NOT KDE_SKIP_UNINSTALL_TARGET)
include("${ECM_MODULE_DIR}/ECMUninstallTarget.cmake")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.14.0/kde-modules/KDEFrameworkCompilerSettings.cmake
new/extra-cmake-modules-5.15.0/kde-modules/KDEFrameworkCompilerSettings.cmake
---
old/extra-cmake-modules-5.14.0/kde-modules/KDEFrameworkCompilerSettings.cmake
2015-08-25 11:38:37.000000000 +0200
+++
new/extra-cmake-modules-5.15.0/kde-modules/KDEFrameworkCompilerSettings.cmake
2015-10-03 11:48:31.000000000 +0200
@@ -45,6 +45,11 @@
add_definitions(-DQT_STRICT_ITERATORS)
endif()
-if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}"
STREQUAL "Clang")
+if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic")
+elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+ # -Wgnu-zero-variadic-macro-arguments is triggered by every qCDebug() call
and therefore results
+ # in a lot of noise. This warning is only notifying us that clang is
emulating the GCC behaviour
+ # instead of the exact standard wording so we can safely ignore it
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic
-Wno-gnu-zero-variadic-macro-arguments")
endif()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.14.0/modules/ECMEnableSanitizers.cmake
new/extra-cmake-modules-5.15.0/modules/ECMEnableSanitizers.cmake
--- old/extra-cmake-modules-5.14.0/modules/ECMEnableSanitizers.cmake
2015-08-25 11:38:37.000000000 +0200
+++ new/extra-cmake-modules-5.15.0/modules/ECMEnableSanitizers.cmake
2015-10-03 11:48:31.000000000 +0200
@@ -125,7 +125,7 @@
set(XSAN_COMPILE_FLAGS "-fsanitize=leak")
set(XSAN_LINKER_FLAGS "lsan")
elseif (${sanitize_option} MATCHES "undefined")
- check_compiler_version("99.99" "3.1")
+ check_compiler_version("4.9" "3.1")
set(XSAN_COMPILE_FLAGS "-fsanitize=undefined -fno-omit-frame-pointer
-fno-optimize-sibling-calls")
else ()
message(FATAL_ERROR "Compiler sanitizer option \"${sanitize_option}\"
not supported.")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.14.0/modules/ECMInstallIcons.cmake
new/extra-cmake-modules-5.15.0/modules/ECMInstallIcons.cmake
--- old/extra-cmake-modules-5.14.0/modules/ECMInstallIcons.cmake
2015-08-25 11:38:37.000000000 +0200
+++ new/extra-cmake-modules-5.15.0/modules/ECMInstallIcons.cmake
2015-10-03 11:48:31.000000000 +0200
@@ -186,7 +186,9 @@
# Updates the mtime of the icon theme directory, so caches that
# watch for changes to the directory will know to update.
+# If present, this also runs gtk-update-icon-cache (which despite the name is
also used by Qt).
function(_ecm_update_iconcache installdir theme)
+ find_program(GTK_UPDATE_ICON_CACHE_EXECUTABLE NAMES gtk-update-icon-cache)
# We don't always have touch command (e.g. on Windows), so instead
# create and delete a temporary file in the theme dir.
install(CODE "
@@ -194,6 +196,10 @@
if (NOT DESTDIR_VALUE)
file(WRITE \"${installdir}/${theme}/temp.txt\" \"update\")
file(REMOVE \"${installdir}/${theme}/temp.txt\")
+ set(HAVE_GTK_UPDATE_ICON_CACHE_EXEC
${GTK_UPDATE_ICON_CACHE_EXECUTABLE})
+ if (HAVE_GTK_UPDATE_ICON_CACHE_EXEC)
+ execute_process(COMMAND ${GTK_UPDATE_ICON_CACHE_EXECUTABLE} -q -t
-i . WORKING_DIRECTORY \"${CMAKE_INSTALL_PREFIX}/${installdir}/${theme}\")
+ endif ()
endif (NOT DESTDIR_VALUE)
")
endfunction()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-5.14.0/toolchain/Android.cmake
new/extra-cmake-modules-5.15.0/toolchain/Android.cmake
--- old/extra-cmake-modules-5.14.0/toolchain/Android.cmake 2015-08-25
11:38:37.000000000 +0200
+++ new/extra-cmake-modules-5.15.0/toolchain/Android.cmake 2015-10-03
11:48:31.000000000 +0200
@@ -139,6 +139,9 @@
"${ANDROID_LIBS_ROOT}/libs/${ANDROID_ABI}/include"
)
+# needed for Qt to define Q_OS_ANDROID
+add_definitions(-DANDROID)
+
link_directories(${CMAKE_SYSTEM_LIBRARY_PATH})
set(CMAKE_C_COMPILER "${ANDROID_TOOLCHAIN_ROOT}/${ANDROID_TOOLCHAIN}-gcc")
@@ -169,38 +172,18 @@
message(FATAL_ERROR "Define an apk dir to initialize from using
-DANDROID_APK_DIR=<path>. The specified directory must contain the
AndroidManifest.xml file.")
endif()
- function(EOFHook)
- if(CMAKE_PARENT_LIST_FILE STREQUAL "")
- generate_deployment_file()
- endif()
- endfunction()
-
- function(generate_deployment_file)
- get_property(_DEPENDENCIES TARGET ${QTANDROID_EXPORTED_TARGET}
PROPERTY INTERFACE_LINK_LIBRARIES)
- set(_DEPS_LIST)
- foreach(_DEP IN LISTS _DEPENDENCIES)
- if(NOT _DEP MATCHES "Qt5::.*")
- get_property(_DEP_LOCATION TARGET ${_DEP} PROPERTY
"LOCATION_${CMAKE_BUILD_TYPE}")
- list(APPEND _DEPS_LIST ${_DEP_LOCATION})
- endif()
- endforeach()
- string(REPLACE ";" "," _DEPS "${_DEPS_LIST}")
- configure_file("${_CMAKE_ANDROID_DIR}/deployment-file.json.in"
"${QTANDROID_EXPORTED_TARGET}-deployment.json")
- endfunction()
- #we want to call the function after the project has been set up
- variable_watch(CMAKE_PARENT_LIST_FILE EOFHook)
-
-# Create the target that will eventually generate the apk
- get_filename_component(QTDIR "${Qt5Core_DIR}/../../../" ABSOLUTE)
- find_program(ANDROID_DEPLOY_QT androiddeployqt HINTS "${QTDIR}/bin")
+ find_package(Qt5Core REQUIRED)
+
set(EXPORT_DIR
"${CMAKE_BINARY_DIR}/${QTANDROID_EXPORTED_TARGET}_build_apk/")
set(EXECUTABLE_DESTINATION_PATH
"${EXPORT_DIR}/libs/${ANDROID_ABI}/lib${QTANDROID_EXPORTED_TARGET}.so")
+ configure_file("${_CMAKE_ANDROID_DIR}/deployment-file.json.in"
"${QTANDROID_EXPORTED_TARGET}-deployment.json.in")
add_custom_target(${CREATEAPK_TARGET_NAME}
- COMMAND cmake -E echo "Generating
$<TARGET_NAME:${QTANDROID_EXPORTED_TARGET}> with ${ANDROID_DEPLOY_QT}"
+ COMMAND cmake -E echo "Generating
$<TARGET_NAME:${QTANDROID_EXPORTED_TARGET}> with
$<TARGET_FILE_DIR:Qt5::qmake>/androiddeployqt"
COMMAND cmake -E copy_directory "${ANDROID_APK_DIR}" "${EXPORT_DIR}"
COMMAND cmake -E copy "$<TARGET_FILE:${QTANDROID_EXPORTED_TARGET}>"
"${EXECUTABLE_DESTINATION_PATH}"
- COMMAND ${ANDROID_DEPLOY_QT} --input
"${QTANDROID_EXPORTED_TARGET}-deployment.json" --output "${EXPORT_DIR}"
--deployment bundled "\\$(ARGS)"
+ 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 $<TARGET_FILE_DIR:Qt5::qmake>/androiddeployqt --input
"${QTANDROID_EXPORTED_TARGET}-deployment.json" --output "${EXPORT_DIR}"
--deployment bundled "\\$(ARGS)"
)
else()
message(STATUS "You can export a target by specifying
-DQTANDROID_EXPORTED_TARGET=<targetname>")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.14.0/toolchain/deployment-file.json.in
new/extra-cmake-modules-5.15.0/toolchain/deployment-file.json.in
--- old/extra-cmake-modules-5.14.0/toolchain/deployment-file.json.in
2015-08-25 11:38:37.000000000 +0200
+++ new/extra-cmake-modules-5.15.0/toolchain/deployment-file.json.in
2015-10-03 11:48:31.000000000 +0200
@@ -1,5 +1,5 @@
{
- "qt": "@QTDIR@",
+ "qt": "@_qt5Core_install_prefix@",
"sdk": "@ANDROID_SDK_ROOT@",
"ndk": "@ANDROID_NDK@",
"toolchain-prefix": "@ANDROID_TOOLCHAIN@",
@@ -8,8 +8,8 @@
"ndk-host": "@_HOST@",
"target-architecture": "@ANDROID_ABI@",
"application-binary": "@EXECUTABLE_DESTINATION_PATH@",
- "android-extra-libs": "@_DEPS@",
- "android-extra-plugins":
"@CMAKE_PREFIX_PATH@/share,@CMAKE_PREFIX_PATH@/lib/qml",
+ "android-extra-libs": "##EXTRALIBS##",
+ "android-extra-plugins":
"@CMAKE_INSTALL_PREFIX@/share,@CMAKE_INSTALL_PREFIX@/lib/qml",
"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.14.0/toolchain/specifydependencies.cmake
new/extra-cmake-modules-5.15.0/toolchain/specifydependencies.cmake
--- old/extra-cmake-modules-5.14.0/toolchain/specifydependencies.cmake
1970-01-01 01:00:00.000000000 +0100
+++ new/extra-cmake-modules-5.15.0/toolchain/specifydependencies.cmake
2015-10-03 11:48:31.000000000 +0200
@@ -0,0 +1,22 @@
+file(READ "${TARGET_DIR}/CMakeFiles/${TARGET_NAME}.dir/link.txt" out)
+
+string(FIND "${out}" "-o ${TARGET_NAME}" POS) #we trim the initial arguments,
we want the ones in the end. we find the target
+string(SUBSTRING "${out}" ${POS} -1 out) #we
+string(REGEX MATCHALL " /.+\\.so" outout "${out}")
+string(STRIP "${outout}" outout)
+string(REPLACE " /" ";/" outout "${outout}")
+
+set(extralibs)
+foreach(lib IN LISTS outout) #now we filter Qt5 libraries, because Qt wants to
take care about these itself
+ if(NOT ${lib} MATCHES ".*/libQt5.*")
+ if(extralibs)
+ set(extralibs "${extralibs},${lib}")
+ else()
+ set(extralibs "${lib}")
+ endif()
+ endif()
+endforeach()
+
+file(READ "${INPUT_FILE}" CONTENTS)
+string(REPLACE "##EXTRALIBS##" "${extralibs}" NEWCONTENTS "${CONTENTS}")
+file(WRITE "${OUTPUT_FILE}" ${NEWCONTENTS})
