Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 740352 - kde-plasma/xdg-desktop-portal-kde-5.19.5-r1 fail at patch valid-desktop-file.patch Hunk #1 FAILED at 1
Summary: kde-plasma/xdg-desktop-portal-kde-5.19.5-r1 fail at patch valid-desktop-file....
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal normal (vote)
Assignee: Gentoo KDE team
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2020-09-04 11:31 UTC by jms
Modified: 2020-09-04 12:55 UTC (History)
0 users

See Also:
Package list:
Runtime testing required: ---


Attachments
emerge --info '=kde-plasma/xdg-desktop-portal-kde-5.19.5-r1::gentoo' (emerge-info.txt,8.07 KB, text/plain)
2020-09-04 11:33 UTC, jms
Details
build log (kde-plasma:xdg-desktop-portal-kde-5.19.5-r1:20200904-111827.log,3.33 KB, text/x-log)
2020-09-04 11:35 UTC, jms
Details

Note You need to log in before you can comment on or make changes to this bug.
Description jms 2020-09-04 11:31:12 UTC
fail to build

>>> Emerging (4 of 7) kde-plasma/xdg-desktop-portal-kde-5.19.5-r1::gentoo
* xdg-desktop-portal-kde-5.19.5.tar.xz BLAKE2B SHA512 size ;-) ...                                                                                  [ ok ]
>>> Unpacking source...
>>> Unpacking xdg-desktop-portal-kde-5.19.5.tar.xz to /var/tmp/portage/kde-plasma/xdg-desktop-portal-kde-5.19.5-r1/work
>>> Source unpacked in /var/tmp/portage/kde-plasma/xdg-desktop-portal-kde-5.19.5-r1/work
>>> Preparing source in /var/tmp/portage/kde-plasma/xdg-desktop-portal-kde-5.19.5-r1/work/xdg-desktop-portal-kde-5.19.5 ...
 * Applying xdg-desktop-portal-kde-5.19.5-valid-desktop-file.patch ...
patching file data/org.freedesktop.impl.portal.desktop.kde.desktop.in
Hunk #1 FAILED at 1.
1 out of 1 hunk FAILED -- saving rejects to file data/org.freedesktop.impl.portal.desktop.kde.desktop.in.rej                                         [ !! ]
 * ERROR: kde-plasma/xdg-desktop-portal-kde-5.19.5-r1::gentoo failed (prepare phase):
 *   patch -p1  failed with /var/tmp/portage/kde-plasma/xdg-desktop-portal-kde-5.19.5-r1/files/xdg-desktop-portal-kde-5.19.5-valid-desktop-file.patch
 * 
 * Call stack:
 *               ebuild.sh, line  125:  Called src_prepare
 *             environment, line 2477:  Called ecm_src_prepare
 *             environment, line 1418:  Called cmake_src_prepare
 *             environment, line 1117:  Called default_src_prepare
 *      phase-functions.sh, line  920:  Called __eapi6_src_prepare
 *             environment, line  359:  Called eapply '/var/tmp/portage/kde-plasma/xdg-desktop-portal-kde-5.19.5-r1/files/xdg-desktop-portal-kde-5.19.5-valid-desktop-file.patch'
 *             environment, line 1268:  Called _eapply_patch '/var/tmp/portage/kde-plasma/xdg-desktop-portal-kde-5.19.5-r1/files/xdg-desktop-portal-kde-5.19.5-valid-desktop-file.patch'
 *             environment, line 1206:  Called __helpers_die 'patch -p1  failed with /var/tmp/portage/kde-plasma/xdg-desktop-portal-kde-5.19.5-r1/files/xdg-desktop-portal-kde-5.19.5-valid-desktop-file.patch'
 *   isolated-functions.sh, line  112:  Called die
 * The specific snippet of code:
 *              die "$@"
 *
Comment 1 jms 2020-09-04 11:33:18 UTC
Created attachment 658352 [details]
emerge --info '=kde-plasma/xdg-desktop-portal-kde-5.19.5-r1::gentoo'
Comment 2 jms 2020-09-04 11:35:13 UTC
Created attachment 658354 [details]
build log
Comment 3 jms 2020-09-04 11:40:15 UTC
kde overlay (not sure where to file the bug)

eix xdg-desktop-portal-kde
[U] kde-plasma/xdg-desktop-portal-kde
     Available versions:  (5) 5.18.5 (~)5.19.5-r1 **9999*l[1]
       {debug screencast}
     Installed versions:  5.19.5(5)[1](18:37:45 01/09/2020)(-debug -screencast)
     Homepage:            https://kde.org/plasma-desktop
     Description:         Backend implementation for xdg-desktop-portal that is using Qt/KDE Frameworks

[1] "kde" /var/db/repos/kde
Comment 4 jms 2020-09-04 11:45:26 UTC
sorry not kde overlay but gentoo main
Comment 5 sg313 2020-09-04 12:16:33 UTC
Can confirm, the root cause is that the patch that in the ebuild has been applied upstream in the meantime, which causes patch to fail.

This patch fixes it:

diff --git a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.19.5-r1.ebuild b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.19.5-r1.ebuild
index eb804c803a1..d5c931956e5 100644
--- a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.19.5-r1.ebuild
+++ b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.19.5-r1.ebuild
@@ -43,8 +43,6 @@ RDEPEND="${COMMON_DEPEND}
        sys-apps/xdg-desktop-portal[screencast?]
 "
 
-PATCHES=( "${FILESDIR}"/${P}-valid-desktop-file.patch )
-
 src_configure() {
        local mycmakeargs=(
                -DENABLE_PIPEWIRE=$(usex screencast)
Comment 6 Larry the Git Cow gentoo-dev 2020-09-04 12:54:20 UTC
The bug has been closed via the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4089998cbedcd4d8934318f2e6e88a5c3b396e49

commit 4089998cbedcd4d8934318f2e6e88a5c3b396e49
Author:     Andreas Sturmlechner <asturm@gentoo.org>
AuthorDate: 2020-09-04 12:52:56 +0000
Commit:     Andreas Sturmlechner <asturm@gentoo.org>
CommitDate: 2020-09-04 12:54:06 +0000

    kde-plasma/xdg-desktop-portal-kde: Revert "Fix .desktop file"
    
    This reverts commit b23bfef880afe9ff83f7f782507301c9aa2a902e.
    
    Closes: https://bugs.gentoo.org/740352
    Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

 ...ktop-portal-kde-5.19.5-valid-desktop-file.patch | 24 ----------------------
 ...ebuild => xdg-desktop-portal-kde-5.19.5.ebuild} |  2 --
 2 files changed, 26 deletions(-)
Comment 7 Andreas Sturmlechner gentoo-dev 2020-09-04 12:55:29 UTC
Fascinating. Thanks for reporting.