commit: 85158026a6962c95119add10dd1d858d26d3a447 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Wed Nov 16 19:03:59 2022 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Wed Nov 16 19:07:18 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85158026
kde-apps/okular: Drop version check broken by KF-5.100 Upstream commit d25eaebc8004aa69b4eca3cacfef2701e728c8ef Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> ...ular-22.08.3-drop-broken-kf-version-check.patch | 30 ++++++++++++++++++++++ kde-apps/okular/okular-22.08.3.ebuild | 1 + 2 files changed, 31 insertions(+) diff --git a/kde-apps/okular/files/okular-22.08.3-drop-broken-kf-version-check.patch b/kde-apps/okular/files/okular-22.08.3-drop-broken-kf-version-check.patch new file mode 100644 index 000000000000..610f36663d27 --- /dev/null +++ b/kde-apps/okular/files/okular-22.08.3-drop-broken-kf-version-check.patch @@ -0,0 +1,30 @@ +From d25eaebc8004aa69b4eca3cacfef2701e728c8ef Mon Sep 17 00:00:00 2001 +From: Jonathan Esk-Riddell <[email protected]> +Date: Fri, 21 Oct 2022 11:47:53 +0100 +Subject: [PATCH] remove ecm_version check which breaks on 5.100, we already + depend on ecm 5.68 anyway so it serves no purpose + +--- + CMakeLists.txt | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 98cfd2b17..3817078c2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -611,11 +611,7 @@ install(FILES okular.upd DESTINATION ${KDE_INSTALL_KCONFUPDATEDIR}) + install( FILES okular_part.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} ) + install( FILES part/part.rc part/part-viewermode.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/okular ) + +-if (${ECM_VERSION} STRGREATER "5.58.0") +- install(FILES okular.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}) +-else() +- install(FILES okular.categories DESTINATION ${KDE_INSTALL_CONFDIR}) +-endif() ++install(FILES okular.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}) + + ki18n_install(po) + if(KF5DocTools_FOUND) +-- +GitLab + diff --git a/kde-apps/okular/okular-22.08.3.ebuild b/kde-apps/okular/okular-22.08.3.ebuild index 9693c79978ad..2bd095913a16 100644 --- a/kde-apps/okular/okular-22.08.3.ebuild +++ b/kde-apps/okular/okular-22.08.3.ebuild @@ -70,6 +70,7 @@ RDEPEND="${DEPEND} PATCHES=( "${FILESDIR}/${PN}-21.11.80-tests.patch" # bug 734138 "${FILESDIR}/${PN}-20.08.2-hide-mobile-app.patch" # avoid same-name entry + "${FILESDIR}/${P}-drop-broken-kf-version-check.patch" ) src_configure() {
