Hello community,
here is the log from the commit of package extra-cmake-modules for
openSUSE:Factory checked in at 2017-09-19 16:21:25
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/extra-cmake-modules (Old)
and /work/SRC/openSUSE:Factory/.extra-cmake-modules.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "extra-cmake-modules"
Tue Sep 19 16:21:25 2017 rev:45 rq:526620 version:5.38.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/extra-cmake-modules/extra-cmake-modules.changes
2017-08-24 17:55:35.629424788 +0200
+++
/work/SRC/openSUSE:Factory/.extra-cmake-modules.new/extra-cmake-modules.changes
2017-09-19 16:21:27.595706236 +0200
@@ -1,0 +2,19 @@
+Tue Sep 12 07:11:16 CEST 2017 - lbeltr...@kde.org
+
+- Update to 5.38.0
+ * New feature release
+ * For more details please see:
+ * https://www.kde.org/announcements/kde-frameworks-5.38.0.php
+- Changes since 5.37.0:
+ * Fix python bindings compilation after
7af93dd23873d0b9cdbac192949e7e5114940aa6
+ * Forgot to add the test
+ * Fix the fix
+ * Fix build with older CMake versions.
+ * Revert "RFC: Make ECMAddTests respect BUILD_TESTING"
+ * Revert "doc: Add 'Since' note"
+ * Set CMAKE_*_OUTPUT_DIRECTORY to run tests without installing.
+ * Include a module for finding qml imports as runtime dependencies
+ * doc: Add 'Since' note
+ * RFC: Make ECMAddTests respect BUILD_TESTING
+
+-------------------------------------------------------------------
Old:
----
extra-cmake-modules-5.37.0.tar.xz
New:
----
extra-cmake-modules-5.38.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ extra-cmake-modules.spec ++++++
--- /var/tmp/diff_new_pack.O1wYhh/_old 2017-09-19 16:21:28.207619984 +0200
+++ /var/tmp/diff_new_pack.O1wYhh/_new 2017-09-19 16:21:28.211619420 +0200
@@ -16,13 +16,17 @@
#
-%define _tar_path 5.37
+%define _tar_path 5.38
+# Full KF5 version (e.g. 5.33.0)
+%{!?_kf5_version: %global _kf5_version %{version}}
+# Last major and minor KF5 version (e.g. 5.33)
+%{!?_kf5_bugfix_version: %global _kf5_bugfix_version %(echo %{_kf5_version} |
awk -F. '{print $1"."$2}')}
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.37.0
+Version: 5.38.0
Release: 0
Source:
http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz
# PATCH-FIX-OPENSUSE
++++++ extra-cmake-modules-5.37.0.tar.xz -> extra-cmake-modules-5.38.0.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-5.37.0/CMakeLists.txt
new/extra-cmake-modules-5.38.0/CMakeLists.txt
--- old/extra-cmake-modules-5.37.0/CMakeLists.txt 2017-08-02
20:41:22.000000000 +0200
+++ new/extra-cmake-modules-5.38.0/CMakeLists.txt 2017-09-03
20:34:35.000000000 +0200
@@ -32,7 +32,7 @@
# Preliminary setup
#
-set(VERSION "5.37.0") # handled by release scripts
+set(VERSION "5.38.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.37.0/ECMConfig.cmake.in
new/extra-cmake-modules-5.38.0/ECMConfig.cmake.in
--- old/extra-cmake-modules-5.37.0/ECMConfig.cmake.in 2017-08-02
20:41:22.000000000 +0200
+++ new/extra-cmake-modules-5.38.0/ECMConfig.cmake.in 2017-09-03
20:34:35.000000000 +0200
@@ -8,4 +8,6 @@
set(ECM_MODULE_PATH "${ECM_MODULE_DIR}" "${ECM_FIND_MODULE_DIR}"
"${ECM_KDE_MODULE_DIR}")
+set(ECM_GLOBAL_FIND_VERSION "${ECM_FIND_VERSION}")
+
include("${ECM_MODULE_DIR}/ECMUseFindModules.cmake")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.37.0/find-modules/FindPythonModuleGeneration.cmake
new/extra-cmake-modules-5.38.0/find-modules/FindPythonModuleGeneration.cmake
---
old/extra-cmake-modules-5.37.0/find-modules/FindPythonModuleGeneration.cmake
2017-08-02 20:41:22.000000000 +0200
+++
new/extra-cmake-modules-5.38.0/find-modules/FindPythonModuleGeneration.cmake
2017-09-03 20:34:35.000000000 +0200
@@ -440,8 +440,9 @@
set_property(TARGET Py${pyversion}KF5${modulename_value} PROPERTY
AUTOMOC OFF)
set_property(TARGET Py${pyversion}KF5${modulename_value} PROPERTY
PREFIX "")
+ set_property(TARGET Py${pyversion}KF5${modulename_value} PROPERTY
LIBRARY_OUTPUT_DIRECTORY
"${CMAKE_BINARY_DIR}/py${pyversion}/${pythonnamespace_value}")
set_property(TARGET Py${pyversion}KF5${modulename_value} PROPERTY
- OUTPUT_NAME
"${CMAKE_BINARY_DIR}/py${pyversion}/${pythonnamespace_value}/${modulename_value}")
+ OUTPUT_NAME "${modulename_value}")
if (GPB_SIP_DEPENDS MATCHES PyKF5)
set(_kf5_python_prefix
${CMAKE_INSTALL_PREFIX}/lib/python${pyversion${pyversion}_maj_min}/${GPB_INSTALL_DIR_SUFFIX})
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.37.0/kde-modules/KDECMakeSettings.cmake
new/extra-cmake-modules-5.38.0/kde-modules/KDECMakeSettings.cmake
--- old/extra-cmake-modules-5.37.0/kde-modules/KDECMakeSettings.cmake
2017-08-02 20:41:22.000000000 +0200
+++ new/extra-cmake-modules-5.38.0/kde-modules/KDECMakeSettings.cmake
2017-09-03 20:34:35.000000000 +0200
@@ -41,7 +41,10 @@
# ~~~~~~~~~~~~~~
#
# Various CMake build defaults are altered, such as searching source and build
-# directories for includes first and enabling automoc by default.
+# directories for includes first, enabling automoc by default.
+#
+# When find_package(ECM 5.38) or higher is called, this also selects
+# a layout for the build dir that helps running executables without installing.
#
# This section can be disabled by setting ``KDE_SKIP_BUILD_SETTINGS`` to TRUE
# before including this module.
@@ -244,10 +247,12 @@
# one common directory, and all static|import libraries and plugins
# into another one. This way test executables can find their dlls
# even without installation.
- if(WIN32)
- set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
- set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
- set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
+
+ # We do the same under Unix to make it possible to run tests and apps
without installing
+ if (WIN32 OR NOT ("${ECM_GLOBAL_FIND_VERSION}" VERSION_LESS "5.38.0"))
+ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
+ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
+ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
endif()
if (APPLE)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.37.0/modules/ECMFindQMLModule.cmake.in
new/extra-cmake-modules-5.38.0/modules/ECMFindQMLModule.cmake.in
--- old/extra-cmake-modules-5.37.0/modules/ECMFindQMLModule.cmake.in
1970-01-01 01:00:00.000000000 +0100
+++ new/extra-cmake-modules-5.38.0/modules/ECMFindQMLModule.cmake.in
2017-09-03 20:34:35.000000000 +0200
@@ -0,0 +1,55 @@
+#=============================================================================
+# Copyright 2015 Aleix Pol Gonzalez <aleix...@blue-systems.com>
+#
+# 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.
+#=============================================================================
+
+include(FindPackageHandleStandardArgs)
+
+find_program(QMLPLUGINDUMP_PROGRAM qmlplugindump)
+if(NOT QMLPLUGINDUMP_PROGRAM)
+ message(WARNING "Could not find qmlplugindump. It is necessary to look up
qml module dependencies.")
+endif()
+
+execute_process(COMMAND "${QMLPLUGINDUMP_PROGRAM}" "@MODULE_NAME@" "@VERSION@"
ERROR_VARIABLE ERRORS_OUTPUT OUTPUT_VARIABLE DISREGARD_VARIABLE RESULT_VARIABLE
ExitCode)
+
+if(ExitCode EQUAL 0)
+ set(@GENMODULE@_FOUND TRUE)
+ set(@GENMODULE@_VERSION "${PACKAGE_FIND_VERSION}")
+else()
+ message(STATUS "qmlplugindump failed for @MODULE_NAME@.")
+ set(@GENMODULE@_FOUND FALSE)
+endif()
+
+find_package_handle_standard_args(@GENMODULE@
+ FOUND_VAR
+ @GENMODULE@_FOUND
+ REQUIRED_VARS
+ @GENMODULE@_FOUND
+ VERSION_VAR
+ @GENMODULE@_VERSION
+ HANDLE_COMPONENTS
+)
+
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.37.0/modules/ECMQMLModules.cmake
new/extra-cmake-modules-5.38.0/modules/ECMQMLModules.cmake
--- old/extra-cmake-modules-5.37.0/modules/ECMQMLModules.cmake 1970-01-01
01:00:00.000000000 +0100
+++ new/extra-cmake-modules-5.38.0/modules/ECMQMLModules.cmake 2017-09-03
20:34:35.000000000 +0200
@@ -0,0 +1,67 @@
+#.rst:
+# FindQMLModule
+# -------
+#
+# Find QML import modules through a find_qmlmodule() call.
+# It uses the qmlplugindump application to find the plugins and sets them up as
+# runtime dependencies.
+#
+# This is useful so that when we configure a project we are noified when some
+# QML imports are not present in the system, thus having the application
compilable
+# but fail at runtime.
+#
+# ::
+# ecm_find_qmlmodule(<module_name> <version>...)
+#
+# Any further arguments passed will be forwarded into a find_package() call.
See
+# find_package() documentation for more information.
+#
+# Usage example:
+#
+# .. code-block:: cmake
+#
+# ecm_find_qmlmodule(org.kde.kirigami 2.1)
+#
+#=============================================================================
+# Copyright 2015 Aleix Pol Gonzalez <aleix...@blue-systems.com>
+#
+# 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.
+#=============================================================================
+
+set(MODULES_DIR ${CMAKE_CURRENT_LIST_DIR})
+
+function(ecm_find_qmlmodule MODULE_NAME VERSION)
+ set(GENMODULE "${MODULE_NAME}-QMLModule")
+
+ configure_file("${MODULES_DIR}/ECMFindQMLModule.cmake.in"
"Find${GENMODULE}.cmake" @ONLY)
+
+ set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_BINARY_DIR}" ${CMAKE_MODULE_PATH})
+ find_package(${GENMODULE} ${ARGN})
+
+ if(COMMAND set_package_properties)
+ set_package_properties(${GENMODULE} PROPERTIES
+ DESCRIPTION "QML module '${MODULE_NAME}' is a runtime dependency."
+ TYPE RUNTIME)
+ endif()
+endfunction()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-5.37.0/tests/CMakeLists.txt
new/extra-cmake-modules-5.38.0/tests/CMakeLists.txt
--- old/extra-cmake-modules-5.37.0/tests/CMakeLists.txt 2017-08-02
20:41:22.000000000 +0200
+++ new/extra-cmake-modules-5.38.0/tests/CMakeLists.txt 2017-09-03
20:34:35.000000000 +0200
@@ -211,3 +211,16 @@
${CMAKE_COMMAND} -P
"${CMAKE_CURRENT_BINARY_DIR}/ECMPoQmToolsTest/check.cmake"
)
endif()
+
+find_package(Qt5Quick CONFIG)
+set_package_properties(
+ Qt5Quick
+ PROPERTIES
+ URL "http://www.qt.io/";
+ DESCRIPTION "Qt5 Quick library."
+ TYPE OPTIONAL
+ PURPOSE "Required to run tests for the ECMQMLModules module."
+)
+if (TARGET Qt5::Quick)
+ add_test_macro(ECMQMLModules dummy)
+endif()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.37.0/tests/ECMQMLModules/CMakeLists.txt
new/extra-cmake-modules-5.38.0/tests/ECMQMLModules/CMakeLists.txt
--- old/extra-cmake-modules-5.37.0/tests/ECMQMLModules/CMakeLists.txt
1970-01-01 01:00:00.000000000 +0100
+++ new/extra-cmake-modules-5.38.0/tests/ECMQMLModules/CMakeLists.txt
2017-09-03 20:34:35.000000000 +0200
@@ -0,0 +1,12 @@
+project(extra-cmake-modules)
+cmake_minimum_required(VERSION 2.8.12)
+
+set(ECM_FIND_MODULE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../find-modules)
+set(ECM_MODULE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../modules)
+set(CMAKE_MODULE_PATH "${ECM_FIND_MODULE_DIR}" "${ECM_MODULE_DIR}")
+
+include(ECMQMLModules)
+
+ecm_find_qmlmodule(QtQuick 2.1)
+
+add_executable(dummy main.c)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.37.0/tests/ECMQMLModules/main.c
new/extra-cmake-modules-5.38.0/tests/ECMQMLModules/main.c
--- old/extra-cmake-modules-5.37.0/tests/ECMQMLModules/main.c 1970-01-01
01:00:00.000000000 +0100
+++ new/extra-cmake-modules-5.38.0/tests/ECMQMLModules/main.c 2017-09-03
20:34:35.000000000 +0200
@@ -0,0 +1,4 @@
+int main()
+{
+ return 0;
+}
