summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2021-07-16 15:58:42 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2021-07-16 17:20:49 +0200
commite4d8b169b44eca034e4a9850fa63d42ec5df2669 (patch)
treec7eeee978c8c871586ff362081555bac439d4d8a
parentapp-metrics/node_exporter: Version bump (v1.2.0) (diff)
downloadgentoo-e4d8b169b44eca034e4a9850fa63d42ec5df2669.tar.gz
gentoo-e4d8b169b44eca034e4a9850fa63d42ec5df2669.tar.bz2
gentoo-e4d8b169b44eca034e4a9850fa63d42ec5df2669.zip
kde-apps/okular: Fix fictionbook loading
Upstream commit 504eec7688e7139e9d193fc2b3ddafac0f835b6f See also: https://mail.kde.org/pipermail/distributions/2021-July/001034.html KDE-bug: https://bugs.kde.org/show_bug.cgi?id=439807 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
-rw-r--r--kde-apps/okular/files/okular-21.04.3-fix-fictionbook-support.patch27
-rw-r--r--kde-apps/okular/okular-21.04.3-r1.ebuild108
2 files changed, 135 insertions, 0 deletions
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
new file mode 100644
index 000000000000..061db80d2bc5
--- /dev/null
+++ b/kde-apps/okular/files/okular-21.04.3-fix-fictionbook-support.patch
@@ -0,0 +1,27 @@
+From 504eec7688e7139e9d193fc2b3ddafac0f835b6f Mon Sep 17 00:00:00 2001
+From: Yaroslav Sidlovsky <zawertun@gmail.com>
+Date: Mon, 12 Jul 2021 11:06:26 +0300
+Subject: [PATCH] Fix non unique KPlugin Id for fictionbook generator
+
+BUG: 439807
+(cherry picked from commit 8dc58c7617abcacf9325e5b93a5e38149f6e2aaf)
+---
+ generators/fictionbook/libokularGenerator_fb.json | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/generators/fictionbook/libokularGenerator_fb.json b/generators/fictionbook/libokularGenerator_fb.json
+index 1ef01a2d5..3d499a50f 100644
+--- a/generators/fictionbook/libokularGenerator_fb.json
++++ b/generators/fictionbook/libokularGenerator_fb.json
+@@ -120,7 +120,7 @@
+ "Description[x-test]": "xxA renderer for FictionBook eBooksxx",
+ "Description[zh_CN]": "FictionBook 电子书渲染器",
+ "Description[zh_TW]": "FictionBook 電子書成像器",
+- "Id": "okular_fax",
++ "Id": "okular_fictionbook",
+ "License": "GPL",
+ "MimeTypes": [
+ "application/x-fictionbook+xml"
+--
+GitLab
+
diff --git a/kde-apps/okular/okular-21.04.3-r1.ebuild b/kde-apps/okular/okular-21.04.3-r1.ebuild
new file mode 100644
index 000000000000..45e203a7aa5b
--- /dev/null
+++ b/kde-apps/okular/okular-21.04.3-r1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.80.0
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Universal document viewer based on KDE Frameworks"
+HOMEPAGE="https://okular.kde.org https://apps.kde.org/okular/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="chm djvu epub +image-backend markdown mobi +pdf +plucker +postscript qml share speech +tiff"
+
+DEPEND="
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtprintsupport-${QTMIN}:5
+ >=dev-qt/qtsvg-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=kde-frameworks/kactivities-${KFMIN}:5
+ >=kde-frameworks/karchive-${KFMIN}:5
+ >=kde-frameworks/kbookmarks-${KFMIN}:5
+ >=kde-frameworks/kcompletion-${KFMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/kcrash-${KFMIN}:5
+ >=kde-frameworks/kio-${KFMIN}:5
+ >=kde-frameworks/kjs-${KFMIN}:5
+ >=kde-frameworks/kparts-${KFMIN}:5
+ >=kde-frameworks/kpty-${KFMIN}:5
+ >=kde-frameworks/kwallet-${KFMIN}:5
+ >=kde-frameworks/threadweaver-${KFMIN}:5
+ media-libs/freetype
+ >=media-libs/phonon-4.11.0
+ sys-libs/zlib
+ chm? (
+ dev-libs/chmlib
+ dev-libs/libzip:=
+ >=kde-frameworks/khtml-${KFMIN}:5
+ )
+ djvu? ( app-text/djvu )
+ epub? ( app-text/ebook-tools )
+ image-backend? (
+ >=dev-qt/qtgui-${QTMIN}:5[gif,jpeg,png]
+ >=kde-apps/libkexiv2-${PVCUT}:5
+ )
+ markdown? ( app-text/discount )
+ mobi? ( >=kde-apps/kdegraphics-mobipocket-${PVCUT}:5 )
+ pdf? ( app-text/poppler[nss,qt5] )
+ plucker? ( virtual/jpeg:0 )
+ postscript? ( app-text/libspectre )
+ share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
+ speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )
+ tiff? ( media-libs/tiff:0 )
+"
+RDEPEND="${DEPEND}
+ image-backend? ( >=kde-frameworks/kimageformats-${KFMIN}:5 )
+ qml? (
+ >=dev-qt/qtquickcontrols2-${QTMIN}:5
+ >=kde-frameworks/kirigami-${KFMIN}:5
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-20.11.90-tests.patch" # bug 734138
+ "${FILESDIR}/${PN}-20.08.2-hide-mobile-app.patch" # avoid same-name entry
+ "${FILESDIR}/${P}-fix-fictionbook-support.patch" # KDE-bug 439807
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DOKULAR_UI=$(usex qml "both" "desktop")
+ $(cmake_use_find_package chm CHM)
+ $(cmake_use_find_package chm KF5KHtml)
+ $(cmake_use_find_package chm LibZip)
+ $(cmake_use_find_package djvu DjVuLibre)
+ $(cmake_use_find_package epub EPub)
+ $(cmake_use_find_package image-backend KF5KExiv2)
+ $(cmake_use_find_package markdown Discount)
+ $(cmake_use_find_package mobi QMobipocket)
+ $(cmake_use_find_package pdf Poppler)
+ $(cmake_use_find_package plucker JPEG)
+ $(cmake_use_find_package postscript LibSpectre)
+ $(cmake_use_find_package share KF5Purpose)
+ $(cmake_use_find_package speech Qt5TextToSpeech)
+ $(cmake_use_find_package tiff TIFF)
+ )
+ ecm_src_configure
+}
+
+src_test() {
+ # mainshelltest hangs, chmgeneratortest fails, bug #603116
+ # parttest hangs, bug #641728, annotationtoolbartest fails, KDE-Bug #429640
+ local myctestargs=(
+ -E "(mainshelltest|chmgeneratortest|parttest|annotationtoolbartest)"
+ )
+
+ ecm_src_test
+}