commit: 2476f7e731bf088e74f041c472277fd257fee09e Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Mar 26 12:40:49 2023 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Mar 26 13:07:26 2023 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=2476f7e7
app-office/kmymoney: Rebase cmake.patch on top of HEAD Closes: https://bugs.gentoo.org/878397 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../kmymoney/files/kmymoney-9999-cmake.patch | 27 ++++++++++++++-------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/app-office/kmymoney/files/kmymoney-9999-cmake.patch b/app-office/kmymoney/files/kmymoney-9999-cmake.patch index f151c2e34b..71cf5f4d38 100644 --- a/app-office/kmymoney/files/kmymoney-9999-cmake.patch +++ b/app-office/kmymoney/files/kmymoney-9999-cmake.patch @@ -1,7 +1,14 @@ -From a189a9c9ce1db42bd0ee1e0eda146d2acdf8bf93 Mon Sep 17 00:00:00 2001 +From b6c2c157f403c9ab74067cc2611ffebd3f87d8d7 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner <[email protected]> Date: Fri, 5 Aug 2022 10:37:09 +0200 -Subject: [PATCH] Drop unused dependencies +Subject: [PATCH] Drop bogus dependencies + +This reverts 90d78bd238c8db701e4bb19d9c5c2ddd9bd4f59c, +93374114e87a9b05546fb27bc936f223b5b84f7d and +92ef8b8ef8d0c5229fc601ac36806c926c85c36a. + +The proper fix went into alkimia via +https://invent.kde.org/office/alkimia/-/commit/09a11cee26af4ca55e5839dd44e32400147dc119 See also: https://invent.kde.org/office/kmymoney/-/issues/63 @@ -11,18 +18,18 @@ Signed-off-by: Andreas Sturmlechner <[email protected]> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index f5dd8e6f2..5c73b872a 100644 +index 842acedaa..5a4542d29 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -111,7 +111,7 @@ if (PkgConfig_FOUND) +@@ -110,7 +110,7 @@ if (PkgConfig_FOUND) endif() - find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS Core DBus Widgets Svg Xml Test PrintSupport) --find_package(Qt5 ${QT_MIN_VERSION} OPTIONAL_COMPONENTS Sql Concurrent QuickWidgets WebEngineWidgets WebKitWidgets) -+find_package(Qt5 ${QT_MIN_VERSION} OPTIONAL_COMPONENTS Sql Concurrent QuickWidgets) + find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} REQUIRED COMPONENTS Core DBus Widgets Svg Xml Test PrintSupport) +-find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} OPTIONAL_COMPONENTS Sql Concurrent QuickWidgets WebEngineWidgets WebKitWidgets) ++find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} OPTIONAL_COMPONENTS Sql Concurrent QuickWidgets) + + find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Archive CoreAddons Config ConfigWidgets I18n Completion KCMUtils ItemModels ItemViews Service XmlGui TextWidgets Notifications KIO) - find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Archive CoreAddons Config ConfigWidgets I18n Completion KCMUtils ItemModels ItemViews Service Wallet XmlGui TextWidgets Notifications KIO) - find_package(KF5 ${KF5_MIN_VERSION} OPTIONAL_COMPONENTS DocTools Holidays Contacts Activities) -- -2.35.1 +2.40.0
