summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2022-10-08 16:15:35 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2022-10-09 18:38:32 +0200
commit27c84d21210e38373378626b165106b7b54dbc1e (patch)
tree41bc065c34183f364819f5594b331e2dd4cd80c8
parentc6bad419643c88a279123018c102089a885b6726 (diff)
downloadkde-27c84d21210e38373378626b165106b7b54dbc1e.tar.gz
kde-27c84d21210e38373378626b165106b7b54dbc1e.tar.bz2
kde-27c84d21210e38373378626b165106b7b54dbc1e.zip
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 <asturm@gentoo.org>
-rw-r--r--kde-plasma/drkonqi/Manifest1
-rw-r--r--kde-plasma/drkonqi/drkonqi-5.26.0.ebuild6
-rw-r--r--kde-plasma/drkonqi/drkonqi-5.26.49.9999.ebuild6
-rw-r--r--kde-plasma/drkonqi/drkonqi-9999.ebuild3
4 files changed, 14 insertions, 2 deletions
diff --git a/kde-plasma/drkonqi/Manifest b/kde-plasma/drkonqi/Manifest
index 9b9e0e2c85f..e63f61109c4 100644
--- a/kde-plasma/drkonqi/Manifest
+++ b/kde-plasma/drkonqi/Manifest
@@ -1,2 +1,3 @@
DIST drkonqi-5.25.90.tar.xz 505392 BLAKE2B f52948443e96e8a95013397e173dba1a0a69c7c7d1db908f459a520025790a5e9c3998788acf118b599dc54171c947e5bc0088f38f783977830af246dbd8b1b6 SHA512 590262c21290c21cb818843b123553b2b517f9217c6402baac16c89b1d976a5dea2bd25b768c2f627b382bc2e0d807911a6c7ca0b44e8cf82f28462faa945adc
+DIST drkonqi-5.26.0-revert-add-sentry-support.patch.xz 11656 BLAKE2B dd35a147bc22b5af9e37c61f5013db6f2018154ecdcccd0c6463f55242ed9dbbe71f0268f8b0fa75b835f400403aaecbc2d2a6e1de434276acd2cc3a31ff6611 SHA512 417f760469854f5822af82fd9eecbb653f81c37465ae8704df1cf6e344ed072d26eeb60f809bb95e64e019a10d71ea77b3e7d98530e62f5c5a63fb1b8319b33a
DIST drkonqi-5.26.0.tar.xz 505600 BLAKE2B bb1090b63ae8fa4407d16ee00bb20d6e7a30b3230a2355822150c0b10b16c3ab242fdd3a0d7a8259d03f9eb56ea28dde425e44fbe5008853846dd4b89430bfd5 SHA512 158231fc87737765d0a2f62cefb524cef9a02469d0df25383ac44b2058b5869998a139d0e31d6f4cb3adaa9827f46a74cbe722ec361e65650bd6aab726db037f
diff --git a/kde-plasma/drkonqi/drkonqi-5.26.0.ebuild b/kde-plasma/drkonqi/drkonqi-5.26.0.ebuild
index 6ec5862e42a..ec55bd91b61 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 0d5d7cb5ac7..81c09173fbb 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 99f20e9de83..39362039fc6 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=(