commit: a626daadc0d9e5626aaa1ee3b52580e523b90b6c Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Wed Mar 30 05:47:38 2022 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Wed Mar 30 05:47:38 2022 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=a626daad
kde-apps/okular: Rebase optional-options patch on top of 22.07.70 Reported-by: Duncan <1i5t5.duncan <AT> cox.net> Closes: https://bugs.gentoo.org/836389 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> kde-apps/okular/files/okular-22.07.70-optional-options.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/kde-apps/okular/files/okular-22.07.70-optional-options.patch b/kde-apps/okular/files/okular-22.07.70-optional-options.patch index 6c83b03e06..0cadfe415d 100644 --- a/kde-apps/okular/files/okular-22.07.70-optional-options.patch +++ b/kde-apps/okular/files/okular-22.07.70-optional-options.patch @@ -1,4 +1,4 @@ -From 86729e7698250dcb11ccbec0a6cc9690501ad691 Mon Sep 17 00:00:00 2001 +From f29b89d8ac7fcca1cf74462dcc33da24551c924f Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner <[email protected]> Date: Tue, 31 Aug 2021 16:48:42 +0200 Subject: [PATCH] Make WITH_KWALLET and WITH_KJS proper cmake options @@ -21,7 +21,7 @@ Signed-off-by: Andreas Sturmlechner <[email protected]> 4 files changed, 16 insertions(+), 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 43a45c7b9..57d0f6f74 100644 +index 547671f24..f1e14fa8b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -91,12 +91,9 @@ ecm_setup_qtplugin_macro_names( @@ -40,7 +40,7 @@ index 43a45c7b9..57d0f6f74 100644 find_package(KF5 ${KF5_REQUIRED_VERSION} REQUIRED COMPONENTS Archive -@@ -111,21 +108,19 @@ find_package(KF5 ${KF5_REQUIRED_VERSION} REQUIRED COMPONENTS +@@ -110,21 +107,19 @@ find_package(KF5 ${KF5_REQUIRED_VERSION} REQUIRED COMPONENTS TextWidgets ThreadWeaver WindowSystem @@ -52,7 +52,7 @@ index 43a45c7b9..57d0f6f74 100644 ) if (BUILD_DESKTOP) - find_package(KF5 ${KF5_REQUIRED_VERSION} REQUIRED COMPONENTS Parts Crash) + find_package(KF5 ${KF5_REQUIRED_VERSION} REQUIRED COMPONENTS Parts Crash IconThemes) endif() -if(KF5Wallet_FOUND)
