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 8EDDE158094 for ; Sun, 9 Oct 2022 16:39:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 050C6E0928; Sun, 9 Oct 2022 16:39:30 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E4E04E0928 for ; Sun, 9 Oct 2022 16:39:29 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3583A341057 for ; Sun, 9 Oct 2022 16:39:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E9D8A622 for ; Sun, 9 Oct 2022 16:39:25 +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: <1665333512.27c84d21210e38373378626b165106b7b54dbc1e.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/drkonqi/ X-VCS-Repository: proj/kde X-VCS-Files: kde-plasma/drkonqi/drkonqi-5.26.0.ebuild kde-plasma/drkonqi/drkonqi-5.26.49.9999.ebuild kde-plasma/drkonqi/drkonqi-9999.ebuild X-VCS-Directories: kde-plasma/drkonqi/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 27c84d21210e38373378626b165106b7b54dbc1e X-VCS-Branch: master Date: Sun, 9 Oct 2022 16:39:25 +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: df86f487-6aed-4b8e-b12f-d84ae85380d4 X-Archives-Hash: 9b037aa508fc0615e80df93cea75ea20 commit: 27c84d21210e38373378626b165106b7b54dbc1e Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Oct 8 14:15:35 2022 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Oct 9 16:38:32 2022 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=27c84d21 kde-plasma/drkonqi: Revert add sentry support Reverting upstream commit a0c91d851f98a521518a7d8f51f9925cf650d19d plus follow-up fixes minus irrelevant upstream CI bits to avoid hard-dependency on dev-libs/kuserfeedback for now. Bug: https://bugs.gentoo.org/871759 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-plasma/drkonqi/drkonqi-5.26.0.ebuild | 6 +++++- kde-plasma/drkonqi/drkonqi-5.26.49.9999.ebuild | 6 +++++- kde-plasma/drkonqi/drkonqi-9999.ebuild | 3 +++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/kde-plasma/drkonqi/drkonqi-5.26.0.ebuild b/kde-plasma/drkonqi/drkonqi-5.26.0.ebuild index 6ec5862e42..ec55bd91b6 100644 --- a/kde-plasma/drkonqi/drkonqi-5.26.0.ebuild +++ b/kde-plasma/drkonqi/drkonqi-5.26.0.ebuild @@ -9,6 +9,7 @@ QTMIN=5.15.5 inherit ecm plasma.kde.org DESCRIPTION="Plasma crash handler, gives the user feedback if a program crashed" +SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PN}-5.26.0-revert-add-sentry-support.patch.xz" LICENSE="GPL-2" # TODO: CHECK SLOT="5" @@ -48,7 +49,10 @@ RDEPEND="${COMMON_DEPEND} ) " -PATCHES=( "${FILESDIR}/${PN}-5.25.90-unused-dep.patch" ) +PATCHES=( + "${FILESDIR}/${PN}-5.25.90-unused-dep.patch" # git master + "${WORKDIR}/${P}-revert-add-sentry-support.patch" # bug 871759 +) src_test() { # needs network access, bug #698510 diff --git a/kde-plasma/drkonqi/drkonqi-5.26.49.9999.ebuild b/kde-plasma/drkonqi/drkonqi-5.26.49.9999.ebuild index 0d5d7cb5ac..81c09173fb 100644 --- a/kde-plasma/drkonqi/drkonqi-5.26.49.9999.ebuild +++ b/kde-plasma/drkonqi/drkonqi-5.26.49.9999.ebuild @@ -9,6 +9,7 @@ QTMIN=5.15.5 inherit ecm plasma.kde.org DESCRIPTION="Plasma crash handler, gives the user feedback if a program crashed" +SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PN}-5.26.0-revert-add-sentry-support.patch.xz" LICENSE="GPL-2" # TODO: CHECK SLOT="5" @@ -48,7 +49,10 @@ RDEPEND="${COMMON_DEPEND} ) " -PATCHES=( "${FILESDIR}/${PN}-5.25.90-unused-dep.patch" ) +PATCHES=( + "${FILESDIR}/${PN}-5.25.90-unused-dep.patch" # git master + "${WORKDIR}/${PN}-5.26.0-revert-add-sentry-support.patch" # bug 871759 +) src_test() { # needs network access, bug #698510 diff --git a/kde-plasma/drkonqi/drkonqi-9999.ebuild b/kde-plasma/drkonqi/drkonqi-9999.ebuild index 99f20e9de8..39362039fc 100644 --- a/kde-plasma/drkonqi/drkonqi-9999.ebuild +++ b/kde-plasma/drkonqi/drkonqi-9999.ebuild @@ -9,6 +9,7 @@ QTMIN=5.15.5 inherit ecm plasma.kde.org DESCRIPTION="Plasma crash handler, gives the user feedback if a program crashed" +SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PN}-5.26.0-revert-add-sentry-support.patch.xz" LICENSE="GPL-2" # TODO: CHECK SLOT="5" @@ -48,6 +49,8 @@ RDEPEND="${COMMON_DEPEND} ) " +PATCHES=( "${WORKDIR}/${PN}-5.26.0-revert-add-sentry-support.patch" ) # bug 871759 + src_test() { # needs network access, bug #698510 local myctestargs=(