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 2022-01-11 21:15:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/extra-cmake-modules (Old)
and /work/SRC/openSUSE:Factory/.extra-cmake-modules.new.1892 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "extra-cmake-modules"
Tue Jan 11 21:15:53 2022 rev:97 rq:945027 version:5.90.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/extra-cmake-modules/extra-cmake-modules.changes
2021-12-13 20:43:34.092478991 +0100
+++
/work/SRC/openSUSE:Factory/.extra-cmake-modules.new.1892/extra-cmake-modules.changes
2022-01-11 21:18:14.128915185 +0100
@@ -1,0 +2,16 @@
+Mon Jan 3 12:47:11 UTC 2022 - Christophe Giboudeaux <[email protected]>
+
+- Update to 5.90.0
+ * New feature release
+ * For more details please see:
+ * https://kde.org/announcements/frameworks/5/5.90.0
+- Changes since 5.89.0:
+ * Add support for finding Poppler's Qt6 library
+ * Add support for finding Qt6 QML modules
+ * Add missing prefix to version-less install directory aliases
+ * FindInotify.cmake: add target support
+ * FindInotify.cmake: add support for SunOS
+ * Add CI for FreeBSD and Android
+ * Define version-less install targets in KDEInstallDirs5.cmake
+
+-------------------------------------------------------------------
Old:
----
extra-cmake-modules-5.89.0.tar.xz
extra-cmake-modules-5.89.0.tar.xz.sig
New:
----
extra-cmake-modules-5.90.0.tar.xz
extra-cmake-modules-5.90.0.tar.xz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ extra-cmake-modules.spec ++++++
--- /var/tmp/diff_new_pack.Ij4I1F/_old 2022-01-11 21:18:14.732915610 +0100
+++ /var/tmp/diff_new_pack.Ij4I1F/_new 2022-01-11 21:18:14.736915613 +0100
@@ -16,23 +16,23 @@
#
-%define _tar_path 5.89
+%define _tar_path 5.90
# 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: %define _kf5_bugfix_version %(echo %{_kf5_version} |
awk -F. '{print $1"."$2}')}
%bcond_without doc
# Only needed for the package signature condition
-%bcond_without lang
+%bcond_without released
Name: extra-cmake-modules
-Version: 5.89.0
+Version: 5.90.0
Release: 0
Summary: CMake modules
License: BSD-3-Clause
Group: Development/Tools/Other
URL: https://www.kde.org
Source: %{name}-%{version}.tar.xz
-%if %{with lang}
+%if %{with released}
Source1: %{name}-%{version}.tar.xz.sig
Source2: frameworks.keyring
%endif
++++++ extra-cmake-modules-5.89.0.tar.xz -> extra-cmake-modules-5.90.0.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-5.89.0/.gitlab-ci.yml
new/extra-cmake-modules-5.90.0/.gitlab-ci.yml
--- old/extra-cmake-modules-5.89.0/.gitlab-ci.yml 2021-12-02
07:14:53.000000000 +0100
+++ new/extra-cmake-modules-5.90.0/.gitlab-ci.yml 2021-12-29
12:43:23.000000000 +0100
@@ -3,3 +3,5 @@
include:
-
https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux.yml
+ -
https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/android.yml
+ -
https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd.yml
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-5.89.0/CMakeLists.txt
new/extra-cmake-modules-5.90.0/CMakeLists.txt
--- old/extra-cmake-modules-5.89.0/CMakeLists.txt 2021-12-02
07:14:53.000000000 +0100
+++ new/extra-cmake-modules-5.90.0/CMakeLists.txt 2021-12-29
12:43:23.000000000 +0100
@@ -11,7 +11,7 @@
# Preliminary setup
#
-set(VERSION "5.89.0") # handled by release scripts
+set(VERSION "5.90.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.89.0/find-modules/FindInotify.cmake
new/extra-cmake-modules-5.90.0/find-modules/FindInotify.cmake
--- old/extra-cmake-modules-5.89.0/find-modules/FindInotify.cmake
2021-12-02 07:14:53.000000000 +0100
+++ new/extra-cmake-modules-5.90.0/find-modules/FindInotify.cmake
2021-12-29 12:43:23.000000000 +0100
@@ -20,7 +20,7 @@
``Inotify_INCLUDE_DIRS``
This has to be passed to target_include_directories()
-On Linux, the libraries and include directories are empty,
+On Linux and SunOS, the libraries and include directories are empty,
even though ``Inotify_FOUND`` may be set to TRUE. This is because
no special includes or libraries are needed. On other systems
these may be needed to use inotify.
@@ -31,9 +31,9 @@
find_path(Inotify_INCLUDE_DIRS sys/inotify.h)
if(Inotify_INCLUDE_DIRS)
-# On Linux there is no library to link against, on the BSDs there is.
+# On Linux and SunOS, there is no library to link against, on the BSDs there
is.
# On the BSD's, inotify is implemented through a library, libinotify.
- if( CMAKE_SYSTEM_NAME MATCHES "Linux")
+ if(CMAKE_SYSTEM_NAME MATCHES "Linux" OR CMAKE_SYSTEM_NAME MATCHES "SunOS")
set(Inotify_FOUND TRUE)
set(Inotify_LIBRARIES "")
set(Inotify_INCLUDE_DIRS "")
@@ -54,8 +54,13 @@
DESCRIPTION "inotify API on the *BSD family of operating systems."
)
endif()
+ if(NOT TARGET Inotify::Inotify)
+ add_library(Inotify::Inotify INTERFACE IMPORTED)
+ set_property(TARGET Inotify::Inotify PROPERTY
INTERFACE_INCLUDE_DIRECTORIES "${Inotify_INCLUDE_DIRS}")
+ set_property(TARGET Inotify::Inotify PROPERTY INTERFACE_LINK_LIBRARIES
"${Inotify_LIBRARIES}")
+ endif()
else()
- set(Inotify_FOUND FALSE)
+ set(Inotify_FOUND FALSE)
endif()
mark_as_advanced(Inotify_LIBRARIES Inotify_INCLUDE_DIRS)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.89.0/find-modules/FindPoppler.cmake
new/extra-cmake-modules-5.90.0/find-modules/FindPoppler.cmake
--- old/extra-cmake-modules-5.89.0/find-modules/FindPoppler.cmake
2021-12-02 07:14:53.000000000 +0100
+++ new/extra-cmake-modules-5.90.0/find-modules/FindPoppler.cmake
2021-12-29 12:43:23.000000000 +0100
@@ -60,6 +60,7 @@
Cpp
Qt4
Qt5
+ Qt6
Glib
)
foreach(_comp ${Poppler_known_components})
@@ -75,11 +76,12 @@
set(Poppler_Core_pkg_config "poppler")
# poppler-config.h header is only installed with --enable-xpdf-headers
# fall back to using any header from a submodule with a path to make it work
in that case too
-set(Poppler_Core_header "poppler-config.h" "cpp/poppler-version.h"
"qt5/poppler-qt5.h" "qt4/poppler-qt4.h" "glib/poppler.h")
+set(Poppler_Core_header "poppler-config.h" "cpp/poppler-version.h"
"qt6/poppler-qt6.h" "qt5/poppler-qt5.h" "qt4/poppler-qt4.h" "glib/poppler.h")
set(Poppler_Core_header_subdir "poppler")
set(Poppler_Core_lib "poppler")
set(Poppler_Cpp_header "poppler-version.h")
+set(Poppler_Qt6_header "poppler-qt6.h")
set(Poppler_Qt5_header "poppler-qt5.h")
set(Poppler_Qt4_header "poppler-qt4.h")
set(Poppler_Glib_header "poppler.h")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.89.0/kde-modules/KDEInstallDirs5.cmake
new/extra-cmake-modules-5.90.0/kde-modules/KDEInstallDirs5.cmake
--- old/extra-cmake-modules-5.89.0/kde-modules/KDEInstallDirs5.cmake
2021-12-02 07:14:53.000000000 +0100
+++ new/extra-cmake-modules-5.90.0/kde-modules/KDEInstallDirs5.cmake
2021-12-29 12:43:23.000000000 +0100
@@ -349,7 +349,6 @@
ARCHIVE DESTINATION
"${CMAKE_INSTALL_LIBDIR}" COMPONENT Devel
INCLUDES DESTINATION
"${CMAKE_INSTALL_INCLUDEDIR_KF5}"
)
-set(KF_INSTALL_TARGETS_DEFAULT_ARGS ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
# on the Mac support an extra install directory for application bundles
if(APPLE)
@@ -361,4 +360,10 @@
set(INSTALL_TARGETS_DEFAULT_ARGS ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
endif()
+# version-less forward compatibility variants, see also KDEInstallDirs6.cmake
+set(KF_INSTALL_TARGETS_DEFAULT_ARGS ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
+_define_non_cache(INCLUDEDIR_KF "${KDE_INSTALL_INCLUDEDIR_KF5}")
+_define_non_cache(DATADIR_KF "${KDE_INSTALL_DATADIR_KF5}")
+_define_non_cache(LIBEXECDIR_KF "${KDE_INSTALL_LIBEXECDIR_KF5}")
+
include(${CMAKE_CURRENT_LIST_DIR}/KDESetupPrefixScript.cmake)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.89.0/kde-modules/KDEInstallDirs6.cmake
new/extra-cmake-modules-5.90.0/kde-modules/KDEInstallDirs6.cmake
--- old/extra-cmake-modules-5.89.0/kde-modules/KDEInstallDirs6.cmake
2021-12-02 07:14:53.000000000 +0100
+++ new/extra-cmake-modules-5.90.0/kde-modules/KDEInstallDirs6.cmake
2021-12-29 12:43:23.000000000 +0100
@@ -293,7 +293,7 @@
# on the Mac support an extra install directory for application bundles
if(APPLE)
- set(KF6_INSTALL_TARGETS_DEFAULT_ARGS ${KF6_INSTALL_TARGETS_DEFAULT_ARGS}
+ set(KF_INSTALL_TARGETS_DEFAULT_ARGS ${KF_INSTALL_TARGETS_DEFAULT_ARGS}
BUNDLE DESTINATION
"${BUNDLE_INSTALL_DIR}" )
endif()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.89.0/kde-modules/KDEInstallDirsCommon.cmake
new/extra-cmake-modules-5.90.0/kde-modules/KDEInstallDirsCommon.cmake
--- old/extra-cmake-modules-5.89.0/kde-modules/KDEInstallDirsCommon.cmake
2021-12-02 07:14:53.000000000 +0100
+++ new/extra-cmake-modules-5.90.0/kde-modules/KDEInstallDirsCommon.cmake
2021-12-29 12:43:23.000000000 +0100
@@ -184,7 +184,7 @@
set(${_oldstylename} "${KDE_INSTALL_${varname}}")
endif()
if (_aliasname)
- set(${_aliasname} "${KDE_INSTALL_${varname}}")
+ set(KDE_INSTALL_${_aliasname} "${KDE_INSTALL_${varname}}")
endif()
endmacro()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.89.0/modules/ECMFindQMLModule.cmake.in
new/extra-cmake-modules-5.90.0/modules/ECMFindQMLModule.cmake.in
--- old/extra-cmake-modules-5.89.0/modules/ECMFindQMLModule.cmake.in
2021-12-02 07:14:53.000000000 +0100
+++ new/extra-cmake-modules-5.90.0/modules/ECMFindQMLModule.cmake.in
2021-12-29 12:43:23.000000000 +0100
@@ -5,11 +5,17 @@
#=============================================================================
include(FindPackageHandleStandardArgs)
-include("${ECM_MODULE_DIR}/ECMQueryQmake.cmake")
+include("${ECM_MODULE_DIR}/QtVersionOption.cmake")
-query_qmake(qt_binaries_dir QT_HOST_BINS)
+if (QT_MAJOR_VERSION EQUAL "5")
+ include("${ECM_MODULE_DIR}/ECMQueryQmake.cmake")
+ query_qmake(qt_binaries_dir QT_HOST_BINS)
+ find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS
${qt_binaries_dir})
+elseif (QT_MAJOR_VERSION EQUAL "6")
+ find_package(Qt6QmlTools REQUIRED)
+ get_target_property(QMLPLUGINDUMP_PROGRAM Qt6::qmlplugindump LOCATION)
+endif()
-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()
