Hello community,
here is the log from the commit of package extra-cmake-modules for
openSUSE:Factory checked in at 2018-11-14 14:30:48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/extra-cmake-modules (Old)
and /work/SRC/openSUSE:Factory/.extra-cmake-modules.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "extra-cmake-modules"
Wed Nov 14 14:30:48 2018 rev:59 rq:648488 version:5.52.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/extra-cmake-modules/extra-cmake-modules.changes
2018-10-22 11:08:52.935995196 +0200
+++
/work/SRC/openSUSE:Factory/.extra-cmake-modules.new/extra-cmake-modules.changes
2018-11-14 14:31:54.779412386 +0100
@@ -1,0 +2,13 @@
+Sun Nov 11 19:48:02 UTC 2018 - [email protected]
+
+- Update to 5.52.0
+ * New feature release
+ * For more details please see:
+ * https://www.kde.org/announcements/kde-frameworks-5.52.0.php
+- Changes since 5.51.0:
+ * ECMAddQch: help doxygen by predefining more Q_DECL_* macros
+ * Bindings: Support using sys paths for python install directory
+ * Bindings: Remove INSTALL_DIR_SUFFIX from ecm_generate_python_binding
+ * Add support for the fuzzer sanitizer
+
+-------------------------------------------------------------------
Old:
----
extra-cmake-modules-5.51.0.tar.xz
New:
----
extra-cmake-modules-5.52.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ extra-cmake-modules.spec ++++++
--- /var/tmp/diff_new_pack.ICgsdX/_old 2018-11-14 14:31:55.439411746 +0100
+++ /var/tmp/diff_new_pack.ICgsdX/_new 2018-11-14 14:31:55.443411742 +0100
@@ -16,7 +16,7 @@
#
-%define _tar_path 5.51
+%define _tar_path 5.52
# 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.51.0
+Version: 5.52.0
Release: 0
Summary: CMake modules
License: BSD-3-Clause
++++++ bundle-lang.patch ++++++
--- /var/tmp/diff_new_pack.ICgsdX/_old 2018-11-14 14:31:55.463411722 +0100
+++ /var/tmp/diff_new_pack.ICgsdX/_new 2018-11-14 14:31:55.463411722 +0100
@@ -9,16 +9,16 @@
modules/ECMQmLoader.cpp.in | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
-diff --git a/modules/ECMQmLoader.cpp.in b/modules/ECMQmLoader.cpp.in
-index 003512d..bc6a4ad 100644
---- a/modules/ECMQmLoader.cpp.in
-+++ b/modules/ECMQmLoader.cpp.in
+Index:
extra-cmake-modules-5.50.0git.20181015T134434~72aa6e1/modules/ECMQmLoader.cpp.in
+===================================================================
+---
extra-cmake-modules-5.50.0git.20181015T134434~72aa6e1.orig/modules/ECMQmLoader.cpp.in
++++
extra-cmake-modules-5.50.0git.20181015T134434~72aa6e1/modules/ECMQmLoader.cpp.in
@@ -44,14 +44,18 @@ namespace {
QString subPath = QStringLiteral("locale/") + localeDirName +
QStringLiteral("/LC_MESSAGES/@[email protected]");
-
+
#if defined(Q_OS_ANDROID)
-- const QString fullPath =
QDir::homePath()+QStringLiteral("/../qt-reserved-files/share/") + subPath;
-+ QString fullPath =
QDir::homePath()+QStringLiteral("/../qt-reserved-files/share/") + subPath;
+- const QString fullPath = QDir::homePath() +
QStringLiteral("/../qt-reserved-files/share/") + subPath;
++ QString fullPath = QDir::homePath() +
QStringLiteral("/../qt-reserved-files/share/") + subPath;
if (!QFile::exists(fullPath)) {
return false;
}
@@ -35,5 +35,3 @@
}
#endif
QTranslator *translator = new
QTranslator(QCoreApplication::instance());
---
-2.19.0
++++++ extra-cmake-modules-5.51.0.tar.xz -> extra-cmake-modules-5.52.0.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-5.51.0/CMakeLists.txt
new/extra-cmake-modules-5.52.0/CMakeLists.txt
--- old/extra-cmake-modules-5.51.0/CMakeLists.txt 2018-09-30
22:46:18.000000000 +0200
+++ new/extra-cmake-modules-5.52.0/CMakeLists.txt 2018-10-29
00:08:27.000000000 +0100
@@ -32,7 +32,7 @@
# Preliminary setup
#
-set(VERSION "5.51.0") # handled by release scripts
+set(VERSION "5.52.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.51.0/find-modules/FindPythonModuleGeneration.cmake
new/extra-cmake-modules-5.52.0/find-modules/FindPythonModuleGeneration.cmake
---
old/extra-cmake-modules-5.51.0/find-modules/FindPythonModuleGeneration.cmake
2018-09-30 22:46:18.000000000 +0200
+++
new/extra-cmake-modules-5.52.0/find-modules/FindPythonModuleGeneration.cmake
2018-10-29 00:08:27.000000000 +0100
@@ -36,6 +36,24 @@
#
# import PyKF5.MyTarget
#
+# Inclusion of this module defines the following variables:
+#
+# ``KDE_INSTALL_PYTHON2DIR``, ``KDE_INSTALL_PYTHON3DIR``
+# destination for generated bindings
+# ``KDE_INSTALL_FULL_PYTHON2DIR``, ``KDE_INSTALL_FULL_PYTHON3DIR``
+# corresponding absolute path
+#
+# If ``KDE_INSTALL_USE_PYTHON2_SYS_PATHS`` is set to TRUE before including this
+# module, the default value for ``KDE_INSTALL_PYTHON2DIR`` is instead queried
from
+# pythons distutil.sysconfig.get_python_lib().
+# If not set, it will default to TRUE if pythons ``sysconfig.PREFIX`` is the
same
+# as ``CMAKE_INSTALL_PREFIX``, otherwise it defaults to FALSE.
+# This variable should NOT be set from within CMakeLists.txt files, instead it
+# is intended to be set manually when configuring a project which uses this
+# module (e.g. by packagers).
+#
+# Likewise for ``KDE_INSTALL_USE_PYTHON3_SYS_PATHS`` and
``KDE_INSTALL_PYTHON3DIR``.
+#
#=============================================================================
# Copyright 2016 Stephen Kelly <[email protected]>
@@ -132,6 +150,21 @@
add_library(Python::Libs${version} UNKNOWN IMPORTED)
set_property(TARGET Python::Libs${version} PROPERTY IMPORTED_LOCATION
${GPB_PYTHON${version}_LIBRARY})
set_property(TARGET Python::Libs${version} PROPERTY
INTERFACE_INCLUDE_DIRECTORIES ${GPB_PYTHON${version}_INCLUDE_DIR})
+
+ set(_default_KDE_INSTALL_USE_PYTHON${version}_SYS_PATHS OFF)
+ if(NOT DEFINED KDE_INSTALL_USE_PYTHON${version}_SYS_PATHS)
+ execute_process (
+ COMMAND "${GPB_PYTHON${version}_COMMAND}" -c "import sys; from
distutils import sysconfig;sys.stdout.write(sysconfig.PREFIX)"
+ OUTPUT_VARIABLE gpb_python${version}_prefix
+ )
+ if(gpb_python${version}_prefix STREQUAL "${CMAKE_INSTALL_PREFIX}")
+ message(STATUS "Installing in the same prefix as Python${version},
adopting their path scheme.")
+ set(_default_KDE_INSTALL_USE_PYTHON${version}_SYS_PATHS ON)
+ else()
+ message(STATUS "NOT installing in the same prefix as
Python${version}.")
+ endif()
+ endif()
+
endif()
endmacro()
@@ -176,10 +209,39 @@
_find_python(2 7)
_create_imported_python_target(2)
+option (KDE_INSTALL_USE_PYTHON3_SYS_PATHS "Install Python3 bindings to the
Python3 install dir"
+ "${_default_KDE_INSTALL_USE_PYTHON3_SYS_PATHS}")
+option (KDE_INSTALL_USE_PYTHON2_SYS_PATHS "Install Python2 bindings to the
Python2 install dir"
+ "${_default_KDE_INSTALL_USE_PYTHON2_SYS_PATHS}")
+
if (NOT _pyversions)
_report_NOT_FOUND("At least one python version must be available to use
${CMAKE_FIND_PACKAGE_NAME}.")
endif()
+foreach(pyversion ${_pyversions})
+
+ if(KDE_INSTALL_PYTHON${pyversion}DIR)
+ # Use dir from command line
+
+ elseif(KDE_INSTALL_USE_PYTHON${pyversion}_SYS_PATHS)
+ execute_process (
+ COMMAND "${GPB_PYTHON${pyversion}_COMMAND}" -c "import sys; from
distutils import
sysconfig;sys.stdout.write(sysconfig.get_python_lib(plat_specific=True,standard_lib=False))"
+ OUTPUT_VARIABLE KDE_INSTALL_PYTHON${pyversion}DIR
+ )
+
+ else()
+ set(KDE_INSTALL_PYTHON${pyversion}DIR
lib/python${pyversion${pyversion}_maj_min}/site-packages)
+ endif()
+
+ if(NOT IS_ABSOLUTE ${KDE_INSTALL_PYTHON${pyversion}DIR})
+ set(KDE_INSTALL_FULL_PYTHON${pyversion}DIR
+ "${CMAKE_INSTALL_PREFIX}/${KDE_INSTALL_PYTHON${pyversion}DIR}")
+ else()
+ set(KDE_INSTALL_FULL_PYTHON${pyversion}DIR
"${KDE_INSTALL_PYTHON${pyversion}DIR}")
+ endif()
+
+endforeach()
+
find_program(GBP_SIP_COMMAND sip)
if (NOT GBP_SIP_COMMAND)
@@ -288,7 +350,7 @@
function(ecm_generate_python_binding)
- set(oneValueArgs TARGET PYTHONNAMESPACE MODULENAME RULES_FILE
INSTALL_DIR_SUFFIX)
+ set(oneValueArgs TARGET PYTHONNAMESPACE MODULENAME RULES_FILE)
set(multiValueArgs SIP_DEPENDS SIP_INCLUDES HEADERS)
cmake_parse_arguments(GPB "" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
@@ -325,10 +387,6 @@
set(GPB_RULES_FILE "${GPB_MODULE_DIR}/Qt5Ruleset.py")
endif()
- if (NOT GPB_INSTALL_DIR_SUFFIX)
- set(GPB_INSTALL_DIR_SUFFIX site-packages)
- endif()
-
list(APPEND generator_depends ${GPB_RULES_FILE})
foreach(hdr ${GPB_HEADERS})
@@ -423,6 +481,7 @@
foreach(pyversion ${_pyversions})
message(STATUS "Found dependencies for python${pyversion}, generating
bindings")
+ message(STATUS "Python${pyversion} install dir:
${KDE_INSTALL_FULL_PYTHON${pyversion}DIR}")
execute_process(COMMAND "${CMAKE_COMMAND}"
"-DPYTHON_UMBRELLA_MODULE_FILE=${CMAKE_BINARY_DIR}/py${pyversion}/${GPB_PYTHONNAMESPACE}/__init__.py"
@@ -446,7 +505,7 @@
OUTPUT_NAME "${GPB_MODULENAME}")
if (GPB_SIP_DEPENDS MATCHES PyKF5)
- set(_kf5_python_prefix
${CMAKE_INSTALL_PREFIX}/lib/python${pyversion${pyversion}_maj_min}/${GPB_INSTALL_DIR_SUFFIX})
+ set(_kf5_python_prefix ${KDE_INSTALL_FULL_PYTHON${pyversion}DIR})
else()
set(_kf5_python_prefix ${CMAKE_BINARY_DIR}/py${pyversion})
endif()
@@ -456,7 +515,7 @@
)
install(DIRECTORY
${CMAKE_BINARY_DIR}/py${pyversion}/${GPB_PYTHONNAMESPACE}
- DESTINATION
lib/python${pyversion${pyversion}_maj_min}/${GPB_INSTALL_DIR_SUFFIX})
+ DESTINATION ${KDE_INSTALL_PYTHON${pyversion}DIR})
install(FILES ${sip_files}
"${CMAKE_CURRENT_BINARY_DIR}/sip/${GPB_PYTHONNAMESPACE}/${GPB_MODULENAME}/${GPB_MODULENAME}mod.sip"
DESTINATION share/sip/${GPB_PYTHONNAMESPACE}/${GPB_MODULENAME}
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.51.0/modules/ECMEnableSanitizers.cmake
new/extra-cmake-modules-5.52.0/modules/ECMEnableSanitizers.cmake
--- old/extra-cmake-modules-5.51.0/modules/ECMEnableSanitizers.cmake
2018-09-30 22:46:18.000000000 +0200
+++ new/extra-cmake-modules-5.52.0/modules/ECMEnableSanitizers.cmake
2018-10-29 00:08:27.000000000 +0100
@@ -40,6 +40,7 @@
# - thread
# - leak
# - undefined
+# - fuzzer
#
# The sanitizers "address", "memory" and "thread" are mutually exclusive. You
# cannot enable two of them in the same build.
@@ -140,6 +141,9 @@
elseif (${sanitize_option} MATCHES "undefined")
check_compiler_version("4.9" "3.1")
set(XSAN_COMPILE_FLAGS "-fsanitize=undefined -fno-omit-frame-pointer
-fno-optimize-sibling-calls")
+ elseif (${sanitize_option} MATCHES "fuzzer")
+ check_compiler_version("99.99" "6.0")
+ set(XSAN_COMPILE_FLAGS "-fsanitize=fuzzer")
else ()
message(FATAL_ERROR "Compiler sanitizer option \"${sanitize_option}\"
not supported.")
endif ()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.51.0/modules/ECMQchDoxygen.config.in
new/extra-cmake-modules-5.52.0/modules/ECMQchDoxygen.config.in
--- old/extra-cmake-modules-5.51.0/modules/ECMQchDoxygen.config.in
2018-09-30 22:46:18.000000000 +0200
+++ new/extra-cmake-modules-5.52.0/modules/ECMQchDoxygen.config.in
2018-10-29 00:08:27.000000000 +0100
@@ -226,11 +226,20 @@
\
Q_SLOTS="slots" \
Q_SIGNALS="signals" \
- Q_DECL_CONSTEXPR="constexpr" \
- Q_DECL_FINAL="final" \
- Q_DECL_NULLPTR="nullptr" \
+ Q_DECL_CONSTEXPR="" \
+ Q_DECL_RELAXED_CONSTEXPR="" \
Q_DECL_OVERRIDE="override" \
+ Q_DECL_FINAL="final" \
+ Q_DECL_EQ_DEFAULT="= default" \
+ Q_DECL_EQ_DELETE="= delete" \
+ Q_DECL_NOEXCEPT="" \
+ Q_DECL_DEPRECATED="" \
+ Q_DECL_UNUSED_MEMBER="" \
+ Q_DECL_VARIABLE_DEPRECATED="" \
+ Q_DECL_EXPORT="" \
+ Q_DECL_IMPORT="" \
Q_DECL_HIDDEN="" \
+ Q_DECL_NULLPTR="nullptr" \
Q_REQUIRED_RESULT="" \
Q_SCRIPTABLE="" \
Q_INVOKABLE="" \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.51.0/modules/ECMQmLoader.cpp.in
new/extra-cmake-modules-5.52.0/modules/ECMQmLoader.cpp.in
--- old/extra-cmake-modules-5.51.0/modules/ECMQmLoader.cpp.in 2018-09-30
22:46:18.000000000 +0200
+++ new/extra-cmake-modules-5.52.0/modules/ECMQmLoader.cpp.in 2018-10-29
00:08:27.000000000 +0100
@@ -44,7 +44,7 @@
QString subPath = QStringLiteral("locale/") + localeDirName +
QStringLiteral("/LC_MESSAGES/@[email protected]");
#if defined(Q_OS_ANDROID)
- const QString fullPath =
QDir::homePath()+QStringLiteral("/../qt-reserved-files/share/") + subPath;
+ const QString fullPath = QDir::homePath() +
QStringLiteral("/../qt-reserved-files/share/") + subPath;
if (!QFile::exists(fullPath)) {
return false;
}
