Hello community,
here is the log from the commit of package extra-cmake-modules for
openSUSE:Factory checked in at 2019-08-19 21:00:38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/extra-cmake-modules (Old)
and /work/SRC/openSUSE:Factory/.extra-cmake-modules.new.22127 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "extra-cmake-modules"
Mon Aug 19 21:00:38 2019 rev:68 rq:722439 version:5.61.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/extra-cmake-modules/extra-cmake-modules.changes
2019-07-26 12:09:02.546862444 +0200
+++
/work/SRC/openSUSE:Factory/.extra-cmake-modules.new.22127/extra-cmake-modules.changes
2019-08-19 21:02:40.596918152 +0200
@@ -1,0 +2,14 @@
+Wed Aug 7 17:51:03 UTC 2019 - Christophe Giboudeaux <[email protected]>
+
+- Update to 5.61.0
+ * New feature release
+ * For more details please see:
+ * https://www.kde.org/announcements/kde-frameworks-5.61.0.php
+- Changes since 5.60.0:
+ * android: Allow overriding ANDROID_ARCH and ANDROID_ARCH_ABI as envvars
+ * Notify users when not using KDE_INSTALL_USE_QT_SYS_PATHS about prefix.sh
+ * Provide a more sensible CMAKE_INSTALL_PREFIX default
+ * Make the default build type "Debug" when compiling a git checkout.
+ * Fix type names casing
+
+-------------------------------------------------------------------
Old:
----
extra-cmake-modules-5.60.0.tar.xz
New:
----
extra-cmake-modules-5.61.0.tar.xz
extra-cmake-modules-5.61.0.tar.xz.sig
frameworks.keyring
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ extra-cmake-modules.spec ++++++
--- /var/tmp/diff_new_pack.ELR4sD/_old 2019-08-19 21:02:44.812917469 +0200
+++ /var/tmp/diff_new_pack.ELR4sD/_new 2019-08-19 21:02:44.812917469 +0200
@@ -16,7 +16,7 @@
#
-%define _tar_path 5.60
+%define _tar_path 5.61
# Full KF5 version (e.g. 5.33.0)
%{!?_kf5_version: %global _kf5_version %{version}}
# Last major and minor KF5 version (e.g. 5.33)
@@ -26,14 +26,20 @@
%else
%bcond_with doc
%endif
+# Only needed for the package signature condition
+%bcond_without lang
Name: extra-cmake-modules
-Version: 5.60.0
+Version: 5.61.0
Release: 0
Summary: CMake modules
License: BSD-3-Clause
Group: Development/Tools/Other
URL: https://www.kde.org
-Source:
http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz
+Source:
https://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz
+%if %{with lang}
+Source1:
https://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz.sig
+Source2: frameworks.keyring
+%endif
# PATCH-FIX-OPENSUSE
Patch0: bundle-lang.patch
BuildRequires: cmake >= 3.0
@@ -52,7 +58,7 @@
%description
Extra modules and scripts for CMake.
-For more information see
http://community.kde.org/KDE_Core/Platform_11/Buildsystem/FindFilesSurvey
+For more information see
https://community.kde.org/KDE_Core/Platform_11/Buildsystem/FindFilesSurvey
%package doc
Summary: Documentation for extra-cmake-modules
@@ -63,7 +69,7 @@
%description doc
Extra modules and scripts for CMake.
-For more information see
http://community.kde.org/KDE_Core/Platform_11/Buildsystem/FindFilesSurvey
+For more information see
https://community.kde.org/KDE_Core/Platform_11/Buildsystem/FindFilesSurvey
This package provides documentation for extra-cmake-modules
%prep
++++++ extra-cmake-modules-5.60.0.tar.xz -> extra-cmake-modules-5.61.0.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-5.60.0/CMakeLists.txt
new/extra-cmake-modules-5.61.0/CMakeLists.txt
--- old/extra-cmake-modules-5.60.0/CMakeLists.txt 2019-06-29
17:11:42.000000000 +0200
+++ new/extra-cmake-modules-5.61.0/CMakeLists.txt 2019-07-29
02:50:36.000000000 +0200
@@ -32,7 +32,7 @@
# Preliminary setup
#
-set(VERSION "5.60.0") # handled by release scripts
+set(VERSION "5.61.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.60.0/ECMConfig.cmake.in
new/extra-cmake-modules-5.61.0/ECMConfig.cmake.in
--- old/extra-cmake-modules-5.60.0/ECMConfig.cmake.in 2019-06-29
17:11:42.000000000 +0200
+++ new/extra-cmake-modules-5.61.0/ECMConfig.cmake.in 2019-07-29
02:50:36.000000000 +0200
@@ -6,6 +6,8 @@
set(ECM_KDE_MODULE_DIR "@PACKAGE_KDE_MODULES_INSTALL_DIR@")
+set(ECM_PREFIX "${PACKAGE_PREFIX_DIR}")
+
set(ECM_MODULE_PATH "${ECM_MODULE_DIR}" "${ECM_FIND_MODULE_DIR}"
"${ECM_KDE_MODULE_DIR}")
set(ECM_GLOBAL_FIND_VERSION "${ECM_FIND_VERSION}")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.60.0/kde-modules/KDECompilerSettings.cmake
new/extra-cmake-modules-5.61.0/kde-modules/KDECompilerSettings.cmake
--- old/extra-cmake-modules-5.60.0/kde-modules/KDECompilerSettings.cmake
2019-06-29 17:11:42.000000000 +0200
+++ new/extra-cmake-modules-5.61.0/kde-modules/KDECompilerSettings.cmake
2019-07-29 02:50:36.000000000 +0200
@@ -67,6 +67,23 @@
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
############################################################
+# Default build type
+# If no build type was specified, default to using a debug build if the
+# source directory is a git clone.
+# Otherwise, leave it empty, to let distro packagers choose the flags.
+############################################################
+if (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
+ if (EXISTS "${CMAKE_SOURCE_DIR}/.git")
+ set(default_build_type "Debug")
+ message(STATUS "Setting build type to '${default_build_type}' as none
was specified.")
+ set_property(CACHE CMAKE_BUILD_TYPE PROPERTY VALUE
"${default_build_type}")
+ # Set the possible values of build type for cmake-gui
+ set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS
+ "Debug" "Release" "MinSizeRel" "RelWithDebInfo")
+ endif()
+endif()
+
+############################################################
# Toolchain minimal requirements
#
# Note that only compilers officially supported by Qt are
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.60.0/kde-modules/KDEInstallDirs.cmake
new/extra-cmake-modules-5.61.0/kde-modules/KDEInstallDirs.cmake
--- old/extra-cmake-modules-5.60.0/kde-modules/KDEInstallDirs.cmake
2019-06-29 17:11:42.000000000 +0200
+++ new/extra-cmake-modules-5.61.0/kde-modules/KDEInstallDirs.cmake
2019-07-29 02:50:36.000000000 +0200
@@ -426,7 +426,10 @@
BUNDLE_INSTALL_DIR)
endif()
-
+# Only supported since cmake 3.7
+if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+ set(CMAKE_INSTALL_PREFIX "${ECM_PREFIX}" CACHE PATH "Install path prefix"
FORCE)
+endif()
_define_absolute(EXECROOTDIR ""
"executables and libraries"
@@ -716,3 +719,7 @@
if(KDE_INSTALL_PREFIX_SCRIPT)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/prefix.sh DESTINATION
${CMAKE_INSTALL_PREFIX} PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ)
endif()
+
+if(NOT KDE_INSTALL_USE_QT_SYS_PATHS)
+ message("Installing in ${CMAKE_INSTALL_PREFIX}. Run
${CMAKE_CURRENT_BINARY_DIR}/prefix.sh to set the environment for
${CMAKE_PROJECT_NAME}.")
+endif()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-5.60.0/toolchain/Android.cmake
new/extra-cmake-modules-5.61.0/toolchain/Android.cmake
--- old/extra-cmake-modules-5.60.0/toolchain/Android.cmake 2019-06-29
17:11:42.000000000 +0200
+++ new/extra-cmake-modules-5.61.0/toolchain/Android.cmake 2019-07-29
02:50:36.000000000 +0200
@@ -144,16 +144,22 @@
endmacro()
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 "clang")
-set_deprecated_variable(CMAKE_ANDROID_ARCH_ABI ANDROID_ABI "armeabi-v7a")
set_deprecated_variable(CMAKE_ANDROID_API ANDROID_API_LEVEL "21")
+if(NOT DEFINED ENV{ANDROID_ARCH})
+ set(ENV{ANDROID_ARCH} "arm")
+endif()
+set_deprecated_variable(CMAKE_ANDROID_ARCH ANDROID_ARCHITECTURE
$ENV{ANDROID_ARCH})
+if(NOT DEFINED ENV{ANDROID_ARCH_ABI})
+ set(ENV{ANDROID_ARCH_ABI} "armeabi-v7a")
+endif()
+set_deprecated_variable(CMAKE_ANDROID_ARCH_ABI ANDROID_ABI
"$ENV{ANDROID_ARCH_ABI}")
-set(ANDROID_SDK_ROOT "$ENV{ANDROID_SDK_ROOT}" CACHE path "Android SDK path")
+set(ANDROID_SDK_ROOT "$ENV{ANDROID_SDK_ROOT}" CACHE PATH "Android SDK path")
file(GLOB build-tools LIST_DIRECTORIES TRUE RELATIVE
${ANDROID_SDK_ROOT}/build-tools ${ANDROID_SDK_ROOT}/build-tools/*)
list(GET build-tools 0 _default_sdk)
-set(ANDROID_SDK_BUILD_TOOLS_REVISION "${_default_sdk}" CACHE string "Android
API Level")
+set(ANDROID_SDK_BUILD_TOOLS_REVISION "${_default_sdk}" CACHE STRING "Android
API Level")
set(CMAKE_SYSTEM_VERSION ${CMAKE_ANDROID_API})
set(CMAKE_SYSTEM_NAME Android)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.60.0/toolchain/deployment-file.json.in
new/extra-cmake-modules-5.61.0/toolchain/deployment-file.json.in
--- old/extra-cmake-modules-5.60.0/toolchain/deployment-file.json.in
2019-06-29 17:11:42.000000000 +0200
+++ new/extra-cmake-modules-5.61.0/toolchain/deployment-file.json.in
2019-07-29 02:50:36.000000000 +0200
@@ -6,7 +6,7 @@
"tool-prefix": "##ANDROID_COMPILER_PREFIX##",
"toolchain-version": "##ANDROID_TOOLCHAIN_VERSION##",
"ndk-host": "@_LOWER_CMAKE_HOST_SYSTEM_NAME@-@CMAKE_HOST_SYSTEM_PROCESSOR@",
- "target-architecture": "@ANDROID_ABI@",
+ "target-architecture": "@CMAKE_ANDROID_ARCH_ABI@",
"application-binary": "@EXECUTABLE_DESTINATION_PATH@",
"qml-root-path": "@CMAKE_SOURCE_DIR@",
@DEFINE_QML_IMPORT_PATHS@
