| 1 |
commit: a626daadc0d9e5626aaa1ee3b52580e523b90b6c |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Mar 30 05:47:38 2022 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Mar 30 05:47:38 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=a626daad |
| 7 |
|
| 8 |
kde-apps/okular: Rebase optional-options patch on top of 22.07.70 |
| 9 |
|
| 10 |
Reported-by: Duncan <1i5t5.duncan <AT> cox.net> |
| 11 |
Closes: https://bugs.gentoo.org/836389 |
| 12 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
| 13 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 14 |
|
| 15 |
kde-apps/okular/files/okular-22.07.70-optional-options.patch | 8 ++++---- |
| 16 |
1 file changed, 4 insertions(+), 4 deletions(-) |
| 17 |
|
| 18 |
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 |
| 19 |
index 6c83b03e06..0cadfe415d 100644 |
| 20 |
--- a/kde-apps/okular/files/okular-22.07.70-optional-options.patch |
| 21 |
+++ b/kde-apps/okular/files/okular-22.07.70-optional-options.patch |
| 22 |
@@ -1,4 +1,4 @@ |
| 23 |
-From 86729e7698250dcb11ccbec0a6cc9690501ad691 Mon Sep 17 00:00:00 2001 |
| 24 |
+From f29b89d8ac7fcca1cf74462dcc33da24551c924f Mon Sep 17 00:00:00 2001 |
| 25 |
From: Andreas Sturmlechner <asturm@g.o> |
| 26 |
Date: Tue, 31 Aug 2021 16:48:42 +0200 |
| 27 |
Subject: [PATCH] Make WITH_KWALLET and WITH_KJS proper cmake options |
| 28 |
@@ -21,7 +21,7 @@ Signed-off-by: Andreas Sturmlechner <asturm@g.o> |
| 29 |
4 files changed, 16 insertions(+), 13 deletions(-) |
| 30 |
|
| 31 |
diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 32 |
-index 43a45c7b9..57d0f6f74 100644 |
| 33 |
+index 547671f24..f1e14fa8b 100644 |
| 34 |
--- a/CMakeLists.txt |
| 35 |
+++ b/CMakeLists.txt |
| 36 |
@@ -91,12 +91,9 @@ ecm_setup_qtplugin_macro_names( |
| 37 |
@@ -40,7 +40,7 @@ index 43a45c7b9..57d0f6f74 100644 |
| 38 |
|
| 39 |
find_package(KF5 ${KF5_REQUIRED_VERSION} REQUIRED COMPONENTS |
| 40 |
Archive |
| 41 |
-@@ -111,21 +108,19 @@ find_package(KF5 ${KF5_REQUIRED_VERSION} REQUIRED COMPONENTS |
| 42 |
+@@ -110,21 +107,19 @@ find_package(KF5 ${KF5_REQUIRED_VERSION} REQUIRED COMPONENTS |
| 43 |
TextWidgets |
| 44 |
ThreadWeaver |
| 45 |
WindowSystem |
| 46 |
@@ -52,7 +52,7 @@ index 43a45c7b9..57d0f6f74 100644 |
| 47 |
) |
| 48 |
|
| 49 |
if (BUILD_DESKTOP) |
| 50 |
- find_package(KF5 ${KF5_REQUIRED_VERSION} REQUIRED COMPONENTS Parts Crash) |
| 51 |
+ find_package(KF5 ${KF5_REQUIRED_VERSION} REQUIRED COMPONENTS Parts Crash IconThemes) |
| 52 |
endif() |
| 53 |
|
| 54 |
-if(KF5Wallet_FOUND) |
Archives