Hello community,
here is the log from the commit of package extra-cmake-modules for
openSUSE:Factory checked in at 2018-01-09 14:47:27
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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 Jan 9 14:47:27 2018 rev:48 rq:562506 version:5.41.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/extra-cmake-modules/extra-cmake-modules.changes
2017-11-16 14:36:27.692575154 +0100
+++
/work/SRC/openSUSE:Factory/.extra-cmake-modules.new/extra-cmake-modules.changes
2018-01-09 14:47:29.903822118 +0100
@@ -1,0 +2,26 @@
+Mon Jan 8 08:41:54 UTC 2018 - [email protected]
+
+- Use python3 sphinx to generate the documentation module
+
+-------------------------------------------------------------------
+Sun Dec 17 09:43:47 CET 2017 - [email protected]
+
+- Update to 5.41.0
+ * New feature release
+ * For more details please see:
+ * https://www.kde.org/announcements/kde-frameworks-5.41.0.php
+- Changes since 5.40.0:
+ * Add the description tag to the generated pkgconfig files
+ * ecm_add_test: Use proper path sep on Windows
+ * Fix variable name
+ * restore old behaviour of FindPulseAudio
+ * Remove FindSasl2.cmake from the ECM's attic.
+ * Delete the .reviewboardrc file.
+ * Add FindSasl2.cmake to ECM
+ * Only pass the ARGS thing when doing Makefiles
+ * Remove FindGLIB2.cmake and FindPulseAudio.cmake from attic
+ * Add FindGLIB2.cmake and FindPulseAudio.cmake
+ * ECMAddTests: set QT_PLUGIN_PATH so locally built plugins can be found
+ * KDECMakeSettings: more docu about the layout of the build dir
+
+-------------------------------------------------------------------
Old:
----
extra-cmake-modules-5.40.0.tar.xz
New:
----
extra-cmake-modules-5.41.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ extra-cmake-modules.spec ++++++
--- /var/tmp/diff_new_pack.tJ6xm3/_old 2018-01-09 14:47:30.539792299 +0100
+++ /var/tmp/diff_new_pack.tJ6xm3/_new 2018-01-09 14:47:30.543792111 +0100
@@ -1,7 +1,7 @@
#
# spec file for package extra-cmake-modules
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,34 +16,38 @@
#
-%define _tar_path 5.40
+%define _tar_path 5.41
# 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}')}
+%if 0%{?suse_version} >= 1330
+%bcond_without doc
+%else
+%bcond_with doc
+%endif
Name: extra-cmake-modules
+Version: 5.41.0
+Release: 0
Summary: CMake modules
License: BSD-3-Clause
Group: Development/Tools/Other
Url:
https://projects.kde.org/projects/kdesupport/extra-cmake-modules
-Version: 5.40.0
-Release: 0
Source:
http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz
# PATCH-FIX-OPENSUSE
Patch0: bundle-lang.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: cmake >= 3.0
BuildRequires: gcc-c++
BuildRequires: kf5-filesystem >= 5.6.0
-%if %suse_version != 1315
-BuildRequires: python-Sphinx
-%endif
Requires: cmake >= 3.0
Requires: gcc-c++
Requires: kf5-filesystem
+Recommends: %{name}-doc
Provides: kf5umbrella = 4.99.0
Obsoletes: kf5umbrella < 4.99.0
-Recommends: %{name}-doc
+%if %{with doc}
+BuildRequires: python3-Sphinx
+%endif
%description
Extra modules and scripts for CMake.
@@ -74,12 +78,10 @@
%kf5_makeinstall -C build
%files
-%defattr(-,root,root,-)
%{_datadir}/ECM/
-%if %suse_version != 1315
+%if %{with doc}
%files doc
-%defattr(-,root,root,-)
%doc %{_datadir}/doc/ECM/
%doc %lang(en) %{_mandir}/man7/ecm*.7*
%endif
++++++ extra-cmake-modules-5.40.0.tar.xz -> extra-cmake-modules-5.41.0.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-5.40.0/.reviewboardrc
new/extra-cmake-modules-5.41.0/.reviewboardrc
--- old/extra-cmake-modules-5.40.0/.reviewboardrc 2017-10-31
10:54:00.000000000 +0100
+++ new/extra-cmake-modules-5.41.0/.reviewboardrc 1970-01-01
01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-REVIEWBOARD_URL = "https://git.reviewboard.kde.org";
-REPOSITORY = 'git://anongit.kde.org/extra-cmake-modules'
-BRANCH = 'master'
-TARGET_GROUPS = 'extracmakemodules'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-5.40.0/CMakeLists.txt
new/extra-cmake-modules-5.41.0/CMakeLists.txt
--- old/extra-cmake-modules-5.40.0/CMakeLists.txt 2017-10-31
10:54:00.000000000 +0100
+++ new/extra-cmake-modules-5.41.0/CMakeLists.txt 2017-11-30
08:42:14.000000000 +0100
@@ -32,7 +32,7 @@
# Preliminary setup
#
-set(VERSION "5.40.0") # handled by release scripts
+set(VERSION "5.41.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.40.0/attic/modules/FindGLIB2.cmake
new/extra-cmake-modules-5.41.0/attic/modules/FindGLIB2.cmake
--- old/extra-cmake-modules-5.40.0/attic/modules/FindGLIB2.cmake
2017-10-31 10:54:00.000000000 +0100
+++ new/extra-cmake-modules-5.41.0/attic/modules/FindGLIB2.cmake
1970-01-01 01:00:00.000000000 +0100
@@ -1,52 +0,0 @@
-# - Try to find the GLIB2 libraries
-# Once done this will define
-#
-# GLIB2_FOUND - system has glib2
-# GLIB2_INCLUDE_DIR - the glib2 include directory
-# GLIB2_LIBRARIES - glib2 library
-
-# Copyright (c) 2008 Laurent Montel, <[email protected]>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-
-if(GLIB2_INCLUDE_DIR AND GLIB2_LIBRARIES)
- # Already in cache, be silent
- set(GLIB2_FIND_QUIETLY TRUE)
-endif()
-
-find_package(PkgConfig)
-pkg_check_modules(PC_LibGLIB2 QUIET glib-2.0)
-
-find_path(GLIB2_MAIN_INCLUDE_DIR
- NAMES glib.h
- HINTS ${PC_LibGLIB2_INCLUDEDIR}
- PATH_SUFFIXES glib-2.0)
-
-find_library(GLIB2_LIBRARY
- NAMES glib-2.0
- HINTS ${PC_LibGLIB2_LIBDIR}
-)
-
-set(GLIB2_LIBRARIES ${GLIB2_LIBRARY})
-
-# search the glibconfig.h include dir under the same root where the library is
found
-get_filename_component(glib2LibDir "${GLIB2_LIBRARIES}" PATH)
-
-find_path(GLIB2_INTERNAL_INCLUDE_DIR glibconfig.h
- PATH_SUFFIXES glib-2.0/include
- HINTS ${PC_LibGLIB2_INCLUDEDIR} "${glib2LibDir}"
${CMAKE_SYSTEM_LIBRARY_PATH})
-
-set(GLIB2_INCLUDE_DIR "${GLIB2_MAIN_INCLUDE_DIR}")
-
-# not sure if this include dir is optional or required
-# for now it is optional
-if(GLIB2_INTERNAL_INCLUDE_DIR)
- set(GLIB2_INCLUDE_DIR ${GLIB2_INCLUDE_DIR} "${GLIB2_INTERNAL_INCLUDE_DIR}")
-endif()
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(GLIB2 DEFAULT_MSG GLIB2_LIBRARIES
GLIB2_MAIN_INCLUDE_DIR)
-
-mark_as_advanced(GLIB2_INCLUDE_DIR GLIB2_LIBRARIES)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.40.0/attic/modules/FindPulseAudio.cmake
new/extra-cmake-modules-5.41.0/attic/modules/FindPulseAudio.cmake
--- old/extra-cmake-modules-5.40.0/attic/modules/FindPulseAudio.cmake
2017-10-31 10:54:00.000000000 +0100
+++ new/extra-cmake-modules-5.41.0/attic/modules/FindPulseAudio.cmake
1970-01-01 01:00:00.000000000 +0100
@@ -1,71 +0,0 @@
-# Try to find the PulseAudio library
-#
-# Once done this will define:
-#
-# PULSEAUDIO_FOUND - system has the PulseAudio library
-# PULSEAUDIO_INCLUDE_DIR - the PulseAudio include directory
-# PULSEAUDIO_LIBRARY - the libraries needed to use PulseAudio
-# PULSEAUDIO_MAINLOOP_LIBRARY - the libraries needed to use PulsAudio Mainloop
-#
-# The minimum required version of PulseAudio can be specified using the
-# standard syntax, e.g. find_package(PulseAudio 1.0)
-
-# Copyright (c) 2008, Matthias Kretz, <[email protected]>
-# Copyright (c) 2009, Marcus Hufgard, <[email protected]>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-# Support PULSEAUDIO_MINIMUM_VERSION for compatibility:
-if(NOT PulseAudio_FIND_VERSION)
- set(PulseAudio_FIND_VERSION "${PULSEAUDIO_MINIMUM_VERSION}")
-endif()
-
-# the minimum version of PulseAudio we require
-if(NOT PulseAudio_FIND_VERSION)
- set(PulseAudio_FIND_VERSION "0.9.9")
-endif()
-
-if (NOT WIN32)
- include(FindPkgConfig)
- pkg_check_modules(PC_PULSEAUDIO QUIET libpulse>=${PulseAudio_FIND_VERSION})
- pkg_check_modules(PC_PULSEAUDIO_MAINLOOP QUIET libpulse-mainloop-glib)
-endif (NOT WIN32)
-
-find_path(PULSEAUDIO_INCLUDE_DIR pulse/pulseaudio.h
- HINTS
- ${PC_PULSEAUDIO_INCLUDEDIR}
- ${PC_PULSEAUDIO_INCLUDE_DIRS}
- )
-
-find_library(PULSEAUDIO_LIBRARY NAMES pulse libpulse
- HINTS
- ${PC_PULSEAUDIO_LIBDIR}
- ${PC_PULSEAUDIO_LIBRARY_DIRS}
- )
-
-find_library(PULSEAUDIO_MAINLOOP_LIBRARY NAMES pulse-mainloop
pulse-mainloop-glib libpulse-mainloop-glib
- HINTS
- ${PC_PULSEAUDIO_LIBDIR}
- ${PC_PULSEAUDIO_LIBRARY_DIRS}
- )
-
-# Store the version number in the cache, so we don't have to search every time
again:
-if (PULSEAUDIO_INCLUDE_DIR AND NOT PULSEAUDIO_VERSION)
-
- # get PulseAudio's version from its version.h, and compare it with our
minimum version
- file(STRINGS "${PULSEAUDIO_INCLUDE_DIR}/pulse/version.h" pulse_version_h
- REGEX ".*pa_get_headers_version\\(\\).*"
- )
- string(REGEX REPLACE ".*pa_get_headers_version\\(\\)\
\\(\"([0-9]+\\.[0-9]+\\.[0-9]+)[^\"]*\"\\).*" "\\1"
- _PULSEAUDIO_VERSION "${pulse_version_h}")
-
- set(PULSEAUDIO_VERSION "${_PULSEAUDIO_VERSION}" CACHE STRING "Version
number of PulseAudio" FORCE)
-endif (PULSEAUDIO_INCLUDE_DIR AND NOT PULSEAUDIO_VERSION)
-
-# Use the new extended syntax of find_package_handle_standard_args(), which
also handles version checking:
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(PulseAudio REQUIRED_VARS PULSEAUDIO_LIBRARY
PULSEAUDIO_INCLUDE_DIR
- VERSION_VAR PULSEAUDIO_VERSION )
-
-mark_as_advanced(PULSEAUDIO_INCLUDE_DIR PULSEAUDIO_LIBRARY
PULSEAUDIO_MAINLOOP_LIBRARY)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.40.0/attic/modules/FindSasl2.cmake
new/extra-cmake-modules-5.41.0/attic/modules/FindSasl2.cmake
--- old/extra-cmake-modules-5.40.0/attic/modules/FindSasl2.cmake
2017-10-31 10:54:00.000000000 +0100
+++ new/extra-cmake-modules-5.41.0/attic/modules/FindSasl2.cmake
1970-01-01 01:00:00.000000000 +0100
@@ -1,26 +0,0 @@
-# - Try to find the sasl2 directory library
-# Once done this will define
-#
-# SASL2_FOUND - system has SASL2
-# SASL2_INCLUDE_DIR - the SASL2 include directory
-# SASL2_LIBRARIES - The libraries needed to use SASL2
-
-# Copyright (c) 2006, 2007 Laurent Montel, <[email protected]>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-
-find_path(SASL2_INCLUDE_DIR sasl/sasl.h
-)
-
-# libsasl2 add for windows, because the windows package of cyrus-sasl2
-# contains a libsasl2 also for msvc which is not standard conform
-find_library(SASL2_LIBRARIES NAMES sasl2 libsasl2
-)
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(Sasl2 DEFAULT_MSG SASL2_LIBRARIES
SASL2_INCLUDE_DIR)
-
-mark_as_advanced(SASL2_INCLUDE_DIR SASL2_LIBRARIES)
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.40.0/docs/find-module/FindGLIB2.rst
new/extra-cmake-modules-5.41.0/docs/find-module/FindGLIB2.rst
--- old/extra-cmake-modules-5.40.0/docs/find-module/FindGLIB2.rst
1970-01-01 01:00:00.000000000 +0100
+++ new/extra-cmake-modules-5.41.0/docs/find-module/FindGLIB2.rst
2017-11-30 08:42:14.000000000 +0100
@@ -0,0 +1 @@
+.. ecm-module:: ../../find-modules/FindGLIB2.cmake
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.40.0/docs/find-module/FindPulseAudio.rst
new/extra-cmake-modules-5.41.0/docs/find-module/FindPulseAudio.rst
--- old/extra-cmake-modules-5.40.0/docs/find-module/FindPulseAudio.rst
1970-01-01 01:00:00.000000000 +0100
+++ new/extra-cmake-modules-5.41.0/docs/find-module/FindPulseAudio.rst
2017-11-30 08:42:14.000000000 +0100
@@ -0,0 +1 @@
+.. ecm-module:: ../../find-modules/FindPulseAudio.cmake
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.40.0/docs/find-module/FindSasl2.rst
new/extra-cmake-modules-5.41.0/docs/find-module/FindSasl2.rst
--- old/extra-cmake-modules-5.40.0/docs/find-module/FindSasl2.rst
1970-01-01 01:00:00.000000000 +0100
+++ new/extra-cmake-modules-5.41.0/docs/find-module/FindSasl2.rst
2017-11-30 08:42:14.000000000 +0100
@@ -0,0 +1 @@
+.. ecm-module:: ../../find-modules/FindSasl2.cmake
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.40.0/find-modules/FindGLIB2.cmake
new/extra-cmake-modules-5.41.0/find-modules/FindGLIB2.cmake
--- old/extra-cmake-modules-5.40.0/find-modules/FindGLIB2.cmake 1970-01-01
01:00:00.000000000 +0100
+++ new/extra-cmake-modules-5.41.0/find-modules/FindGLIB2.cmake 2017-11-30
08:42:14.000000000 +0100
@@ -0,0 +1,98 @@
+#.rst:
+# FindGLIB2
+# ---------
+#
+# Try to locate the GLib2 library.
+# If found, this will define the following variables:
+#
+# ``GLIB2_FOUND``
+# True if the GLib2 library is available
+# ``GLIB2_INCLUDE_DIRS``
+# The GLib2 include directories
+# ``GLIB2_LIBRARIES``
+# The GLib2 libraries for linking
+# ``GLIB2_INCLUDE_DIR``
+# Deprecated, use ``GLIB2_INCLUDE_DIRS``
+# ``GLIB2_LIBRARY``
+# Deprecated, use ``GLIB2_LIBRARIES``
+#
+# If ``GLIB2_FOUND`` is TRUE, it will also define the following
+# imported target:
+#
+# ``GLIB2::GLIB2``
+# The GLIB2 library
+#
+# Since 5.41.0.
+
+#=============================================================================
+# Copyright (c) 2008 Laurent Montel, <[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)
+pkg_check_modules(PC_GLIB2 QUIET glib-2.0)
+
+find_path(GLIB2_INCLUDE_DIRS
+ NAMES glib.h
+ HINTS ${PC_GLIB2_INCLUDEDIR}
+ PATH_SUFFIXES glib-2.0)
+
+find_library(GLIB2_LIBRARIES
+ NAMES glib-2.0
+ HINTS ${PC_GLIB2_LIBDIR}
+)
+
+# search the glibconfig.h include dir under the same root where the library is
found
+get_filename_component(glib2LibDir "${GLIB2_LIBRARIES}" PATH)
+
+find_path(GLIB2_INTERNAL_INCLUDE_DIR glibconfig.h
+ PATH_SUFFIXES glib-2.0/include
+ HINTS ${PC_GLIB2_INCLUDEDIR} "${glib2LibDir}"
${CMAKE_SYSTEM_LIBRARY_PATH})
+
+# not sure if this include dir is optional or required
+# for now it is optional
+if(GLIB2_INTERNAL_INCLUDE_DIR)
+ list(APPEND GLIB2_INCLUDE_DIRS "${GLIB2_INTERNAL_INCLUDE_DIR}")
+endif()
+
+# Deprecated synonyms
+set(GLIB2_INCLUDE_DIR "${GLIB2_INCLUDE_DIRS}")
+set(GLIB2_LIBRARY "${GLIB2_LIBRARIES}")
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(GLIB2 DEFAULT_MSG GLIB2_LIBRARIES
GLIB2_INCLUDE_DIRS)
+
+if(GLIB2_FOUND AND NOT TARGET GLIB2::GLIB2)
+ add_library(GLIB2::GLIB2 UNKNOWN IMPORTED)
+ set_target_properties(GLIB2::GLIB2 PROPERTIES
+ IMPORTED_LOCATION "${GLIB2_LIBRARIES}"
+ INTERFACE_INCLUDE_DIRECTORIES "${GLIB2_INCLUDE_DIRS}")
+endif()
+
+mark_as_advanced(GLIB2_INCLUDE_DIRS GLIB2_INCLUDE_DIR
+ GLIB2_LIBRARIES GLIB2_LIBRARY)
+set_package_properties(GLIB2 PROPERTIES
+ URL "https://wiki.gnome.org/Projects/GLib";
+ DESCRIPTION "Event loop and utility library")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.40.0/find-modules/FindPulseAudio.cmake
new/extra-cmake-modules-5.41.0/find-modules/FindPulseAudio.cmake
--- old/extra-cmake-modules-5.40.0/find-modules/FindPulseAudio.cmake
1970-01-01 01:00:00.000000000 +0100
+++ new/extra-cmake-modules-5.41.0/find-modules/FindPulseAudio.cmake
2017-11-30 08:42:14.000000000 +0100
@@ -0,0 +1,128 @@
+#.rst:
+# FindPulseAudio
+# --------------
+#
+# Try to locate the PulseAudio library.
+# If found, this will define the following variables:
+#
+# ``PulseAudio_FOUND``
+# True if the system has the PulseAudio library of at least
+# the minimum version specified by either the version parameter
+# to find_package() or the variable PulseAudio_MINIMUM_VERSION
+# ``PulseAudio_INCLUDE_DIRS``
+# The PulseAudio include directory
+# ``PulseAudio_LIBRARIES``
+# The PulseAudio libraries for linking
+# ``PulseAudio_MAINLOOP_LIBRARY``
+# The libraries needed to use PulseAudio Mainloop
+# ``PulseAudio_VERSION``
+# The version of PulseAudio that was found
+# ``PulseAudio_INCLUDE_DIR``
+# Deprecated, use ``PulseAudio_INCLUDE_DIRS``
+# ``PulseAudio_LIBRARY``
+# Deprecated, use ``PulseAudio_LIBRARIES``
+#
+# If ``PulseAudio_FOUND`` is TRUE, it will also define the following
+# imported target:
+#
+# ``PulseAudio::PulseAudio``
+# The PulseAudio library
+#
+# Since 5.41.0.
+
+#=============================================================================
+# Copyright (c) 2008, Matthias Kretz, <[email protected]>
+# Copyright (c) 2009, Marcus Hufgard, <[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.
+#=============================================================================
+
+# Support PulseAudio_MINIMUM_VERSION for compatibility:
+if(NOT PulseAudio_FIND_VERSION)
+ set(PulseAudio_FIND_VERSION "${PulseAudio_MINIMUM_VERSION}")
+endif()
+
+# the minimum version of PulseAudio we require
+if(NOT PulseAudio_FIND_VERSION)
+ set(PulseAudio_FIND_VERSION "0.9.9")
+endif()
+
+find_package(PkgConfig)
+pkg_check_modules(PC_PulseAudio QUIET libpulse>=${PulseAudio_FIND_VERSION})
+pkg_check_modules(PC_PulseAudio_MAINLOOP QUIET libpulse-mainloop-glib)
+
+find_path(PulseAudio_INCLUDE_DIRS pulse/pulseaudio.h
+ HINTS
+ ${PC_PulseAudio_INCLUDEDIR}
+ ${PC_PulseAudio_INCLUDE_DIRS}
+ )
+
+find_library(PulseAudio_LIBRARIES NAMES pulse libpulse
+ HINTS
+ ${PC_PulseAudio_LIBDIR}
+ ${PC_PulseAudio_LIBRARY_DIRS}
+ )
+
+find_library(PulseAudio_MAINLOOP_LIBRARY NAMES pulse-mainloop
pulse-mainloop-glib libpulse-mainloop-glib
+ HINTS
+ ${PC_PulseAudio_LIBDIR}
+ ${PC_PulseAudio_LIBRARY_DIRS}
+ )
+
+# Store the version number in the cache, so we don't have to search every time
again:
+if (PulseAudio_INCLUDE_DIRS AND NOT PulseAudio_VERSION)
+
+ # get PulseAudio's version from its version.h
+ file(STRINGS "${PulseAudio_INCLUDE_DIRS}/pulse/version.h" pulse_version_h
+ REGEX ".*pa_get_headers_version\\(\\).*")
+ string(REGEX REPLACE ".*pa_get_headers_version\\(\\)\
\\(\"([0-9]+\\.[0-9]+\\.[0-9]+)[^\"]*\"\\).*" "\\1"
+ _PulseAudio_VERSION "${pulse_version_h}")
+
+ set(PulseAudio_VERSION "${_PulseAudio_VERSION}" CACHE STRING "Version
number of PulseAudio" FORCE)
+endif()
+
+# Use the new extended syntax of find_package_handle_standard_args(), which
also handles version checking:
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(PulseAudio REQUIRED_VARS
PulseAudio_LIBRARIES PulseAudio_INCLUDE_DIRS
+ VERSION_VAR PulseAudio_VERSION)
+
+# Deprecated synonyms
+set(PULSEAUDIO_INCLUDE_DIR "${PulseAudio_INCLUDE_DIRS}")
+set(PULSEAUDIO_LIBRARY "${PulseAudio_LIBRARIES}")
+set(PULSEAUDIO_MAINLOOP_LIBRARY "${PulseAudio_MAINLOOP_LIBRARY}")
+set(PULSEAUDIO_FOUND "${PulseAudio_FOUND}")
+
+if(PulseAudio_FOUND AND NOT TARGET PulseAudio::PulseAudio)
+ add_library(PulseAudio::PulseAudio UNKNOWN IMPORTED)
+ set_target_properties(PulseAudio::PulseAudio PROPERTIES
+ IMPORTED_LOCATION "${PulseAudio_LIBRARIES}"
+ INTERFACE_INCLUDE_DIRECTORIES
"${PulseAudio_INCLUDE_DIRS}")
+endif()
+
+mark_as_advanced(PulseAudio_INCLUDE_DIRS PULSEAUDIO_INCLUDE_DIR
+ PulseAudio_LIBRARIES PULSEAUDIO_LIBRARY
+ PulseAudio_MAINLOOP_LIBRARY PULSEAUDIO_MAINLOOP_LIBRARY)
+set_package_properties(PulseAudio PROPERTIES
+ URL "https://www.freedesktop.org/wiki/Software/PulseAudio";
+ DESCRIPTION "Sound server, for sound stream routing and mixing")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.40.0/find-modules/FindSasl2.cmake
new/extra-cmake-modules-5.41.0/find-modules/FindSasl2.cmake
--- old/extra-cmake-modules-5.40.0/find-modules/FindSasl2.cmake 1970-01-01
01:00:00.000000000 +0100
+++ new/extra-cmake-modules-5.41.0/find-modules/FindSasl2.cmake 2017-11-30
08:42:14.000000000 +0100
@@ -0,0 +1,114 @@
+#.rst:
+# FindSasl2
+# ---------
+#
+# Try to find the SASL2 library.
+#
+# This will define the following variables:
+#
+# ``Sasl2_FOUND``
+# System has SASL2.
+#
+# ``Sasl2_VERSION``
+# The version of SASL2.
+#
+# ``Sasl2_INCLUDE_DIRS``
+# This should be passed to target_include_directories() if
+# the target is not used for linking.
+#
+# ``Sasl2_LIBRARIES``
+# The SASL2 library.
+# This can be passed to target_link_libraries() instead of
+# the ``Sasl2::Sasl2`` target
+#
+# If ``Sasl2_FOUND`` is TRUE, the following imported target
+# will be available:
+#
+# ``Sasl2::Sasl2``
+# The SASL2 library
+#
+# Since 5.41.0.
+#
+#=============================================================================
+# Copyright 2006, 2007 Laurent Montel <[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.
+#=============================================================================
+
+# NOTE: libsasl2.pc doesn't export the include dir.
+find_package(PkgConfig QUIET)
+pkg_check_modules(PC_Sasl2 libsasl2)
+
+find_path(Sasl2_INCLUDE_DIRS NAMES sasl/sasl.h)
+
+# libsasl2 add for windows, because the windows package of cyrus-sasl2
+# contains a libsasl2 also for msvc which is not standard conform
+find_library(Sasl2_LIBRARIES
+ NAMES sasl2 libsasl2
+ HINTS ${PC_Sasl2_LIBRARY_DIRS}
+)
+
+set(Sasl2_VERSION "${PC_Sasl2_VERSION}")
+
+if(NOT Sasl2_VERSION)
+ if(EXISTS "${Sasl2_INCLUDE_DIRS}/sasl/sasl.h")
+ file(READ "${Sasl2_INCLUDE_DIRS}/sasl/sasl.h" SASL2_H_CONTENT)
+ string(REGEX MATCH "#define SASL_VERSION_MAJOR[ ]+[0-9]+"
SASL2_VERSION_MAJOR_MATCH ${SASL2_H_CONTENT})
+ string(REGEX MATCH "#define SASL_VERSION_MINOR[ ]+[0-9]+"
SASL2_VERSION_MINOR_MATCH ${SASL2_H_CONTENT})
+ string(REGEX MATCH "#define SASL_VERSION_STEP[ ]+[0-9]+"
SASL2_VERSION_STEP_MATCH ${SASL2_H_CONTENT})
+
+ string(REGEX REPLACE ".*_MAJOR[ ]+(.*)" "\\1" SASL2_VERSION_MAJOR
${SASL2_VERSION_MAJOR_MATCH})
+ string(REGEX REPLACE ".*_MINOR[ ]+(.*)" "\\1" SASL2_VERSION_MINOR
${SASL2_VERSION_MINOR_MATCH})
+ string(REGEX REPLACE ".*_STEP[ ]+(.*)" "\\1" SASL2_VERSION_STEP
${SASL2_VERSION_STEP_MATCH})
+
+ set(Sasl2_VERSION
"${SASL2_VERSION_MAJOR}.${SASL2_VERSION_MINOR}.${SASL2_VERSION_STEP}")
+ else()
+ # Could not find the version
+ set(Sasl2_VERSION "0.0.0")
+ endif()
+endif()
+
+include(FindPackageHandleStandardArgs)
+
+find_package_handle_standard_args(Sasl2
+ FOUND_VAR Sasl2_FOUND
+ REQUIRED_VARS Sasl2_LIBRARIES Sasl2_INCLUDE_DIRS
+ VERSION_VAR Sasl2_VERSION
+)
+if(Sasl2_FOUND AND NOT TARGET Sasl2::Sasl2)
+ add_library(Sasl2::Sasl2 UNKNOWN IMPORTED)
+ set_target_properties(Sasl2::Sasl2 PROPERTIES
+ IMPORTED_LOCATION "${Sasl2_LIBRARIES}"
+ INTERFACE_INCLUDE_DIRECTORIES "${Sasl2_INCLUDE_DIRS}")
+endif()
+
+mark_as_advanced(Sasl2_LIBRARIES Sasl2_INCLUDE_DIRS Sasl2_VERSION)
+
+include(FeatureSummary)
+set_package_properties(Sasl2 PROPERTIES
+ URL "https://www.cyrusimap.org/sasl/";
+ DESCRIPTION "The Cyrus-sasl library."
+)
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.40.0/kde-modules/KDECMakeSettings.cmake
new/extra-cmake-modules-5.41.0/kde-modules/KDECMakeSettings.cmake
--- old/extra-cmake-modules-5.40.0/kde-modules/KDECMakeSettings.cmake
2017-10-31 10:54:00.000000000 +0100
+++ new/extra-cmake-modules-5.41.0/kde-modules/KDECMakeSettings.cmake
2017-11-30 08:42:14.000000000 +0100
@@ -44,7 +44,11 @@
# 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.
+# a layout for the build dir that helps running executables without installing:
+# all executables are built into a toplevel "bin" dir, making it possible to
find
+# helper binaries, and to find uninstalled plugins (provided that you use
+# kcoreaddons_add_plugin or set LIBRARY_OUTPUT_DIRECTORY as documented on
+# https://community.kde.org/Guidelines_and_HOWTOs/Making_apps_run_uninstalled).
#
# This section can be disabled by setting ``KDE_SKIP_BUILD_SETTINGS`` to TRUE
# before including this module.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-5.40.0/modules/ECMAddTests.cmake
new/extra-cmake-modules-5.41.0/modules/ECMAddTests.cmake
--- old/extra-cmake-modules-5.40.0/modules/ECMAddTests.cmake 2017-10-31
10:54:00.000000000 +0100
+++ new/extra-cmake-modules-5.41.0/modules/ECMAddTests.cmake 2017-11-30
08:42:14.000000000 +0100
@@ -114,6 +114,15 @@
add_test(NAME ${_testname} COMMAND ${_targetname})
target_link_libraries(${_targetname} ${ARG_LINK_LIBRARIES})
ecm_mark_as_test(${_targetname})
+ if (CMAKE_LIBRARY_OUTPUT_DIRECTORY)
+ if(CMAKE_HOST_SYSTEM MATCHES "Windows")
+ set(PATHSEP "\\;")
+ else() # e.g. Linux
+ set(PATHSEP ":")
+ endif()
+ set(_plugin_path $ENV{QT_PLUGIN_PATH})
+ set_property(TEST ${_testname} PROPERTY ENVIRONMENT
QT_PLUGIN_PATH=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}${PATHSEP}${_plugin_path})
+ endif()
if (ARG_TARGET_NAME_VAR)
set(${ARG_TARGET_NAME_VAR} "${_targetname}" PARENT_SCOPE)
endif()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.40.0/modules/ECMGeneratePkgConfigFile.cmake
new/extra-cmake-modules-5.41.0/modules/ECMGeneratePkgConfigFile.cmake
--- old/extra-cmake-modules-5.40.0/modules/ECMGeneratePkgConfigFile.cmake
2017-10-31 10:54:00.000000000 +0100
+++ new/extra-cmake-modules-5.41.0/modules/ECMGeneratePkgConfigFile.cmake
2017-11-30 08:42:14.000000000 +0100
@@ -16,6 +16,7 @@
# [INCLUDE_INSTALL_DIR <dir>]
# [LIB_INSTALL_DIR <dir>]
# [DEFINES -D<variable=value>...]
+# [DESCRIPTION <library description>]
# [INSTALL])
#
# ``BASE_NAME`` is the name of the module. It's the name projects will use to
@@ -42,6 +43,10 @@
# ``DEFINES`` is a list of preprocessor defines that it is recommended users of
# the library pass to the compiler when using it.
#
+# ``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``.
+#
# ``INSTALL`` will cause the module to be installed to the ``pkgconfig``
# subdirectory of ``LIB_INSTALL_DIR``, unless the ``ECM_PKGCONFIG_INSTALL_DIR``
# cache variable is set to something different. Note that the first call to
@@ -66,6 +71,8 @@
# )
#
# Since 1.3.0.
+# ``DESCRIPTION`` available since 5.1.41
+#
#=============================================================================
# Copyright 2014 Aleix Pol Gonzalez <[email protected]>
@@ -96,7 +103,7 @@
function(ECM_GENERATE_PKGCONFIG_FILE)
set(options INSTALL)
- set(oneValueArgs BASE_NAME LIB_NAME FILENAME_VAR INCLUDE_INSTALL_DIR
LIB_INSTALL_DIR)
+ set(oneValueArgs BASE_NAME LIB_NAME FILENAME_VAR INCLUDE_INSTALL_DIR
LIB_INSTALL_DIR DESCRIPTION)
set(multiValueArgs DEPS DEFINES)
cmake_parse_arguments(EGPF "${options}" "${oneValueArgs}"
"${multiValueArgs}" ${ARGN})
@@ -132,6 +139,17 @@
set(EGPF_LIB_INSTALL_DIR "lib")
endif()
endif()
+ if(NOT EGPF_DESCRIPTION)
+ if(EXISTS ${CMAKE_SOURCE_DIR}/metainfo.yaml)
+ file(STRINGS "${CMAKE_SOURCE_DIR}/metainfo.yaml"
_EGPF_METAINFO_DESCRIPTION_STRING REGEX "^description:.*$")
+ if(_EGPF_METAINFO_DESCRIPTION_STRING)
+ string(REGEX REPLACE "^description:[ ]*(.*)" "\\1"
EGPF_DESCRIPTION ${_EGPF_METAINFO_DESCRIPTION_STRING})
+ endif()
+ endif()
+ if("${EGPF_DESCRIPTION}" STREQUAL "")
+ set(EGPF_DESCRIPTION "${EGPF_LIB_NAME} library.")
+ endif()
+ endif()
set(PKGCONFIG_TARGET_BASENAME ${EGPF_BASE_NAME})
set(PKGCONFIG_TARGET_LIBNAME ${EGPF_LIB_NAME})
@@ -148,6 +166,7 @@
else()
set(PKGCONFIG_TARGET_LIBS
"${CMAKE_INSTALL_PREFIX}/${EGPF_LIB_INSTALL_DIR}")
endif()
+ set(PKGCONFIG_TARGET_DESCRIPTION "${EGPF_DESCRIPTION}")
set(PKGCONFIG_TARGET_DEFINES "")
if(EGPF_DEFINES)
set(PKGCONFIG_TARGET_DEFINES "${EGPF_DEFINE}")
@@ -161,6 +180,7 @@
file(WRITE ${PKGCONFIG_FILENAME}
"
Name: ${PKGCONFIG_TARGET_LIBNAME}
+Description: ${PKGCONFIG_TARGET_DESCRIPTION}
Version: ${PROJECT_VERSION}
Libs: -L${CMAKE_INSTALL_PREFIX}/${EGPF_LIB_INSTALL_DIR}
-l${PKGCONFIG_TARGET_LIBNAME}
Cflags: ${PKGCONFIG_TARGET_INCLUDES} ${PKGCONFIG_TARGET_DEFINES}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.40.0/tests/ECMGeneratePkgConfigFile/KF5CoreAddons.pc
new/extra-cmake-modules-5.41.0/tests/ECMGeneratePkgConfigFile/KF5CoreAddons.pc
---
old/extra-cmake-modules-5.40.0/tests/ECMGeneratePkgConfigFile/KF5CoreAddons.pc
2017-10-31 10:54:00.000000000 +0100
+++
new/extra-cmake-modules-5.41.0/tests/ECMGeneratePkgConfigFile/KF5CoreAddons.pc
2017-11-30 08:42:14.000000000 +0100
@@ -1,5 +1,6 @@
Name: KF5CoreAddons
+Description: KF5CoreAddons test
Version: 5.43
Libs: -L/usr/lib -lKF5CoreAddons
Cflags: -I/usr/KCoreAddons
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.40.0/tests/ECMGeneratePkgConfigFile/KF5CoreAddons2.pc
new/extra-cmake-modules-5.41.0/tests/ECMGeneratePkgConfigFile/KF5CoreAddons2.pc
---
old/extra-cmake-modules-5.40.0/tests/ECMGeneratePkgConfigFile/KF5CoreAddons2.pc
1970-01-01 01:00:00.000000000 +0100
+++
new/extra-cmake-modules-5.41.0/tests/ECMGeneratePkgConfigFile/KF5CoreAddons2.pc
2017-11-30 08:42:14.000000000 +0100
@@ -0,0 +1,7 @@
+
+Name: KF5CoreAddons2
+Description: Addons to QtCore
+Version: 5.43
+Libs: -L/usr/lib -lKF5CoreAddons2
+Cflags: -I/usr/KCoreAddons
+Requires: Qt5Core
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.40.0/tests/ECMGeneratePkgConfigFile/KF5CoreAddons3.pc
new/extra-cmake-modules-5.41.0/tests/ECMGeneratePkgConfigFile/KF5CoreAddons3.pc
---
old/extra-cmake-modules-5.40.0/tests/ECMGeneratePkgConfigFile/KF5CoreAddons3.pc
1970-01-01 01:00:00.000000000 +0100
+++
new/extra-cmake-modules-5.41.0/tests/ECMGeneratePkgConfigFile/KF5CoreAddons3.pc
2017-11-30 08:42:14.000000000 +0100
@@ -0,0 +1,7 @@
+
+Name: KF5CoreAddons3
+Description: KF5CoreAddons3 library.
+Version: 5.43
+Libs: -L/usr/lib -lKF5CoreAddons3
+Cflags: -I/usr/KCoreAddons
+Requires: Qt5Core
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.40.0/tests/ECMGeneratePkgConfigFile/metainfo_with_description.yaml
new/extra-cmake-modules-5.41.0/tests/ECMGeneratePkgConfigFile/metainfo_with_description.yaml
---
old/extra-cmake-modules-5.40.0/tests/ECMGeneratePkgConfigFile/metainfo_with_description.yaml
1970-01-01 01:00:00.000000000 +0100
+++
new/extra-cmake-modules-5.41.0/tests/ECMGeneratePkgConfigFile/metainfo_with_description.yaml
2017-11-30 08:42:14.000000000 +0100
@@ -0,0 +1,21 @@
+maintainer: mpyne
+description: Addons to QtCore
+tier: 1
+type: functional
+platforms:
+ - name: Linux
+ - name: FreeBSD
+ - name: Windows
+ - name: MacOSX
+ - name: Android
+portingAid: false
+deprecated: false
+release: true
+libraries:
+ - qmake: KCoreAddons
+ cmake: "KF5::CoreAddons"
+cmakename: KF5CoreAddons
+
+public_lib: true
+group: Frameworks
+subgroup: Tier 1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.40.0/tests/ECMGeneratePkgConfigFile/metainfo_with_empty_description.yaml
new/extra-cmake-modules-5.41.0/tests/ECMGeneratePkgConfigFile/metainfo_with_empty_description.yaml
---
old/extra-cmake-modules-5.40.0/tests/ECMGeneratePkgConfigFile/metainfo_with_empty_description.yaml
1970-01-01 01:00:00.000000000 +0100
+++
new/extra-cmake-modules-5.41.0/tests/ECMGeneratePkgConfigFile/metainfo_with_empty_description.yaml
2017-11-30 08:42:14.000000000 +0100
@@ -0,0 +1,21 @@
+maintainer: mpyne
+description:
+tier: 1
+type: functional
+platforms:
+ - name: Linux
+ - name: FreeBSD
+ - name: Windows
+ - name: MacOSX
+ - name: Android
+portingAid: false
+deprecated: false
+release: true
+libraries:
+ - qmake: KCoreAddons
+ cmake: "KF5::CoreAddons"
+cmakename: KF5CoreAddons
+
+public_lib: true
+group: Frameworks
+subgroup: Tier 1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.40.0/tests/ECMGeneratePkgConfigFile/metainfo_without_description.yaml
new/extra-cmake-modules-5.41.0/tests/ECMGeneratePkgConfigFile/metainfo_without_description.yaml
---
old/extra-cmake-modules-5.40.0/tests/ECMGeneratePkgConfigFile/metainfo_without_description.yaml
1970-01-01 01:00:00.000000000 +0100
+++
new/extra-cmake-modules-5.41.0/tests/ECMGeneratePkgConfigFile/metainfo_without_description.yaml
2017-11-30 08:42:14.000000000 +0100
@@ -0,0 +1,20 @@
+maintainer: mpyne
+tier: 1
+type: functional
+platforms:
+ - name: Linux
+ - name: FreeBSD
+ - name: Windows
+ - name: MacOSX
+ - name: Android
+portingAid: false
+deprecated: false
+release: true
+libraries:
+ - qmake: KCoreAddons
+ cmake: "KF5::CoreAddons"
+cmakename: KF5CoreAddons
+
+public_lib: true
+group: Frameworks
+subgroup: Tier 1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.40.0/tests/ECMGeneratePkgConfigFile/run_test.cmake.config
new/extra-cmake-modules-5.41.0/tests/ECMGeneratePkgConfigFile/run_test.cmake.config
---
old/extra-cmake-modules-5.40.0/tests/ECMGeneratePkgConfigFile/run_test.cmake.config
2017-10-31 10:54:00.000000000 +0100
+++
new/extra-cmake-modules-5.41.0/tests/ECMGeneratePkgConfigFile/run_test.cmake.config
2017-11-30 08:42:14.000000000 +0100
@@ -47,8 +47,63 @@
message(STATUS "Test 1: no optional arguments")
set(origfiles "${CMAKE_CURRENT_SOURCE_DIR}/KF5CoreAddons.pc")
-ecm_generate_pkgconfig_file(BASE_NAME KF5CoreAddons DEPS Qt5Core
INCLUDE_INSTALL_DIR /usr/KCoreAddons FILENAME_VAR OutputFile)
+ecm_generate_pkgconfig_file(BASE_NAME KF5CoreAddons
+ DESCRIPTION "KF5CoreAddons test"
+ DEPS Qt5Core
+ INCLUDE_INSTALL_DIR /usr/KCoreAddons
+ FILENAME_VAR OutputFile)
compare_files(GENERATED ${OutputFile}
ORIGINALS ${origfiles})
file(REMOVE ${OutputFile})
+
+message(STATUS "Test2: no description parameter, metainfo.yaml with
description found")
+set(origfiles "${CMAKE_CURRENT_SOURCE_DIR}/KF5CoreAddons2.pc")
+
+file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/metainfo_with_description.yaml
+ DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+file(RENAME ${CMAKE_CURRENT_BINARY_DIR}/metainfo_with_description.yaml
${CMAKE_CURRENT_BINARY_DIR}/metainfo.yaml)
+
+ecm_generate_pkgconfig_file(BASE_NAME KF5CoreAddons2
+ DEPS Qt5Core
+ INCLUDE_INSTALL_DIR /usr/KCoreAddons
+ FILENAME_VAR OutputFile)
+
+compare_files(GENERATED ${OutputFile}
+ ORIGINALS ${origfiles})
+file(REMOVE ${OutputFile})
+file(REMOVE ${CMAKE_CURRENT_BINARY_DIR}/metainfo.yaml)
+
+message(STATUS "Test3: no description parameter, metainfo.yaml with empty
description found")
+set(origfiles "${CMAKE_CURRENT_SOURCE_DIR}/KF5CoreAddons3.pc")
+
+file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/metainfo_with_empty_description.yaml
+ DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+file(RENAME ${CMAKE_CURRENT_BINARY_DIR}/metainfo_with_empty_description.yaml
${CMAKE_CURRENT_BINARY_DIR}/metainfo.yaml)
+
+ecm_generate_pkgconfig_file(BASE_NAME KF5CoreAddons3
+ DEPS Qt5Core
+ INCLUDE_INSTALL_DIR /usr/KCoreAddons
+ FILENAME_VAR OutputFile)
+
+compare_files(GENERATED ${OutputFile}
+ ORIGINALS ${origfiles})
+file(REMOVE ${OutputFile})
+file(REMOVE ${CMAKE_CURRENT_BINARY_DIR}/metainfo.yaml)
+
+message(STATUS "Test4: no description parameter, metainfo.yaml without
description")
+set(origfiles "${CMAKE_CURRENT_SOURCE_DIR}/KF5CoreAddons3.pc")
+
+file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/metainfo_without_description.yaml
+ DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+file(RENAME ${CMAKE_CURRENT_BINARY_DIR}/metainfo_without_description.yaml
${CMAKE_CURRENT_BINARY_DIR}/metainfo.yaml)
+
+ecm_generate_pkgconfig_file(BASE_NAME KF5CoreAddons3
+ DEPS Qt5Core
+ INCLUDE_INSTALL_DIR /usr/KCoreAddons
+ FILENAME_VAR OutputFile)
+
+compare_files(GENERATED ${OutputFile}
+ ORIGINALS ${origfiles})
+file(REMOVE ${OutputFile})
+file(REMOVE ${CMAKE_CURRENT_BINARY_DIR}/metainfo.yaml)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-5.40.0/toolchain/Android.cmake
new/extra-cmake-modules-5.41.0/toolchain/Android.cmake
--- old/extra-cmake-modules-5.40.0/toolchain/Android.cmake 2017-10-31
10:54:00.000000000 +0100
+++ new/extra-cmake-modules-5.41.0/toolchain/Android.cmake 2017-11-30
08:42:14.000000000 +0100
@@ -237,13 +237,17 @@
set(EXECUTABLE_DESTINATION_PATH
"${EXPORT_DIR}/libs/${ANDROID_ABI}/lib${QTANDROID_EXPORTED_TARGET}.so")
configure_file("${_CMAKE_ANDROID_DIR}/deployment-file.json.in"
"${QTANDROID_EXPORTED_TARGET}-deployment.json.in")
+ if (CMAKE_GENERATOR STREQUAL "Unix Makefiles")
+ set(arguments "\\$(ARGS)")
+ endif()
+
add_custom_target(${CREATEAPK_TARGET_NAME}
COMMAND cmake -E echo "Generating
$<TARGET_NAME:${QTANDROID_EXPORTED_TARGET}> with
$<TARGET_FILE_DIR:Qt5::qmake>/androiddeployqt"
COMMAND cmake -E remove_directory "${EXPORT_DIR}"
COMMAND cmake -E copy_directory "${ANDROID_APK_DIR}" "${EXPORT_DIR}"
COMMAND cmake -E copy "$<TARGET_FILE:${QTANDROID_EXPORTED_TARGET}>"
"${EXECUTABLE_DESTINATION_PATH}"
COMMAND cmake
-DINPUT_FILE="${QTANDROID_EXPORTED_TARGET}-deployment.json.in"
-DOUTPUT_FILE="${QTANDROID_EXPORTED_TARGET}-deployment.json"
"-DTARGET_DIR=$<TARGET_FILE_DIR:${QTANDROID_EXPORTED_TARGET}>"
"-DTARGET_NAME=${QTANDROID_EXPORTED_TARGET}"
"-DEXPORT_DIR=${CMAKE_INSTALL_PREFIX}" -P
${_CMAKE_ANDROID_DIR}/specifydependencies.cmake
- COMMAND $<TARGET_FILE_DIR:Qt5::qmake>/androiddeployqt --gradle --input
"${QTANDROID_EXPORTED_TARGET}-deployment.json" --output "${EXPORT_DIR}"
--deployment bundled "\\$(ARGS)"
+ COMMAND $<TARGET_FILE_DIR:Qt5::qmake>/androiddeployqt --gradle --input
"${QTANDROID_EXPORTED_TARGET}-deployment.json" --output "${EXPORT_DIR}"
--deployment bundled ${arguments}
)
add_custom_target(install-apk-${QTANDROID_EXPORTED_TARGET}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.40.0/toolchain/deployment-file.json.in
new/extra-cmake-modules-5.41.0/toolchain/deployment-file.json.in
--- old/extra-cmake-modules-5.40.0/toolchain/deployment-file.json.in
2017-10-31 10:54:00.000000000 +0100
+++ new/extra-cmake-modules-5.41.0/toolchain/deployment-file.json.in
2017-11-30 08:42:14.000000000 +0100
@@ -8,7 +8,7 @@
"ndk-host": "@_HOST@",
"target-architecture": "@ANDROID_ABI@",
"application-binary": "@EXECUTABLE_DESTINATION_PATH@",
- "qml-root-path": "@CMAKE_SOURCE_DIRECTORY@",
+ "qml-root-path": "@CMAKE_SOURCE_DIR@",
##EXTRALIBS##
##EXTRAPLUGINS##
"android-package-source-directory": "@ANDROID_APK_DIR@",
