1 |
commit: e4d8b169b44eca034e4a9850fa63d42ec5df2669 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Jul 16 13:58:42 2021 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jul 16 15:20:49 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4d8b169 |
7 |
|
8 |
kde-apps/okular: Fix fictionbook loading |
9 |
|
10 |
Upstream commit 504eec7688e7139e9d193fc2b3ddafac0f835b6f |
11 |
|
12 |
See also: https://mail.kde.org/pipermail/distributions/2021-July/001034.html |
13 |
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=439807 |
14 |
Package-Manager: Portage-3.0.20, Repoman-3.0.3 |
15 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
16 |
|
17 |
.../okular-21.04.3-fix-fictionbook-support.patch | 27 ++++++ |
18 |
kde-apps/okular/okular-21.04.3-r1.ebuild | 108 +++++++++++++++++++++ |
19 |
2 files changed, 135 insertions(+) |
20 |
|
21 |
diff --git a/kde-apps/okular/files/okular-21.04.3-fix-fictionbook-support.patch b/kde-apps/okular/files/okular-21.04.3-fix-fictionbook-support.patch |
22 |
new file mode 100644 |
23 |
index 00000000000..061db80d2bc |
24 |
--- /dev/null |
25 |
+++ b/kde-apps/okular/files/okular-21.04.3-fix-fictionbook-support.patch |
26 |
@@ -0,0 +1,27 @@ |
27 |
+From 504eec7688e7139e9d193fc2b3ddafac0f835b6f Mon Sep 17 00:00:00 2001 |
28 |
+From: Yaroslav Sidlovsky <zawertun@×××××.com> |
29 |
+Date: Mon, 12 Jul 2021 11:06:26 +0300 |
30 |
+Subject: [PATCH] Fix non unique KPlugin Id for fictionbook generator |
31 |
+ |
32 |
+BUG: 439807 |
33 |
+(cherry picked from commit 8dc58c7617abcacf9325e5b93a5e38149f6e2aaf) |
34 |
+--- |
35 |
+ generators/fictionbook/libokularGenerator_fb.json | 2 +- |
36 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
37 |
+ |
38 |
+diff --git a/generators/fictionbook/libokularGenerator_fb.json b/generators/fictionbook/libokularGenerator_fb.json |
39 |
+index 1ef01a2d5..3d499a50f 100644 |
40 |
+--- a/generators/fictionbook/libokularGenerator_fb.json |
41 |
++++ b/generators/fictionbook/libokularGenerator_fb.json |
42 |
+@@ -120,7 +120,7 @@ |
43 |
+ "Description[x-test]": "xxA renderer for FictionBook eBooksxx", |
44 |
+ "Description[zh_CN]": "FictionBook 电子书渲染器", |
45 |
+ "Description[zh_TW]": "FictionBook 電子書成像器", |
46 |
+- "Id": "okular_fax", |
47 |
++ "Id": "okular_fictionbook", |
48 |
+ "License": "GPL", |
49 |
+ "MimeTypes": [ |
50 |
+ "application/x-fictionbook+xml" |
51 |
+-- |
52 |
+GitLab |
53 |
+ |
54 |
|
55 |
diff --git a/kde-apps/okular/okular-21.04.3-r1.ebuild b/kde-apps/okular/okular-21.04.3-r1.ebuild |
56 |
new file mode 100644 |
57 |
index 00000000000..45e203a7aa5 |
58 |
--- /dev/null |
59 |
+++ b/kde-apps/okular/okular-21.04.3-r1.ebuild |
60 |
@@ -0,0 +1,108 @@ |
61 |
+# Copyright 1999-2021 Gentoo Authors |
62 |
+# Distributed under the terms of the GNU General Public License v2 |
63 |
+ |
64 |
+EAPI=7 |
65 |
+ |
66 |
+ECM_HANDBOOK="forceoptional" |
67 |
+ECM_TEST="forceoptional" |
68 |
+PVCUT=$(ver_cut 1-3) |
69 |
+KFMIN=5.80.0 |
70 |
+QTMIN=5.15.2 |
71 |
+VIRTUALX_REQUIRED="test" |
72 |
+inherit ecm kde.org |
73 |
+ |
74 |
+DESCRIPTION="Universal document viewer based on KDE Frameworks" |
75 |
+HOMEPAGE="https://okular.kde.org https://apps.kde.org/okular/" |
76 |
+ |
77 |
+LICENSE="GPL-2" # TODO: CHECK |
78 |
+SLOT="5" |
79 |
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" |
80 |
+IUSE="chm djvu epub +image-backend markdown mobi +pdf +plucker +postscript qml share speech +tiff" |
81 |
+ |
82 |
+DEPEND=" |
83 |
+ >=dev-qt/qtdbus-${QTMIN}:5 |
84 |
+ >=dev-qt/qtgui-${QTMIN}:5 |
85 |
+ >=dev-qt/qtprintsupport-${QTMIN}:5 |
86 |
+ >=dev-qt/qtsvg-${QTMIN}:5 |
87 |
+ >=dev-qt/qtwidgets-${QTMIN}:5 |
88 |
+ >=kde-frameworks/kactivities-${KFMIN}:5 |
89 |
+ >=kde-frameworks/karchive-${KFMIN}:5 |
90 |
+ >=kde-frameworks/kbookmarks-${KFMIN}:5 |
91 |
+ >=kde-frameworks/kcompletion-${KFMIN}:5 |
92 |
+ >=kde-frameworks/kconfig-${KFMIN}:5 |
93 |
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5 |
94 |
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5 |
95 |
+ >=kde-frameworks/kcrash-${KFMIN}:5 |
96 |
+ >=kde-frameworks/kio-${KFMIN}:5 |
97 |
+ >=kde-frameworks/kjs-${KFMIN}:5 |
98 |
+ >=kde-frameworks/kparts-${KFMIN}:5 |
99 |
+ >=kde-frameworks/kpty-${KFMIN}:5 |
100 |
+ >=kde-frameworks/kwallet-${KFMIN}:5 |
101 |
+ >=kde-frameworks/threadweaver-${KFMIN}:5 |
102 |
+ media-libs/freetype |
103 |
+ >=media-libs/phonon-4.11.0 |
104 |
+ sys-libs/zlib |
105 |
+ chm? ( |
106 |
+ dev-libs/chmlib |
107 |
+ dev-libs/libzip:= |
108 |
+ >=kde-frameworks/khtml-${KFMIN}:5 |
109 |
+ ) |
110 |
+ djvu? ( app-text/djvu ) |
111 |
+ epub? ( app-text/ebook-tools ) |
112 |
+ image-backend? ( |
113 |
+ >=dev-qt/qtgui-${QTMIN}:5[gif,jpeg,png] |
114 |
+ >=kde-apps/libkexiv2-${PVCUT}:5 |
115 |
+ ) |
116 |
+ markdown? ( app-text/discount ) |
117 |
+ mobi? ( >=kde-apps/kdegraphics-mobipocket-${PVCUT}:5 ) |
118 |
+ pdf? ( app-text/poppler[nss,qt5] ) |
119 |
+ plucker? ( virtual/jpeg:0 ) |
120 |
+ postscript? ( app-text/libspectre ) |
121 |
+ share? ( >=kde-frameworks/purpose-${KFMIN}:5 ) |
122 |
+ speech? ( >=dev-qt/qtspeech-${QTMIN}:5 ) |
123 |
+ tiff? ( media-libs/tiff:0 ) |
124 |
+" |
125 |
+RDEPEND="${DEPEND} |
126 |
+ image-backend? ( >=kde-frameworks/kimageformats-${KFMIN}:5 ) |
127 |
+ qml? ( |
128 |
+ >=dev-qt/qtquickcontrols2-${QTMIN}:5 |
129 |
+ >=kde-frameworks/kirigami-${KFMIN}:5 |
130 |
+ ) |
131 |
+" |
132 |
+ |
133 |
+PATCHES=( |
134 |
+ "${FILESDIR}/${PN}-20.11.90-tests.patch" # bug 734138 |
135 |
+ "${FILESDIR}/${PN}-20.08.2-hide-mobile-app.patch" # avoid same-name entry |
136 |
+ "${FILESDIR}/${P}-fix-fictionbook-support.patch" # KDE-bug 439807 |
137 |
+) |
138 |
+ |
139 |
+src_configure() { |
140 |
+ local mycmakeargs=( |
141 |
+ -DOKULAR_UI=$(usex qml "both" "desktop") |
142 |
+ $(cmake_use_find_package chm CHM) |
143 |
+ $(cmake_use_find_package chm KF5KHtml) |
144 |
+ $(cmake_use_find_package chm LibZip) |
145 |
+ $(cmake_use_find_package djvu DjVuLibre) |
146 |
+ $(cmake_use_find_package epub EPub) |
147 |
+ $(cmake_use_find_package image-backend KF5KExiv2) |
148 |
+ $(cmake_use_find_package markdown Discount) |
149 |
+ $(cmake_use_find_package mobi QMobipocket) |
150 |
+ $(cmake_use_find_package pdf Poppler) |
151 |
+ $(cmake_use_find_package plucker JPEG) |
152 |
+ $(cmake_use_find_package postscript LibSpectre) |
153 |
+ $(cmake_use_find_package share KF5Purpose) |
154 |
+ $(cmake_use_find_package speech Qt5TextToSpeech) |
155 |
+ $(cmake_use_find_package tiff TIFF) |
156 |
+ ) |
157 |
+ ecm_src_configure |
158 |
+} |
159 |
+ |
160 |
+src_test() { |
161 |
+ # mainshelltest hangs, chmgeneratortest fails, bug #603116 |
162 |
+ # parttest hangs, bug #641728, annotationtoolbartest fails, KDE-Bug #429640 |
163 |
+ local myctestargs=( |
164 |
+ -E "(mainshelltest|chmgeneratortest|parttest|annotationtoolbartest)" |
165 |
+ ) |
166 |
+ |
167 |
+ ecm_src_test |
168 |
+} |