Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package messagelib for openSUSE:Factory checked in at 2022-08-07 18:33:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/messagelib (Old) and /work/SRC/openSUSE:Factory/.messagelib.new.1521 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "messagelib" Sun Aug 7 18:33:58 2022 rev:87 rq:993605 version:22.04.3 Changes: -------- --- /work/SRC/openSUSE:Factory/messagelib/messagelib.changes 2022-07-09 17:02:03.452708420 +0200 +++ /work/SRC/openSUSE:Factory/.messagelib.new.1521/messagelib.changes 2022-08-07 18:34:06.697184568 +0200 @@ -1,0 +2,7 @@ +Sun Aug 7 07:17:34 UTC 2022 - Christophe Giboudeaux <christo...@krop.fr> + +- Add upstream changes to fix issues detected by CMake 3.24: + * 0001-Add-missing-find_dependency-calls.patch + * 0001-Use-WebEngineWidgets-as-WebEngine-is-not-define-in-q.patch + +------------------------------------------------------------------- New: ---- 0001-Add-missing-find_dependency-calls.patch 0001-Use-WebEngineWidgets-as-WebEngine-is-not-define-in-q.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ messagelib.spec ++++++ --- /var/tmp/diff_new_pack.j9HmTL/_old 2022-08-07 18:34:08.097188638 +0200 +++ /var/tmp/diff_new_pack.j9HmTL/_new 2022-08-07 18:34:08.105188661 +0200 @@ -31,6 +31,10 @@ Source1: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig Source2: applications.keyring %endif +# PATCH-FIX-UPSTREAM +Patch0: 0001-Add-missing-find_dependency-calls.patch +# PATCH-FIX-UPSTREAM +Patch1: 0001-Use-WebEngineWidgets-as-WebEngine-is-not-define-in-q.patch BuildRequires: extra-cmake-modules BuildRequires: kf5-filesystem BuildRequires: libQt5Sql-private-headers-devel @@ -100,6 +104,7 @@ Requires: cmake(KF5MessageCore) Requires: cmake(KF5Mime) Requires: cmake(KF5PimCommon) +Requires: cmake(Qt5WebEngineWidgets) %description devel This package contains source headers for messagelib. ++++++ 0001-Add-missing-find_dependency-calls.patch ++++++ >From 3edc93673f94604c203be1c899dffb25575985db Mon Sep 17 00:00:00 2001 From: Heiko Becker <heiko.bec...@kde.org> Date: Sun, 17 Jul 2022 00:07:56 +0200 Subject: [PATCH] Add missing find_dependency calls There are probably more used in the public link interface, but these were enough to fix building dependents with cmake 3.24.0-rc3, which seems to be stricter than 3.23.x. --- messagecomposer/KF5MessageComposerConfig.cmake.in | 1 + messagecore/KF5MessageCoreConfig.cmake.in | 1 + messageviewer/KF5MessageViewerConfig.cmake.in | 1 + templateparser/KF5TemplateParserConfig.cmake.in | 4 ++++ 4 files changed, 7 insertions(+) diff --git a/messagecomposer/KF5MessageComposerConfig.cmake.in b/messagecomposer/KF5MessageComposerConfig.cmake.in index e054e2120e..e151870421 100644 --- a/messagecomposer/KF5MessageComposerConfig.cmake.in +++ b/messagecomposer/KF5MessageComposerConfig.cmake.in @@ -2,6 +2,7 @@ include(CMakeFindDependencyMacro) find_dependency(KF5Mime "@KMIME_LIB_VERSION@") find_dependency(KF5MessageCore "@MESSAGELIB_LIB_VERSION@") +find_dependency(KF5TemplateParser "@MESSAGELIB_LIB_VERSION@") find_dependency(KF5PimCommon "@PIMCOMMON_LIB_VERSION@") find_dependency(KF5Akonadi "@AKONADI_VERSION@") find_dependency(KF5IdentityManagement "@IDENTITYMANAGEMENT_LIB_VERSION@") diff --git a/messagecore/KF5MessageCoreConfig.cmake.in b/messagecore/KF5MessageCoreConfig.cmake.in index c3cce3c82b..2f3a4e7c7c 100644 --- a/messagecore/KF5MessageCoreConfig.cmake.in +++ b/messagecore/KF5MessageCoreConfig.cmake.in @@ -1,4 +1,5 @@ @PACKAGE_INIT@ include(CMakeFindDependencyMacro) find_dependency(KF5Mime "@KMIME_LIB_VERSION@") +find_dependency(KF5MimeTreeParser "@MESSAGELIB_LIB_VERSION@") include("${CMAKE_CURRENT_LIST_DIR}/KF5MessageCoreTargets.cmake") diff --git a/messageviewer/KF5MessageViewerConfig.cmake.in b/messageviewer/KF5MessageViewerConfig.cmake.in index cf12d4cbb8..9af546f470 100644 --- a/messageviewer/KF5MessageViewerConfig.cmake.in +++ b/messageviewer/KF5MessageViewerConfig.cmake.in @@ -3,6 +3,7 @@ include(CMakeFindDependencyMacro) find_dependency(KF5PimCommon "@PIMCOMMON_LIB_VERSION@") find_dependency(KF5MessageCore "@MESSAGELIB_LIB_VERSION@") find_dependency(KF5MimeTreeParser "@MESSAGELIB_LIB_VERSION@") +find_dependency(KF5WebEngineViewer "@MESSAGELIB_LIB_VERSION@") find_dependency(KF5Akonadi "@AKONADI_VERSION@") find_dependency(KF5Mime "@KMIME_LIB_VERSION@") find_dependency(KF5Contacts "@KF5_MIN_VERSION@") diff --git a/templateparser/KF5TemplateParserConfig.cmake.in b/templateparser/KF5TemplateParserConfig.cmake.in index 0f619b484b..ddd889128a 100644 --- a/templateparser/KF5TemplateParserConfig.cmake.in +++ b/templateparser/KF5TemplateParserConfig.cmake.in @@ -1,3 +1,7 @@ @PACKAGE_INIT@ +include(CMakeFindDependencyMacro) +find_dependency(KF5MimeTreeParser "@MESSAGELIB_LIB_VERSION@") +find_dependency(KF5MessageCore "@MESSAGELIB_LIB_VERSION@") + include("${CMAKE_CURRENT_LIST_DIR}/KF5TemplateParserTargets.cmake") -- 2.37.1 ++++++ 0001-Use-WebEngineWidgets-as-WebEngine-is-not-define-in-q.patch ++++++ >From 6eaef36d42bdb05f3412c178e53077fb6224ff80 Mon Sep 17 00:00:00 2001 From: Laurent Montel <mon...@kde.org> Date: Wed, 25 May 2022 08:50:26 +0200 Subject: [PATCH] Use WebEngineWidgets as WebEngine is not define in qt6 --- webengineviewer/KF5WebEngineViewerConfig.cmake.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webengineviewer/KF5WebEngineViewerConfig.cmake.in b/webengineviewer/KF5WebEngineViewerConfig.cmake.in index 217f675613..811e02e705 100644 --- a/webengineviewer/KF5WebEngineViewerConfig.cmake.in +++ b/webengineviewer/KF5WebEngineViewerConfig.cmake.in @@ -1,4 +1,4 @@ @PACKAGE_INIT@ include(CMakeFindDependencyMacro) -find_dependency(Qt@QT_MAJOR_VERSION@WebEngine "@QT_REQUIRED_VERSION@") +find_dependency(Qt@QT_MAJOR_VERSION@WebEngineWidgets "@QT_REQUIRED_VERSION@") include("${CMAKE_CURRENT_LIST_DIR}/KF5WebEngineViewerTargets.cmake") -- 2.37.1
