Bug 895808 – [kde overlay] kde-plasma/drkonqi-5.27.1 applying patch fails

• Product: Gentoo Linux
• Status: RESOLVED FIXED

[Description Marius Stoica 2023-02-22 08:00:24 UTC]

Created attachment 853748 [details]
emerge --info

>>> Emerging (1 of 2) kde-plasma/drkonqi-5.27.1::kde
 * Fetching files in the background.
 * To view fetch progress, run in another terminal:
 * tail -f /var/log/emerge-fetch.log
 * drkonqi-5.27.1.tar.xz BLAKE2B SHA512 size ;-) ...                                                                            [ ok ]
 * drkonqi-5.26.80-revert-add-sentry-support.patch.xz BLAKE2B SHA512 size ;-) ...                                               [ ok ]
>>> Unpacking source...
>>> Unpacking drkonqi-5.27.1.tar.xz to /var/tmp/portage/kde-plasma/drkonqi-5.27.1/work
>>> Unpacking drkonqi-5.26.80-revert-add-sentry-support.patch.xz to /var/tmp/portage/kde-plasma/drkonqi-5.27.1/work
>>> Source unpacked in /var/tmp/portage/kde-plasma/drkonqi-5.27.1/work
>>> Preparing source in /var/tmp/portage/kde-plasma/drkonqi-5.27.1/work/drkonqi-5.27.1 ...
 * Source directory (CMAKE_USE_DIR): "/var/tmp/portage/kde-plasma/drkonqi-5.27.1/work/drkonqi-5.27.1"
 * Build directory  (BUILD_DIR):     "/var/tmp/portage/kde-plasma/drkonqi-5.27.1/work/drkonqi-5.27.1_build"
 * Applying drkonqi-5.26.80-revert-add-sentry-support.patch ...
patching file CMakeLists.txt
patching file src/CMakeLists.txt
patching file src/backtracegenerator.cpp
Hunk #2 FAILED at 178.
1 out of 3 hunks FAILED -- saving rejects to file src/backtracegenerator.cpp.rej
patching file src/backtracegenerator.h
patching file src/bugzillaintegration/reportinterface.cpp
Hunk #4 FAILED at 307.
1 out of 7 hunks FAILED -- saving rejects to file src/bugzillaintegration/reportinterface.cpp.rej
patching file src/bugzillaintegration/reportinterface.h
patching file src/bugzillaintegration/sentrybeacon.cpp
patching file src/bugzillaintegration/sentrybeacon.h
patching file src/config-drkonqi.h.cmake
patching file src/data/gdb/preamble.py
Hunk #1 FAILED at 1.
Hunk #2 succeeded at 578 (offset 11 lines).
Hunk #3 succeeded at 601 (offset 11 lines).
1 out of 3 hunks FAILED -- saving rejects to file src/data/gdb/preamble.py.rej
patching file src/qml/SendingPage.qml                                                                                           [ !! ]
 * ERROR: kde-plasma/drkonqi-5.27.1::kde failed (prepare phase):

[Comment 1 Sam James 2023-02-22 08:10:17 UTC]

My guess is https://invent.kde.org/plasma/drkonqi/-/commit/4fc0d8af1da0f93a2d09b11840240d4e74b0c785 and https://invent.kde.org/plasma/drkonqi/-/commit/621db2a810d4df69b81eab69916d92c2a963e292 fix this without needing a full revert but I'm not going to touch this as I'm not aware of the context in full.

The commit adding the patch is:
```

commit 27c84d21210e38373378626b165106b7b54dbc1e
Author: Andreas Sturmlechner <[e-mail]>
Date:   Sat Oct 8 16:15:35 2022 +0200

    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 <[e-mail]>
```

[Comment 2 Andreas Sturmlechner 2023-02-22 09:49:20 UTC]

We know, that's why it is not in ::gentoo.

[Comment 3 Larry the Git Cow 2023-02-22 10:21:10 UTC]

The bug has been closed via the following commit(s):

https://gitweb.gentoo.org/proj/kde.git/commit/?id=66f15b7606390cfc9bac416bdbe4437e87b80282

commit 66f15b7606390cfc9bac416bdbe4437e87b80282
Author:     Andreas Sturmlechner <[e-mail]>
AuthorDate: 2023-02-22 10:02:05 +0000
Commit:     Andreas Sturmlechner <[e-mail]>
CommitDate: 2023-02-22 10:06:08 +0000

    kde-plasma/drkonqi: Rebase revert-add-sentry-support.patch
    
    Closes: https://bugs.gentoo.org/895808
    Signed-off-by: Andreas Sturmlechner <[e-mail]>

 kde-plasma/drkonqi/Manifest                    | 2 +-
 kde-plasma/drkonqi/drkonqi-5.27.1.ebuild       | 4 ++--
 kde-plasma/drkonqi/drkonqi-5.27.49.9999.ebuild | 4 ++--
 kde-plasma/drkonqi/drkonqi-9999.ebuild         | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)