Hello community,
here is the log from the commit of package extra-cmake-modules for
openSUSE:Factory checked in at 2019-03-21 09:42:59
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/extra-cmake-modules (Old)
and /work/SRC/openSUSE:Factory/.extra-cmake-modules.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "extra-cmake-modules"
Thu Mar 21 09:42:59 2019 rev:63 rq:686713 version:5.56.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/extra-cmake-modules/extra-cmake-modules.changes
2019-02-14 14:22:56.711942991 +0100
+++
/work/SRC/openSUSE:Factory/.extra-cmake-modules.new.28833/extra-cmake-modules.changes
2019-03-21 09:44:13.698926182 +0100
@@ -1,0 +2,19 @@
+Sun Mar 10 20:15:35 UTC 2019 - [email protected]
+
+- Update to 5.56.0
+ * New feature release
+ * For more details please see:
+ * https://www.kde.org/announcements/kde-frameworks-5.56.0.php
+- Changes since 5.55.0:
+ * Android: Reflect on using clang now
+ * Fix releaseme checkout when this is included in a sub-directory
+ * Fix a typo in the compatibility vars.
+ * Fix FindEGL
+ * new find module for Canberra
+ * Update Android toolchain files to reality
+ * Add compile check to FindEGL
+ * ECMGeneratePkgConfigFile API dox: fix "Since" for DESCRIPTION arg
+ * Fix destroying QThread while still running -> warning -> crash
+ * Fix ENABLE_CLAZY option with clazy >= 1.5
+
+-------------------------------------------------------------------
Old:
----
extra-cmake-modules-5.55.0.tar.xz
New:
----
extra-cmake-modules-5.56.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ extra-cmake-modules.spec ++++++
--- /var/tmp/diff_new_pack.sdTzpa/_old 2019-03-21 09:44:14.062926098 +0100
+++ /var/tmp/diff_new_pack.sdTzpa/_new 2019-03-21 09:44:14.066926098 +0100
@@ -16,7 +16,7 @@
#
-%define _tar_path 5.55
+%define _tar_path 5.56
# 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.55.0
+Version: 5.56.0
Release: 0
Summary: CMake modules
License: BSD-3-Clause
++++++ extra-cmake-modules-5.55.0.tar.xz -> extra-cmake-modules-5.56.0.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-5.55.0/CMakeLists.txt
new/extra-cmake-modules-5.56.0/CMakeLists.txt
--- old/extra-cmake-modules-5.55.0/CMakeLists.txt 2019-02-02
14:13:24.000000000 +0100
+++ new/extra-cmake-modules-5.56.0/CMakeLists.txt 2019-02-26
23:04:32.000000000 +0100
@@ -32,7 +32,7 @@
# Preliminary setup
#
-set(VERSION "5.55.0") # handled by release scripts
+set(VERSION "5.56.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.55.0/docs/find-module/FindCanberra.rst
new/extra-cmake-modules-5.56.0/docs/find-module/FindCanberra.rst
--- old/extra-cmake-modules-5.55.0/docs/find-module/FindCanberra.rst
1970-01-01 01:00:00.000000000 +0100
+++ new/extra-cmake-modules-5.56.0/docs/find-module/FindCanberra.rst
2019-02-26 23:04:32.000000000 +0100
@@ -0,0 +1 @@
+.. ecm-module:: ../../find-modules/FindCanberra.cmake
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.55.0/find-modules/FindCanberra.cmake
new/extra-cmake-modules-5.56.0/find-modules/FindCanberra.cmake
--- old/extra-cmake-modules-5.55.0/find-modules/FindCanberra.cmake
1970-01-01 01:00:00.000000000 +0100
+++ new/extra-cmake-modules-5.56.0/find-modules/FindCanberra.cmake
2019-02-26 23:04:32.000000000 +0100
@@ -0,0 +1,108 @@
+#.rst:
+# FindCanberra
+# -------
+#
+# Try to find Canberra event sound library.
+#
+# This will define the following variables:
+#
+# ``Canberra_FOUND``
+# True if (the requested version of) Canberra is available
+# ``Canberra_VERSION``
+# The version of Canberra
+# ``Canberra_LIBRARIES``
+# The libraries of Canberra for use with target_link_libraries()
+# ``Canberra_INCLUDE_DIRS``
+# The include dirs of Canberra for use with target_include_directories()
+#
+# If ``Canberra_FOUND`` is TRUE, it will also define the following imported
+# target:
+#
+# ``Canberra::Canberra``
+# The Canberra library
+#
+# In general we recommend using the imported target, as it is easier to use.
+# Bear in mind, however, that if the target is in the link interface of an
+# exported library, it must be made available by the package config file.
+#
+# Since 5.56.0.
+
+#=============================================================================
+# Copyright (c) 2012 Raphael Kubo da Costa <[email protected]>
+# Copyright (c) 2019 Harald Sitter <[email protected]>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# 3. The name of the author may not be used to endorse or promote products
+# derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#=============================================================================
+
+find_package(PkgConfig QUIET)
+pkg_check_modules(PC_Canberra libcanberra QUIET)
+
+find_library(Canberra_LIBRARIES
+ NAMES canberra
+ HINTS ${PC_Canberra_LIBRARY_DIRS}
+)
+
+find_path(Canberra_INCLUDE_DIRS
+ NAMES canberra.h
+ HINTS ${PC_Canberra_INCLUDE_DIRS}
+)
+
+set(Canberra_VERSION ${PC_Canberra_VERSION})
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(Canberra
+ FOUND_VAR
+ Canberra_FOUND
+ REQUIRED_VARS
+ Canberra_LIBRARIES
+ Canberra_INCLUDE_DIRS
+ VERSION_VAR
+ Canberra_VERSION
+)
+
+if(Canberra_FOUND AND NOT TARGET Canberra::Canberra)
+ add_library(Canberra::Canberra UNKNOWN IMPORTED)
+ set_target_properties(Canberra::Canberra PROPERTIES
+ IMPORTED_LOCATION "${Canberra_LIBRARIES}"
+ INTERFACE_COMPILE_OPTIONS "${PC_Canberra_CFLAGS}"
+ INTERFACE_INCLUDE_DIRECTORIES "${Canberra_INCLUDE_DIRS}"
+ )
+endif()
+
+mark_as_advanced(Canberra_LIBRARIES Canberra_INCLUDE_DIRS Canberra_VERSION)
+
+include(FeatureSummary)
+set_package_properties(Canberra PROPERTIES
+ DESCRIPTION "Event sound library"
+ URL "http://0pointer.de/lennart/projects/libcanberra";
+)
+
+# Compatibility variables. In a previous life FindCanberra lived
+# in a number of different repos: don't break them if they use ECM but have not
+# been updated for this finder.
+set(CANBERRA_FOUND ${Canberra_FOUND})
+set(CANBERRA_VERSION ${Canberra_VERSION})
+set(CANBERRA_LIBRARIES ${Canberra_LIBRARIES})
+set(CANBERRA_INCLUDE_DIRS ${Canberra_INCLUDE_DIRS})
+mark_as_advanced(CANBERRA_VERSION CANBERRA_LIBRARIES CANBERRA_INCLUDE_DIRS)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.55.0/find-modules/FindEGL.cmake
new/extra-cmake-modules-5.56.0/find-modules/FindEGL.cmake
--- old/extra-cmake-modules-5.55.0/find-modules/FindEGL.cmake 2019-02-02
14:13:24.000000000 +0100
+++ new/extra-cmake-modules-5.56.0/find-modules/FindEGL.cmake 2019-02-26
23:04:32.000000000 +0100
@@ -61,6 +61,8 @@
#=============================================================================
include(${CMAKE_CURRENT_LIST_DIR}/ECMFindModuleHelpersStub.cmake)
+include(CheckCXXSourceCompiles)
+include(CMakePushCheckState)
ecm_find_package_version_check(EGL)
@@ -73,11 +75,9 @@
find_path(EGL_INCLUDE_DIR
NAMES
- egl.h
+ EGL/egl.h
HINTS
${PKG_EGL_INCLUDE_DIRS}
- PATH_SUFFIXES
- EGL
)
find_library(EGL_LIBRARY
NAMES
@@ -93,7 +93,7 @@
# version; so the header for EGL 1.1 will define EGL_VERSION_1_0 and
# EGL_VERSION_1_1. Finding the highest supported version involves
# finding all these defines and selecting the highest numbered.
- file(READ "${EGL_INCLUDE_DIR}/egl.h" _EGL_header_contents)
+ file(READ "${EGL_INCLUDE_DIR}/EGL/egl.h" _EGL_header_contents)
string(REGEX MATCHALL
"[ \t]EGL_VERSION_[0-9_]+"
_EGL_version_lines
@@ -115,6 +115,20 @@
unset(_EGL_version_lines)
endif()
+cmake_push_check_state(RESET)
+list(APPEND CMAKE_REQUIRED_LIBRARIES "${EGL_LIBRARY}")
+list(APPEND CMAKE_REQUIRED_INCLUDES "${EGL_INCLUDE_DIR}")
+
+check_cxx_source_compiles("
+#include <EGL/egl.h>
+
+int main(int argc, char *argv[]) {
+ EGLint x = 0; EGLDisplay dpy = 0; EGLContext ctx = 0;
+ eglDestroyContext(dpy, ctx);
+}" HAVE_EGL)
+
+cmake_pop_check_state()
+
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(EGL
FOUND_VAR
@@ -122,6 +136,7 @@
REQUIRED_VARS
EGL_LIBRARY
EGL_INCLUDE_DIR
+ HAVE_EGL
VERSION_VAR
EGL_VERSION
)
@@ -135,7 +150,7 @@
)
endif()
-mark_as_advanced(EGL_LIBRARY EGL_INCLUDE_DIR)
+mark_as_advanced(EGL_LIBRARY EGL_INCLUDE_DIR HAVE_EGL)
# compatibility variables
set(EGL_LIBRARIES ${EGL_LIBRARY})
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.55.0/kde-modules/KDECMakeSettings.cmake
new/extra-cmake-modules-5.56.0/kde-modules/KDECMakeSettings.cmake
--- old/extra-cmake-modules-5.55.0/kde-modules/KDECMakeSettings.cmake
2019-02-02 14:13:24.000000000 +0100
+++ new/extra-cmake-modules-5.56.0/kde-modules/KDECMakeSettings.cmake
2019-02-26 23:04:32.000000000 +0100
@@ -293,7 +293,12 @@
option(ENABLE_CLAZY "Enable Clazy warnings" OFF)
if(ENABLE_CLAZY)
- set(CMAKE_CXX_COMPILE_OBJECT "${CMAKE_CXX_COMPILE_OBJECT} -Xclang
-load -Xclang ClangLazy${CMAKE_SHARED_LIBRARY_SUFFIX} -Xclang -add-plugin
-Xclang clang-lazy")
+ find_library(CLAZY_v1_5_FOUND
ClazyPlugin${CMAKE_SHARED_LIBRARY_SUFFIX})
+ if(CLAZY_v1_5_FOUND) # clazy >= 1.5
+ set(CMAKE_CXX_COMPILE_OBJECT "${CMAKE_CXX_COMPILE_OBJECT} -Xclang
-load -Xclang ClazyPlugin${CMAKE_SHARED_LIBRARY_SUFFIX} -Xclang -add-plugin
-Xclang clazy")
+ else() # clazy < 1.5
+ set(CMAKE_CXX_COMPILE_OBJECT "${CMAKE_CXX_COMPILE_OBJECT} -Xclang
-load -Xclang ClangLazy${CMAKE_SHARED_LIBRARY_SUFFIX} -Xclang -add-plugin
-Xclang clang-lazy")
+ endif()
endif()
endif()
@@ -337,6 +342,7 @@
add_custom_command(
OUTPUT "${CMAKE_BINARY_DIR}/releaseme"
${releaseme_clone_commands}
+ WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
COMMENT "Fetching releaseme scripts to download translations..."
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.55.0/modules/ECMGeneratePkgConfigFile.cmake
new/extra-cmake-modules-5.56.0/modules/ECMGeneratePkgConfigFile.cmake
--- old/extra-cmake-modules-5.55.0/modules/ECMGeneratePkgConfigFile.cmake
2019-02-02 14:13:24.000000000 +0100
+++ new/extra-cmake-modules-5.56.0/modules/ECMGeneratePkgConfigFile.cmake
2019-02-26 23:04:32.000000000 +0100
@@ -16,7 +16,7 @@
# [INCLUDE_INSTALL_DIR <dir>]
# [LIB_INSTALL_DIR <dir>]
# [DEFINES -D<variable=value>...]
-# [DESCRIPTION <library description>]
+# [DESCRIPTION <library description>] # since 5.41.0
# [INSTALL])
#
# ``BASE_NAME`` is the name of the module. It's the name projects will use to
@@ -45,7 +45,7 @@
#
# ``DESCRIPTION`` describes what this library is. If it's not specified, CMake
# will first try to get the description from the metainfo.yaml file or will
-# create one based on ``LIB_NAME``.
+# create one based on ``LIB_NAME``. Since 5.41.0.
#
# ``INSTALL`` will cause the module to be installed to the ``pkgconfig``
# subdirectory of ``LIB_INSTALL_DIR``, unless the ``ECM_PKGCONFIG_INSTALL_DIR``
@@ -71,7 +71,6 @@
# )
#
# Since 1.3.0.
-# ``DESCRIPTION`` available since 5.1.41
#
#=============================================================================
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.55.0/tests/ECMPoQmToolsTest/tr_thread_test.cpp
new/extra-cmake-modules-5.56.0/tests/ECMPoQmToolsTest/tr_thread_test.cpp
--- old/extra-cmake-modules-5.55.0/tests/ECMPoQmToolsTest/tr_thread_test.cpp
2019-02-02 14:13:24.000000000 +0100
+++ new/extra-cmake-modules-5.56.0/tests/ECMPoQmToolsTest/tr_thread_test.cpp
2019-02-26 23:04:32.000000000 +0100
@@ -90,6 +90,8 @@
app.exec();
+ thread.wait();
+
return 0;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-5.55.0/toolchain/Android.cmake
new/extra-cmake-modules-5.56.0/toolchain/Android.cmake
--- old/extra-cmake-modules-5.55.0/toolchain/Android.cmake 2019-02-02
14:13:24.000000000 +0100
+++ new/extra-cmake-modules-5.56.0/toolchain/Android.cmake 2019-02-26
23:04:32.000000000 +0100
@@ -145,9 +145,9 @@
set_deprecated_variable(CMAKE_ANDROID_NDK ANDROID_NDK "$ENV{ANDROID_NDK}")
set_deprecated_variable(CMAKE_ANDROID_ARCH ANDROID_ARCHITECTURE "arm")
-set_deprecated_variable(CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION
ANDROID_GCC_VERSION "4.9")
+set_deprecated_variable(CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION
ANDROID_GCC_VERSION "clang")
set_deprecated_variable(CMAKE_ANDROID_ARCH_ABI ANDROID_ABI "armeabi-v7a")
-set_deprecated_variable(CMAKE_ANDROID_API ANDROID_API_LEVEL "14")
+set_deprecated_variable(CMAKE_ANDROID_API ANDROID_API_LEVEL "21")
set(ANDROID_SDK_ROOT "$ENV{ANDROID_SDK_ROOT}" CACHE path "Android SDK path")
@@ -158,10 +158,10 @@
set(CMAKE_SYSTEM_VERSION ${CMAKE_ANDROID_API})
set(CMAKE_SYSTEM_NAME Android)
if (NOT CMAKE_ANDROID_STL_TYPE)
- set(CMAKE_ANDROID_STL_TYPE gnustl_shared)
+ set(CMAKE_ANDROID_STL_TYPE c++_shared)
endif()
-include(${CMAKE_ROOT}/Modules/Platform/Android-GNU.cmake REQUIRED)
+include(${CMAKE_ROOT}/Modules/Platform/Android-Clang.cmake REQUIRED)
include(${CMAKE_ROOT}/Modules/Platform/Android-Initialize.cmake REQUIRED)
if (NOT DEFINED ECM_ADDITIONAL_FIND_ROOT_PATH)
