Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package extra-cmake-modules for
openSUSE:Factory checked in at 2021-11-15 15:24:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/extra-cmake-modules (Old)
and /work/SRC/openSUSE:Factory/.extra-cmake-modules.new.1890 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "extra-cmake-modules"
Mon Nov 15 15:24:46 2021 rev:95 rq:931056 version:5.88.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/extra-cmake-modules/extra-cmake-modules.changes
2021-10-18 21:59:47.669989502 +0200
+++
/work/SRC/openSUSE:Factory/.extra-cmake-modules.new.1890/extra-cmake-modules.changes
2021-11-15 15:25:51.785814470 +0100
@@ -1,0 +2,21 @@
+Sun Nov 7 09:13:06 UTC 2021 - Christophe Giboudeaux <[email protected]>
+
+- Strip 'Source' URL for faster submissions
+
+-------------------------------------------------------------------
+Sun Nov 7 09:07:46 UTC 2021 - Christophe Giboudeaux <[email protected]>
+
+- Update to 5.88.0
+ * New feature release
+ * For more details please see:
+ * https://kde.org/announcements/frameworks/5/5.88.0
+- Changes since 5.87.0:
+ * Fix Wayland_DATADIR when cross-compiling
+ * [android] Extend NDK workaround to version 22
+ * msvc: Fix __cplusplus value
+ * Fix ECM on systems without PyQt5 on Python 2
+ * ECMFindQMLModule: Use QT_HOST_BINS to find qmlplugindump
+ * FindQtWaylandScanner: Use QT_HOST_BINS to find qtwaylandscanner
+ * ecm_add_test: add -DQT_FORCE_ASSERTS to compile flags by default
+
+-------------------------------------------------------------------
Old:
----
extra-cmake-modules-5.87.0.tar.xz
extra-cmake-modules-5.87.0.tar.xz.sig
New:
----
extra-cmake-modules-5.88.0.tar.xz
extra-cmake-modules-5.88.0.tar.xz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ extra-cmake-modules.spec ++++++
--- /var/tmp/diff_new_pack.bBamwx/_old 2021-11-15 15:25:52.217814591 +0100
+++ /var/tmp/diff_new_pack.bBamwx/_new 2021-11-15 15:25:52.221814592 +0100
@@ -16,7 +16,7 @@
#
-%define _tar_path 5.87
+%define _tar_path 5.88
# Full KF5 version (e.g. 5.33.0)
%{!?_kf5_version: %global _kf5_version %{version}}
# Last major and minor KF5 version (e.g. 5.33)
@@ -25,15 +25,15 @@
# Only needed for the package signature condition
%bcond_without lang
Name: extra-cmake-modules
-Version: 5.87.0
+Version: 5.88.0
Release: 0
Summary: CMake modules
License: BSD-3-Clause
Group: Development/Tools/Other
URL: https://www.kde.org
-Source:
https://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz
+Source: %{name}-%{version}.tar.xz
%if %{with lang}
-Source1:
https://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz.sig
+Source1: %{name}-%{version}.tar.xz.sig
Source2: frameworks.keyring
%endif
# PATCH-FIX-OPENSUSE
++++++ extra-cmake-modules-5.87.0.tar.xz -> extra-cmake-modules-5.88.0.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-5.87.0/CMakeLists.txt
new/extra-cmake-modules-5.88.0/CMakeLists.txt
--- old/extra-cmake-modules-5.87.0/CMakeLists.txt 2021-09-29
10:37:10.000000000 +0200
+++ new/extra-cmake-modules-5.88.0/CMakeLists.txt 2021-10-25
10:12:47.000000000 +0200
@@ -11,7 +11,7 @@
# Preliminary setup
#
-set(VERSION "5.87.0") # handled by release scripts
+set(VERSION "5.88.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.87.0/find-modules/FindPythonModuleGeneration.cmake
new/extra-cmake-modules-5.88.0/find-modules/FindPythonModuleGeneration.cmake
---
old/extra-cmake-modules-5.87.0/find-modules/FindPythonModuleGeneration.cmake
2021-09-29 10:37:10.000000000 +0200
+++
new/extra-cmake-modules-5.88.0/find-modules/FindPythonModuleGeneration.cmake
2021-10-25 10:12:47.000000000 +0200
@@ -260,7 +260,7 @@
message(STATUS "Found ${libclang_LIBRARY}")
endif()
-foreach (pyversion "2" "3")
+foreach (pyversion "3" "2")
set(GPB_PYTHON_COMMAND ${GPB_PYTHON${pyversion}_COMMAND})
if (NOT GPB_PYTHON_COMMAND)
continue()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.87.0/find-modules/FindQtWaylandScanner.cmake
new/extra-cmake-modules-5.88.0/find-modules/FindQtWaylandScanner.cmake
--- old/extra-cmake-modules-5.87.0/find-modules/FindQtWaylandScanner.cmake
2021-09-29 10:37:10.000000000 +0200
+++ new/extra-cmake-modules-5.88.0/find-modules/FindQtWaylandScanner.cmake
2021-10-25 10:12:47.000000000 +0200
@@ -68,7 +68,7 @@
ecm_find_package_version_check(QtWaylandScanner)
-query_qmake(qt_binaries_dir QT_INSTALL_BINS)
+query_qmake(qt_binaries_dir QT_HOST_BINS)
# Find qtwaylandscanner
find_program(QtWaylandScanner_EXECUTABLE NAMES qtwaylandscanner HINTS
${qt_binaries_dir})
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.87.0/find-modules/FindWayland.cmake
new/extra-cmake-modules-5.88.0/find-modules/FindWayland.cmake
--- old/extra-cmake-modules-5.87.0/find-modules/FindWayland.cmake
2021-09-29 10:37:10.000000000 +0200
+++ new/extra-cmake-modules-5.88.0/find-modules/FindWayland.cmake
2021-10-25 10:12:47.000000000 +0200
@@ -118,6 +118,17 @@
)
pkg_get_variable(Wayland_DATADIR wayland-server pkgdatadir)
+if (CMAKE_CROSSCOMPILING AND (NOT EXISTS "${Wayland_DATADIR}/wayland.xml"))
+ # PKG_CONFIG_SYSROOT_DIR only applies to -I and -L flags, so pkg-config
+ # does not prepend CMAKE_SYSROOT when cross-compiling unless you pass
+ # --define-prefix explicitly. Therefore we have to manually do prepend
+ # it here when cross-compiling.
+ # See https://gitlab.kitware.com/cmake/cmake/-/issues/16647#note_844761
+ set(Wayland_DATADIR ${CMAKE_SYSROOT}${Wayland_DATADIR})
+endif()
+if (NOT EXISTS "${Wayland_DATADIR}/wayland.xml")
+ message(WARNING "Could not find wayland.xml in ${Wayland_DATADIR}")
+endif()
include(FeatureSummary)
set_package_properties(Wayland PROPERTIES
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.87.0/find-modules/sip_generator.py
new/extra-cmake-modules-5.88.0/find-modules/sip_generator.py
--- old/extra-cmake-modules-5.87.0/find-modules/sip_generator.py
2021-09-29 10:37:10.000000000 +0200
+++ new/extra-cmake-modules-5.88.0/find-modules/sip_generator.py
2021-10-25 10:12:47.000000000 +0200
@@ -792,4 +792,5 @@
if sys.argv[1] != "--self-check":
sys.exit(main())
else:
+ from PyQt5.Qt import PYQT_CONFIGURATION
cindex.Config.set_library_file(sys.argv[2])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.87.0/kde-modules/KDECompilerSettings.cmake
new/extra-cmake-modules-5.88.0/kde-modules/KDECompilerSettings.cmake
--- old/extra-cmake-modules-5.87.0/kde-modules/KDECompilerSettings.cmake
2021-09-29 10:37:10.000000000 +0200
+++ new/extra-cmake-modules-5.88.0/kde-modules/KDECompilerSettings.cmake
2021-10-25 10:12:47.000000000 +0200
@@ -604,6 +604,12 @@
# C4661: 'identifier' : no suitable definition provided for explicit
# template instantiation request
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4661")
+
+ if (CMAKE_CXX_STANDARD GREATER_EQUAL 11)
+ # Ensure __cplusplus is correct, otherwise it defaults to 199711L
which isn't true
+ #
https://docs.microsoft.com/en-us/cpp/build/reference/zc-cplusplus?view=msvc-160
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Zc:__cplusplus")
+ endif()
endif()
option(ENABLE_BSYMBOLICFUNCTIONS "Make use of -Bsymbolic-functions" OFF)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.87.0/kde-modules/prefix.sh.fish.cmake
new/extra-cmake-modules-5.88.0/kde-modules/prefix.sh.fish.cmake
--- old/extra-cmake-modules-5.87.0/kde-modules/prefix.sh.fish.cmake
2021-09-29 10:37:10.000000000 +0200
+++ new/extra-cmake-modules-5.88.0/kde-modules/prefix.sh.fish.cmake
2021-10-25 10:12:47.000000000 +0200
@@ -6,12 +6,12 @@
# LD_LIBRARY_PATH only needed if you are building without rpath
# set -x LD_LIBRARY_PATH "@KDE_INSTALL_FULL_LIBDIR@:$LD_LIBRARY_PATH"
-if set -q XDG_DATA_DIRS
+if test -z "$XDG_DATA_DIRS"
set -x --path XDG_DATA_DIRS /usr/local/share/ /usr/share/
end
set -x --path XDG_DATA_DIRS "@KDE_INSTALL_FULL_DATADIR@" $XDG_DATA_DIRS
-if set -q XDG_CONFIG_DIRS
+if test -z "$XDG_CONFIG_DIRS"
set -x --path XDG_CONFIG_DIRS /etc/xdg
end
set -x --path XDG_CONFIG_DIRS "@KDE_INSTALL_FULL_CONFDIR@" $XDG_CONFIG_DIRS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-5.87.0/modules/ECMAddTests.cmake
new/extra-cmake-modules-5.88.0/modules/ECMAddTests.cmake
--- old/extra-cmake-modules-5.87.0/modules/ECMAddTests.cmake 2021-09-29
10:37:10.000000000 +0200
+++ new/extra-cmake-modules-5.88.0/modules/ECMAddTests.cmake 2021-10-25
10:12:47.000000000 +0200
@@ -34,6 +34,9 @@
the executable entry point on Windows (although some frameworks, such as Qt,
abstract this difference away).
+The tests will be build with -DQT_FORCE_ASSERTS to enable assertions in the
+test executable even for release builds.
+
The TARGET_NAMES_VAR and TEST_NAMES_VAR arguments, if given, should specify a
variable name to receive the list of generated target and test names,
respectively. This makes it convenient to apply properties to them as a
@@ -92,6 +95,7 @@
endif()
add_test(NAME ${_testname} COMMAND ${_targetname})
target_link_libraries(${_targetname} ${ARG_LINK_LIBRARIES})
+ target_compile_definitions(${_targetname} PRIVATE -DQT_FORCE_ASSERTS)
ecm_mark_as_test(${_targetname})
if (CMAKE_LIBRARY_OUTPUT_DIRECTORY)
if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.87.0/modules/ECMFindQMLModule.cmake.in
new/extra-cmake-modules-5.88.0/modules/ECMFindQMLModule.cmake.in
--- old/extra-cmake-modules-5.87.0/modules/ECMFindQMLModule.cmake.in
2021-09-29 10:37:10.000000000 +0200
+++ new/extra-cmake-modules-5.88.0/modules/ECMFindQMLModule.cmake.in
2021-10-25 10:12:47.000000000 +0200
@@ -7,7 +7,7 @@
include(FindPackageHandleStandardArgs)
include("${ECM_MODULE_DIR}/ECMQueryQmake.cmake")
-query_qmake(qt_binaries_dir QT_INSTALL_BINS)
+query_qmake(qt_binaries_dir QT_HOST_BINS)
find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS
${qt_binaries_dir})
if(NOT QMLPLUGINDUMP_PROGRAM)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-5.87.0/toolchain/Android.cmake
new/extra-cmake-modules-5.88.0/toolchain/Android.cmake
--- old/extra-cmake-modules-5.87.0/toolchain/Android.cmake 2021-09-29
10:37:10.000000000 +0200
+++ new/extra-cmake-modules-5.88.0/toolchain/Android.cmake 2021-10-25
10:12:47.000000000 +0200
@@ -192,9 +192,9 @@
set(ANDROID_STL ${CMAKE_ANDROID_STL_TYPE})
include(${CMAKE_ANDROID_NDK}/build/cmake/android.toolchain.cmake REQUIRED)
-## HACK: Remove when we can depend on NDK r22
+## HACK: Remove when we can depend on NDK r23
# Workaround issue https://github.com/android/ndk/issues/929
-if(ANDROID_NDK_MAJOR VERSION_LESS 22)
+if(ANDROID_NDK_MAJOR VERSION_LESS 23)
unset(CMAKE_SYSROOT)
set(ANDROID_SYSROOT_PREFIX "${ANDROID_TOOLCHAIN_ROOT}/sysroot/usr")
