Hello community,
here is the log from the commit of package extra-cmake-modules for
openSUSE:Factory checked in at 2018-02-16 21:27:21
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/extra-cmake-modules (Old)
and /work/SRC/openSUSE:Factory/.extra-cmake-modules.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "extra-cmake-modules"
Fri Feb 16 21:27:21 2018 rev:50 rq:576505 version:5.43.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/extra-cmake-modules/extra-cmake-modules.changes
2018-01-22 15:59:04.424520405 +0100
+++
/work/SRC/openSUSE:Factory/.extra-cmake-modules.new/extra-cmake-modules.changes
2018-02-16 21:28:54.877212085 +0100
@@ -1,0 +2,17 @@
+Mon Feb 12 23:42:06 CET 2018 - [email protected]
+
+- Update to 5.43.0
+ * New feature release
+ * For more details please see:
+ * https://www.kde.org/announcements/kde-frameworks-5.43.0.php
+- Changes since 5.42.0:
+ * ecm_install_icons: refer to non-deprecated KDE_INSTALL_ICONDIR
+ * FindQtWaylandScanner.cmake: Use qmake-query for HINT
+ * Make sure to search for Qt5-based qmlplugindump
+ * ECMToolchainAndroidTest doesn't exist anymore (kde#389519)
+ * Don't set the LD_LIBRARY_PATH in prefix.sh
+ * Add FindSeccomp to find-modules
+ * Fall back to language name for translations lookup if locale name fails
+ * Android: Add more includes
+
+-------------------------------------------------------------------
Old:
----
extra-cmake-modules-5.42.0.tar.xz
New:
----
extra-cmake-modules-5.43.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ extra-cmake-modules.spec ++++++
--- /var/tmp/diff_new_pack.JAcMZa/_old 2018-02-16 21:28:55.849176985 +0100
+++ /var/tmp/diff_new_pack.JAcMZa/_new 2018-02-16 21:28:55.853176840 +0100
@@ -16,7 +16,7 @@
#
-%define _tar_path 5.42
+%define _tar_path 5.43
# 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.42.0
+Version: 5.43.0
Release: 0
Summary: CMake modules
License: BSD-3-Clause
++++++ extra-cmake-modules-5.42.0.tar.xz -> extra-cmake-modules-5.43.0.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-5.42.0/CMakeLists.txt
new/extra-cmake-modules-5.43.0/CMakeLists.txt
--- old/extra-cmake-modules-5.42.0/CMakeLists.txt 2017-12-20
22:35:02.000000000 +0100
+++ new/extra-cmake-modules-5.43.0/CMakeLists.txt 2018-02-03
13:21:06.000000000 +0100
@@ -32,7 +32,7 @@
# Preliminary setup
#
-set(VERSION "5.42.0") # handled by release scripts
+set(VERSION "5.43.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.42.0/find-modules/FindQtWaylandScanner.cmake
new/extra-cmake-modules-5.43.0/find-modules/FindQtWaylandScanner.cmake
--- old/extra-cmake-modules-5.42.0/find-modules/FindQtWaylandScanner.cmake
2017-12-20 22:35:02.000000000 +0100
+++ new/extra-cmake-modules-5.43.0/find-modules/FindQtWaylandScanner.cmake
2018-02-03 13:21:06.000000000 +0100
@@ -86,11 +86,14 @@
#=============================================================================
include(${CMAKE_CURRENT_LIST_DIR}/ECMFindModuleHelpersStub.cmake)
+include("${ECM_MODULE_DIR}/ECMQueryQmake.cmake")
ecm_find_package_version_check(QtWaylandScanner)
+query_qmake(qt_binaries_dir QT_INSTALL_BINS)
+
# Find qtwaylandscanner
-find_program(QtWaylandScanner_EXECUTABLE NAMES qtwaylandscanner HINTS
/usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}/qt5/bin/)
+find_program(QtWaylandScanner_EXECUTABLE NAMES qtwaylandscanner HINTS
${qt_binaries_dir})
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(QtWaylandScanner
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.42.0/find-modules/FindSeccomp.cmake
new/extra-cmake-modules-5.43.0/find-modules/FindSeccomp.cmake
--- old/extra-cmake-modules-5.42.0/find-modules/FindSeccomp.cmake
1970-01-01 01:00:00.000000000 +0100
+++ new/extra-cmake-modules-5.43.0/find-modules/FindSeccomp.cmake
2018-02-03 13:21:06.000000000 +0100
@@ -0,0 +1,90 @@
+#.rst:
+# FindSeccomp
+# -----------
+#
+# Try to locate the libseccomp library.
+# If found, this will define the following variables:
+#
+# ``Seccomp_FOUND``
+# True if the seccomp library is available
+# ``Seccomp_INCLUDE_DIRS``
+# The seccomp include directories
+# ``Seccomp_LIBRARIES``
+# The seccomp libraries for linking
+#
+# If ``Seccomp_FOUND`` is TRUE, it will also define the following
+# imported target:
+#
+# ``Seccomp::Seccomp``
+# The Seccomp library
+#
+# Since 5.44.0.
+
+#=============================================================================
+# Copyright (c) 2017 Martin Flöser <[email protected]>
+# Copyright (c) 2017 David Kahles <[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 QUIET)
+pkg_check_modules(PKG_Libseccomp QUIET libseccomp)
+
+find_path(Seccomp_INCLUDE_DIRS
+ NAMES
+ seccomp.h
+ HINTS
+ ${PKG_Libseccomp_INCLUDE_DIRS}
+)
+find_library(Seccomp_LIBRARIES
+ NAMES
+ seccomp
+ HINTS
+ ${PKG_Libseccomp_LIBRARY_DIRS}
+)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(Seccomp
+ FOUND_VAR
+ Seccomp_FOUND
+ REQUIRED_VARS
+ Seccomp_LIBRARIES
+ Seccomp_INCLUDE_DIRS
+)
+
+if (Seccomp_FOUND AND NOT TARGET Seccomp::Seccomp)
+ add_library(Seccomp::Seccomp UNKNOWN IMPORTED)
+ set_target_properties(Seccomp::Seccomp PROPERTIES
+ IMPORTED_LOCATION "${Seccomp_LIBRARIES}"
+ INTERFACE_INCLUDE_DIRECTORIES "${Seccomp_INCLUDE_DIRS}"
+ )
+endif()
+
+mark_as_advanced(Seccomp_LIBRARIES Seccomp_INCLUDE_DIRS)
+
+include(FeatureSummary)
+set_package_properties(Seccomp PROPERTIES
+ URL "https://github.com/seccomp/libseccomp";
+ DESCRIPTION "The enhanced seccomp library."
+)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.42.0/kde-modules/prefix.sh.cmake
new/extra-cmake-modules-5.43.0/kde-modules/prefix.sh.cmake
--- old/extra-cmake-modules-5.42.0/kde-modules/prefix.sh.cmake 2017-12-20
22:35:02.000000000 +0100
+++ new/extra-cmake-modules-5.43.0/kde-modules/prefix.sh.cmake 2018-02-03
13:21:06.000000000 +0100
@@ -1,5 +1,7 @@
export PATH=@KDE_INSTALL_FULL_BINDIR@:$PATH
-export LD_LIBRARY_PATH=@KDE_INSTALL_FULL_LIBDIR@:$LD_LIBRARY_PATH
+
+# LD_LIBRARY_PATH only needed if you are building without rpath
+# export LD_LIBRARY_PATH=@KDE_INSTALL_FULL_LIBDIR@:$LD_LIBRARY_PATH
export
XDG_DATA_DIRS=@KDE_INSTALL_FULL_DATADIR@:${XDG_DATA_DIRS:-/usr/local/share/:/usr/share/}
export XDG_CONFIG_DIRS=@KDE_INSTALL_FULL_CONFDIR@:${XDG_CONFIG_DIRS:-/etc/xdg}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.42.0/modules/ECMFindQMLModule.cmake.in
new/extra-cmake-modules-5.43.0/modules/ECMFindQMLModule.cmake.in
--- old/extra-cmake-modules-5.42.0/modules/ECMFindQMLModule.cmake.in
2017-12-20 22:35:02.000000000 +0100
+++ new/extra-cmake-modules-5.43.0/modules/ECMFindQMLModule.cmake.in
2018-02-03 13:21:06.000000000 +0100
@@ -26,8 +26,11 @@
#=============================================================================
include(FindPackageHandleStandardArgs)
+include("${ECM_MODULE_DIR}/ECMQueryQmake.cmake")
-find_program(QMLPLUGINDUMP_PROGRAM qmlplugindump)
+query_qmake(qt_binaries_dir QT_INSTALL_BINS)
+
+find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS
${qt_binaries_dir})
if(NOT QMLPLUGINDUMP_PROGRAM)
message(WARNING "Could not find qmlplugindump. It is necessary to look up
qml module dependencies.")
endif()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.42.0/modules/ECMInstallIcons.cmake
new/extra-cmake-modules-5.43.0/modules/ECMInstallIcons.cmake
--- old/extra-cmake-modules-5.42.0/modules/ECMInstallIcons.cmake
2017-12-20 22:35:02.000000000 +0100
+++ new/extra-cmake-modules-5.43.0/modules/ECMInstallIcons.cmake
2018-02-03 13:21:06.000000000 +0100
@@ -39,7 +39,7 @@
# ``${CMAKE_INSTALL_PREFIX}/share/icons/<theme>/22x22/actions/menu_new.png``
#
# Users of the :kde-module:`KDEInstallDirs` module would normally use
-# ``${ICON_INSTALL_DIR}`` as the DESTINATION, while users of the GNUInstallDirs
+# ``${KDE_INSTALL_ICONDIR}`` as the DESTINATION, while users of the
GNUInstallDirs
# module should use ``${CMAKE_INSTALL_DATAROOTDIR}/icons``.
#
# An old form of arguments will also be accepted::
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.42.0/modules/ECMQmLoader.cpp.in
new/extra-cmake-modules-5.43.0/modules/ECMQmLoader.cpp.in
--- old/extra-cmake-modules-5.42.0/modules/ECMQmLoader.cpp.in 2017-12-20
22:35:02.000000000 +0100
+++ new/extra-cmake-modules-5.43.0/modules/ECMQmLoader.cpp.in 2018-02-03
13:21:06.000000000 +0100
@@ -65,7 +65,12 @@
QLocale locale = QLocale::system();
if (locale.name() != QStringLiteral("en")) {
if (!loadTranslation(locale.name())) {
- loadTranslation(locale.bcp47Name());
+ if (!loadTranslation(locale.bcp47Name())) {
+ const int i = locale.name().indexOf(QLatin1Char('_'));
+ if (i > 0) {
+ loadTranslation(locale.name().left(i));
+ }
+ }
}
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-5.42.0/tests/CMakeLists.txt
new/extra-cmake-modules-5.43.0/tests/CMakeLists.txt
--- old/extra-cmake-modules-5.42.0/tests/CMakeLists.txt 2017-12-20
22:35:02.000000000 +0100
+++ new/extra-cmake-modules-5.43.0/tests/CMakeLists.txt 2018-02-03
13:21:06.000000000 +0100
@@ -189,8 +189,6 @@
${CMAKE_COMMAND} -P
"${CMAKE_CURRENT_BINARY_DIR}/ECMInstallIconsTest/check_tree.cmake"
)
-add_test_macro(ECMToolchainAndroidTest dummy)
-
set(KDEPackageAppTemplatesTest_EXTRA_OPTIONS
--build-target install
--build-options
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.42.0/tests/ECMPoQmToolsTest/check.cmake.in
new/extra-cmake-modules-5.43.0/tests/ECMPoQmToolsTest/check.cmake.in
--- old/extra-cmake-modules-5.42.0/tests/ECMPoQmToolsTest/check.cmake.in
2017-12-20 22:35:02.000000000 +0100
+++ new/extra-cmake-modules-5.43.0/tests/ECMPoQmToolsTest/check.cmake.in
2018-02-03 13:21:06.000000000 +0100
@@ -58,16 +58,20 @@
if("@CMAKE_SYSTEM_NAME@" STREQUAL "Linux")
set(exp_output_catalog_en "english text:english plural form 5")
set(exp_output_catalog_de "german text:german plural form 5")
+ # no de_AT translation -> should fall back to de
+ set(exp_output_catalog_de_AT "${exp_output_catalog_de}")
# no french translation provided -> english fallback
set(exp_output_catalog_fr "${exp_output_catalog_en}")
set(exp_output_catalog2_en "2nd english text:2nd english plural form 5")
set(exp_output_catalog2_de "2nd german text:2nd german plural form 5")
+ # no de_AT translation -> should fall back to de
+ set(exp_output_catalog2_de_AT "${exp_output_catalog2_de}")
# no french translation provided -> english fallback
set(exp_output_catalog2_fr "${exp_output_catalog2_en}")
function(check_translations name exec catalog_name)
- foreach(lang en de fr)
+ foreach(lang en de de_AT fr)
execute_process(
COMMAND "${CMAKE_COMMAND}" -E env
"XDG_DATA_DIRS=${ACTUAL_TREE}/share"
LANGUAGE=${lang} "${exec}"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-5.42.0/toolchain/Android.cmake
new/extra-cmake-modules-5.43.0/toolchain/Android.cmake
--- old/extra-cmake-modules-5.42.0/toolchain/Android.cmake 2017-12-20
22:35:02.000000000 +0100
+++ new/extra-cmake-modules-5.43.0/toolchain/Android.cmake 2018-02-03
13:21:06.000000000 +0100
@@ -177,6 +177,8 @@
"${CMAKE_SYSROOT}/usr/include"
"${ANDROID_LIBS_ROOT}/include/"
"${ANDROID_LIBS_ROOT}/libs/${ANDROID_ABI}/include"
+ "${ANDROID_NDK}/sysroot/usr/include"
+ "${ANDROID_NDK}/sysroot/usr/include/${ANDROID_TOOLCHAIN}"
)
# libraries
