gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

Merge updates from master

Browse Source
This commit is contained in:
Repository mirror & CI
2026-09-23 14:45:49 +00:00
parent 54a84060a8 86f298a2aa
commit f42416c416
5 changed files with 4 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
kde-apps/okular/files/okular-25.11.70-hide-mobile-app.patch
View File

@@ -1,24 +0,0 @@
From 6f7f17a24a564ffbf712fd5e0917fcabc8d19229 Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <asturm@gentoo.org>
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,3 +110,4 @@ GenericName[zh_TW]=文件檢視器
Type=Application
Exec=okularkirigami
Icon=okular
+NoDisplay=true
--
2.28.0

25
kde-apps/okular/files/okular-26.07.70-hide-mobile-app.patch
View File

@@ -1,25 +0,0 @@
From 6f7f17a24a564ffbf712fd5e0917fcabc8d19229 Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <asturm@gentoo.org>
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,4 +110,5 @@ GenericName[zh_TW]=文件檢視器
Type=Application
Exec=okularkirigami
Icon=okular
Categories=Qt;KDE;Graphics;Office;Viewer;
+NoDisplay=true
--
2.28.0

1
kde-apps/okular/metadata.xml
View File

@@ -15,7 +15,6 @@
<flag name="epub">Enable E-Book support via <pkg>app-text/ebook-tools</pkg></flag>
<flag name="markdown">Enable Markdown support via <pkg>app-text/discount</pkg></flag>
<flag name="mobi">Enable mobipocket support via <pkg>kde-apps/kdegraphics-mobipocket</pkg></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>
</use>
</pkgmetadata>

6
kde-apps/okular/okular-26.04.3.ebuild
View File

@@ -16,7 +16,7 @@ HOMEPAGE="https://okular.kde.org https://apps.kde.org/okular/"
LICENSE="GPL-2" # TODO: CHECK
SLOT="6"
KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
IUSE="crypt djvu epub markdown mobi +pdf +postscript qml share speech +tiff"
IUSE="crypt djvu epub markdown mobi +pdf +postscript share speech +tiff"
# slot op: Uses Qt6::CorePrivate
DEPEND="
@@ -57,11 +57,9 @@ DEPEND="
"
RDEPEND="${DEPEND}
>=kde-frameworks/kimageformats-${KFMIN}:6
qml? ( >=kde-frameworks/kirigami-${KFMIN}:6 )
"
PATCHES=(
"${FILESDIR}/${PN}-25.11.70-hide-mobile-app.patch" # downstream; avoid same-name entry
"${FILESDIR}/${PN}-23.08.5-implicit-vasprintf.patch" # bug 922345; pending upstream
)
@@ -76,7 +74,7 @@ CMAKE_SKIP_TESTS=(
src_configure() {
local mycmakeargs=(
-DFORCE_NOT_REQUIRED_DEPENDENCIES="KF6DocTools;KF6Wallet;DjVuLibre;EPub;Discount;QMobipocket6;Poppler;LibSpectre;KF6Purpose;Qt6TextToSpeech;TIFF;"
-DOKULAR_UI=$(usex qml "both" "desktop")
-DOKULAR_UI=desktop
$(cmake_use_find_package crypt KF6Wallet)
$(cmake_use_find_package djvu DjVuLibre)
$(cmake_use_find_package epub EPub)

6
kde-apps/okular/okular-26.08.1.ebuild
View File

@@ -16,7 +16,7 @@ HOMEPAGE="https://okular.kde.org https://apps.kde.org/okular/"
LICENSE="GPL-2" # TODO: CHECK
SLOT="6"
KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
IUSE="crypt djvu epub markdown mobi +pdf +postscript qml share speech +tiff"
IUSE="crypt djvu epub markdown mobi +pdf +postscript share speech +tiff"
# slot op: Uses Qt6::CorePrivate
DEPEND="
@@ -57,11 +57,9 @@ DEPEND="
"
RDEPEND="${DEPEND}
>=kde-frameworks/kimageformats-${KFMIN}:6
qml? ( >=kde-frameworks/kirigami-${KFMIN}:6 )
"
PATCHES=(
"${FILESDIR}/${PN}-26.07.70-hide-mobile-app.patch" # downstream; avoid same-name entry
"${FILESDIR}/${PN}-23.08.5-implicit-vasprintf.patch" # bug 922345; pending upstream
)
@@ -76,7 +74,7 @@ CMAKE_SKIP_TESTS=(
src_configure() {
local mycmakeargs=(
-DFORCE_NOT_REQUIRED_DEPENDENCIES="KF6DocTools;KF6Wallet;DjVuLibre;EPub;Discount;QMobipocket6;Poppler;LibSpectre;KF6Purpose;Qt6TextToSpeech;TIFF;"
-DOKULAR_UI=$(usex qml "both" "desktop")
-DOKULAR_UI=desktop
$(cmake_use_find_package crypt KF6Wallet)
$(cmake_use_find_package djvu DjVuLibre)
$(cmake_use_find_package epub EPub)