commit: 9f0ca6c8ab9c49f68567c728ef6fab403d3222c6 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Thu Sep 17 18:22:09 2020 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Thu Sep 17 18:44:02 2020 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=9f0ca6c8
kde-apps/okular: Fix IUSE=mobile->qml, fix RDEPENDs, drop src_prepare Upstream commits: 8dfdfa69fcf1c90092b582ab8db1743458d27b34 c1b396af3e9a528288fe3d74bbaa487c4736d05b 1fb77446a7378368de5288ca9f57627ae2946d84 a96c082d6969c47b5738eb9b02d064a09232f0f9 fd44517bae86dba4c3cc6d2a8ef278998ee40e5a Package-Manager: Portage-3.0.7, Repoman-3.0.1 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../files/okular-20.08.2-hide-mobile-app.patch | 27 ++++++++++++++++++++++ kde-apps/okular/metadata.xml | 2 +- kde-apps/okular/okular-20.08.49.9999.ebuild | 18 +++++++-------- kde-apps/okular/okular-9999.ebuild | 19 +++++++-------- 4 files changed, 44 insertions(+), 22 deletions(-) diff --git a/kde-apps/okular/files/okular-20.08.2-hide-mobile-app.patch b/kde-apps/okular/files/okular-20.08.2-hide-mobile-app.patch new file mode 100644 index 0000000000..175e5c178c --- /dev/null +++ b/kde-apps/okular/files/okular-20.08.2-hide-mobile-app.patch @@ -0,0 +1,27 @@ +From 6f7f17a24a564ffbf712fd5e0917fcabc8d19229 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <[email protected]> +Date: Thu, 17 Sep 2020 20:36:37 +0200 +Subject: [PATCH] Revert "Don't hide the mobile app" + +We have no use for this on the desktop, but need it for peruse. + +This reverts commit 0991819a497594233b7564755bbc189009188bd0. +--- + mobile/app/package/metadata.desktop | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/mobile/app/package/metadata.desktop b/mobile/app/package/metadata.desktop +index f9432748b..0fcf20843 100644 +--- a/mobile/app/package/metadata.desktop ++++ b/mobile/app/package/metadata.desktop +@@ -110,6 +110,7 @@ GenericName[zh_TW]=文件檢視器 + Type=Application + Exec=okularkirigami + Icon=okular ++NoDisplay=true + X-KDE-ParentApp= + X-KDE-PluginInfo-Author=Marco Martin + [email protected] +-- +2.28.0 + diff --git a/kde-apps/okular/metadata.xml b/kde-apps/okular/metadata.xml index b36cde3d0a..f07864be71 100644 --- a/kde-apps/okular/metadata.xml +++ b/kde-apps/okular/metadata.xml @@ -11,8 +11,8 @@ <flag name="image-backend">Enable image viewing support</flag> <flag name="markdown">Enable Markdown support via <pkg>app-text/discount</pkg></flag> <flag name="mobi">Enable mobipocket support</flag> - <flag name="mobile">Enable Plasma mobile support</flag> <flag name="plucker">Enable Plucker E-Book for Palm OS devices support</flag> + <flag name="qml">Install Okular Qml components</flag> <flag name="share">Enable support for a share menu using <pkg>kde-frameworks/purpose</pkg></flag> <flag name="speech">Enable text-to-speech support</flag> </use> diff --git a/kde-apps/okular/okular-20.08.49.9999.ebuild b/kde-apps/okular/okular-20.08.49.9999.ebuild index 2ad5264100..32174dc6b1 100644 --- a/kde-apps/okular/okular-20.08.49.9999.ebuild +++ b/kde-apps/okular/okular-20.08.49.9999.ebuild @@ -17,7 +17,7 @@ HOMEPAGE="https://okular.kde.org https://kde.org/applications/office/org.kde.oku LICENSE="GPL-2" # TODO: CHECK SLOT="5" KEYWORDS="" -IUSE="chm crypt djvu epub +image-backend markdown mobi mobile +pdf plucker +postscript share speech +tiff" +IUSE="chm crypt djvu epub +image-backend markdown mobi +pdf plucker +postscript qml share speech +tiff" DEPEND=" >=dev-qt/qtdbus-${QTMIN}:5 @@ -64,22 +64,20 @@ DEPEND=" " RDEPEND="${DEPEND} image-backend? ( >=kde-frameworks/kimageformats-${KFMIN}:5 ) - mobile? ( - >=dev-qt/qtquickcontrols-${QTMIN}:5 + qml? ( + >=dev-qt/qtquickcontrols2-${QTMIN}:5 >=kde-frameworks/kirigami-${KFMIN}:5 ) " -PATCHES=( "${FILESDIR}/${PN}-20.07.90-tests.patch" ) # bug 734138 - -src_prepare() { - ecm_src_prepare - use mobile || cmake_comment_add_subdirectory mobile - use test || cmake_comment_add_subdirectory conf/autotests -} +PATCHES=( + "${FILESDIR}/${PN}-20.07.90-tests.patch" # bug 734138 + "${FILESDIR}/${PN}-20.08.2-hide-mobile-app.patch" # avoid same-name entry +) src_configure() { local mycmakeargs=( + -DOKULAR_UI=$(usex qml "both" "desktop") $(cmake_use_find_package chm CHM) $(cmake_use_find_package crypt Qca-qt5) $(cmake_use_find_package djvu DjVuLibre) diff --git a/kde-apps/okular/okular-9999.ebuild b/kde-apps/okular/okular-9999.ebuild index 31ff3ae80a..8fd7c53e3c 100644 --- a/kde-apps/okular/okular-9999.ebuild +++ b/kde-apps/okular/okular-9999.ebuild @@ -17,7 +17,7 @@ HOMEPAGE="https://okular.kde.org https://kde.org/applications/office/org.kde.oku LICENSE="GPL-2" # TODO: CHECK SLOT="5" KEYWORDS="" -IUSE="chm crypt djvu epub +image-backend markdown mobi mobile +pdf plucker +postscript share speech +tiff" +IUSE="chm crypt djvu epub +image-backend markdown mobi +pdf plucker +postscript qml share speech +tiff" DEPEND=" >=dev-qt/qtdbus-${QTMIN}:5 @@ -64,22 +64,20 @@ DEPEND=" " RDEPEND="${DEPEND} image-backend? ( >=kde-frameworks/kimageformats-${KFMIN}:5 ) - mobile? ( - >=dev-qt/qtquickcontrols-${QTMIN}:5 + qml? ( + >=dev-qt/qtquickcontrols2-${QTMIN}:5 >=kde-frameworks/kirigami-${KFMIN}:5 ) " -PATCHES=( "${FILESDIR}/${PN}-20.07.90-tests.patch" ) # bug 734138 - -src_prepare() { - ecm_src_prepare - use mobile || cmake_comment_add_subdirectory mobile - use test || cmake_comment_add_subdirectory conf/autotests -} +PATCHES=( + "${FILESDIR}/${PN}-20.07.90-tests.patch" # bug 734138 + "${FILESDIR}/${PN}-20.08.2-hide-mobile-app.patch" # avoid same-name entry +) src_configure() { local mycmakeargs=( + -DOKULAR_UI=$(usex qml "both" "desktop") $(cmake_use_find_package chm CHM) $(cmake_use_find_package crypt Qca-qt5) $(cmake_use_find_package djvu DjVuLibre) @@ -94,7 +92,6 @@ src_configure() { $(cmake_use_find_package speech Qt5TextToSpeech) $(cmake_use_find_package tiff TIFF) ) - ecm_src_configure }
