From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E63DA158021 for ; Wed, 16 Nov 2022 19:07:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 070FCE0824; Wed, 16 Nov 2022 19:07:27 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E0372E0824 for ; Wed, 16 Nov 2022 19:07:26 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DA24B340D96 for ; Wed, 16 Nov 2022 19:07:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4E4C673E for ; Wed, 16 Nov 2022 19:07:24 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1668625638.85158026a6962c95119add10dd1d858d26d3a447.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-apps/okular/files/, kde-apps/okular/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-apps/okular/files/okular-22.08.3-drop-broken-kf-version-check.patch kde-apps/okular/okular-22.08.3.ebuild X-VCS-Directories: kde-apps/okular/files/ kde-apps/okular/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 85158026a6962c95119add10dd1d858d26d3a447 X-VCS-Branch: master Date: Wed, 16 Nov 2022 19:07:24 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 805e86de-887c-4020-bc67-e01ae91d35e1 X-Archives-Hash: cf62aa5008696063d6b789795f9db7ce commit: 85158026a6962c95119add10dd1d858d26d3a447 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Nov 16 19:03:59 2022 +0000 Commit: Andreas Sturmlechner gentoo 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 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 +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() {