1 |
commit: 5ae8e84212b45052fdd9113379c50994657839ff |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon May 9 05:33:22 2022 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon May 9 05:38:38 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=5ae8e842 |
7 |
|
8 |
kde-apps/okular: Drop obsolete patch |
9 |
|
10 |
Upstream commit 913d437822f23730d10bf97c3ed9201f936a33a2 |
11 |
|
12 |
Closes: https://bugs.gentoo.org/829509 |
13 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
14 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
15 |
|
16 |
kde-apps/okular/okular-9999.ebuild | 6 +++--- |
17 |
1 file changed, 3 insertions(+), 3 deletions(-) |
18 |
|
19 |
diff --git a/kde-apps/okular/okular-9999.ebuild b/kde-apps/okular/okular-9999.ebuild |
20 |
index 222d0bef65..8a47d39f2d 100644 |
21 |
--- a/kde-apps/okular/okular-9999.ebuild |
22 |
+++ b/kde-apps/okular/okular-9999.ebuild |
23 |
@@ -3,7 +3,7 @@ |
24 |
|
25 |
EAPI=8 |
26 |
|
27 |
-ECM_HANDBOOK="forceoptional" |
28 |
+ECM_HANDBOOK="optional" |
29 |
ECM_TEST="forceoptional" |
30 |
PVCUT=$(ver_cut 1-3) |
31 |
KFMIN=5.92.0 |
32 |
@@ -70,7 +70,6 @@ RDEPEND="${DEPEND} |
33 |
PATCHES=( |
34 |
"${FILESDIR}/${PN}-21.11.80-tests.patch" # bug 734138 |
35 |
"${FILESDIR}/${PN}-20.08.2-hide-mobile-app.patch" # avoid same-name entry |
36 |
- "${FILESDIR}/${PN}-22.04.0-optional-options.patch" # bug 810958 |
37 |
) |
38 |
|
39 |
src_configure() { |
40 |
@@ -78,8 +77,9 @@ src_configure() { |
41 |
-DCMAKE_DISABLE_FIND_PACKAGE_CHM=ON |
42 |
-DCMAKE_DISABLE_FIND_PACKAGE_KF5KHtml=ON |
43 |
-DCMAKE_DISABLE_FIND_PACKAGE_LibZip=ON |
44 |
+ -DFORCE_NOT_REQUIRED_DEPENDENCIES="KF5DocTools;CHM;KF5KHtml;LibZip;KF5Wallet;DjVuLibre;EPub;KF5KExiv2;Discount;QMobipocket;Poppler;JPEG;LibSpectre;KF5Purpose;Qt5TextToSpeech;TIFF;" |
45 |
-DOKULAR_UI=$(usex qml "both" "desktop") |
46 |
- -DWITH_KWALLET=$(usex crypt) |
47 |
+ $(cmake_use_find_package crypt KF5Wallet) |
48 |
$(cmake_use_find_package djvu DjVuLibre) |
49 |
$(cmake_use_find_package epub EPub) |
50 |
$(cmake_use_find_package image-backend KF5KExiv2) |