Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 789282 - x11-terms/kitty-9999: kitty-9999-flags.patch doesn't apply cleanly anymore
Summary: x11-terms/kitty-9999: kitty-9999-flags.patch doesn't apply cleanly anymore
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal normal (vote)
Assignee: Pablo Orduna
URL:
Whiteboard:
Keywords: PullRequest
Depends on:
Blocks:
 
Reported: 2021-05-10 08:08 UTC by Joonas Niilola
Modified: 2021-05-12 05:52 UTC (History)
1 user (show)

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


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Joonas Niilola gentoo-dev 2021-05-10 08:08:05 UTC
* Using python3.8 to build
>>> Unpacking source...
Initialized empty Git repository in /var/cache/distfiles/git3-src/kovidgoyal_kitty.git/
 * Repository id: kovidgoyal_kitty.git
 * To override fetched repository properties, use:
 *   EGIT_OVERRIDE_REPO_KOVIDGOYAL_KITTY
 *   EGIT_OVERRIDE_BRANCH_KOVIDGOYAL_KITTY
 *   EGIT_OVERRIDE_COMMIT_KOVIDGOYAL_KITTY
 *   EGIT_OVERRIDE_COMMIT_DATE_KOVIDGOYAL_KITTY
 * 
 * Fetching https://github.com/kovidgoyal/kitty.git ...
git fetch https://github.com/kovidgoyal/kitty.git +HEAD:refs/git-r3/HEAD
remote: Enumerating objects: 36922, done.
remote: Counting objects: 100% (1686/1686), done.
remote: Compressing objects: 100% (708/708), done.
remote: Total 36922 (delta 1113), reused 1518 (delta 976), pack-reused 35236
Receiving objects: 100% (36922/36922), 27.16 MiB | 2.74 MiB/s, done.
Resolving deltas: 100% (28156/28156), done.
From https://github.com/kovidgoyal/kitty
 * [new ref]                      -> refs/git-r3/HEAD
 * [new tag]           v0.1.0     -> v0.1.0
 * [new tag]           v0.10.0    -> v0.10.0
 * [new tag]           v0.10.1    -> v0.10.1
 * [new tag]           v0.11.0    -> v0.11.0
 * [new tag]           v0.11.1    -> v0.11.1
 * [new tag]           v0.11.2    -> v0.11.2
 * [new tag]           v0.11.3    -> v0.11.3
 * [new tag]           v0.12.0    -> v0.12.0
 * [new tag]           v0.12.1    -> v0.12.1
 * [new tag]           v0.12.2    -> v0.12.2
 * [new tag]           v0.12.3    -> v0.12.3
 * [new tag]           v0.13.0    -> v0.13.0
 * [new tag]           v0.13.1    -> v0.13.1
 * [new tag]           v0.13.2    -> v0.13.2
 * [new tag]           v0.13.3    -> v0.13.3
 * [new tag]           v0.14.0    -> v0.14.0
 * [new tag]           v0.14.1    -> v0.14.1
 * [new tag]           v0.14.2    -> v0.14.2
 * [new tag]           v0.14.3    -> v0.14.3
 * [new tag]           v0.14.4    -> v0.14.4
 * [new tag]           v0.14.5    -> v0.14.5
 * [new tag]           v0.14.6    -> v0.14.6
 * [new tag]           v0.15.0    -> v0.15.0
 * [new tag]           v0.15.1    -> v0.15.1
 * [new tag]           v0.16.0    -> v0.16.0
 * [new tag]           v0.17.0    -> v0.17.0
 * [new tag]           v0.17.1    -> v0.17.1
 * [new tag]           v0.17.2    -> v0.17.2
 * [new tag]           v0.17.3    -> v0.17.3
 * [new tag]           v0.17.4    -> v0.17.4
 * [new tag]           v0.18.0    -> v0.18.0
 * [new tag]           v0.18.1    -> v0.18.1
 * [new tag]           v0.18.2    -> v0.18.2
 * [new tag]           v0.18.3    -> v0.18.3
 * [new tag]           v0.19.0    -> v0.19.0
 * [new tag]           v0.19.1    -> v0.19.1
 * [new tag]           v0.19.2    -> v0.19.2
 * [new tag]           v0.19.3    -> v0.19.3
 * [new tag]           v0.2.0     -> v0.2.0
 * [new tag]           v0.2.1     -> v0.2.1
 * [new tag]           v0.2.2     -> v0.2.2
 * [new tag]           v0.2.3     -> v0.2.3
 * [new tag]           v0.2.4     -> v0.2.4
 * [new tag]           v0.2.5     -> v0.2.5
 * [new tag]           v0.2.6     -> v0.2.6
 * [new tag]           v0.2.7     -> v0.2.7
 * [new tag]           v0.2.8     -> v0.2.8
 * [new tag]           v0.20.0    -> v0.20.0
 * [new tag]           v0.20.1    -> v0.20.1
 * [new tag]           v0.20.2    -> v0.20.2
 * [new tag]           v0.20.3    -> v0.20.3
 * [new tag]           v0.3.0     -> v0.3.0
 * [new tag]           v0.4.0     -> v0.4.0
 * [new tag]           v0.4.1     -> v0.4.1
 * [new tag]           v0.4.2     -> v0.4.2
 * [new tag]           v0.5.0     -> v0.5.0
 * [new tag]           v0.5.1     -> v0.5.1
 * [new tag]           v0.6.0     -> v0.6.0
 * [new tag]           v0.6.1     -> v0.6.1
 * [new tag]           v0.7.0     -> v0.7.0
 * [new tag]           v0.7.1     -> v0.7.1
 * [new tag]           v0.8.0     -> v0.8.0
 * [new tag]           v0.8.1     -> v0.8.1
 * [new tag]           v0.8.2     -> v0.8.2
 * [new tag]           v0.8.3     -> v0.8.3
 * [new tag]           v0.8.4     -> v0.8.4
 * [new tag]           v0.9.0     -> v0.9.0
 * [new tag]           v0.9.1     -> v0.9.1
git symbolic-ref refs/git-r3/x11-terms/kitty/0/__main__ refs/git-r3/HEAD
 * Checking out https://github.com/kovidgoyal/kitty.git to /var/tmp/portage/x11-terms/kitty-9999/work/kitty-9999 ...
git checkout --quiet refs/git-r3/HEAD
GIT NEW branch -->
   repository:               https://github.com/kovidgoyal/kitty.git
   at the commit:            f6b0fcbc0fc49f5ddc441d97fd44eece1fb37906
>>> Source unpacked in /var/tmp/portage/x11-terms/kitty-9999/work
>>> Preparing source in /var/tmp/portage/x11-terms/kitty-9999/work/kitty-9999 ...
 * Applying kitty-9999-flags.patch ...
patching file setup.py
Hunk #1 FAILED at 278.
Hunk #2 FAILED at 289.
Hunk #3 succeeded at 317 (offset 11 lines).
Hunk #4 FAILED at 764.
Hunk #5 succeeded at 803 (offset 27 lines).
3 out of 5 hunks FAILED -- saving rejects to file setup.py.rej                               [ !! ]
 * ERROR: x11-terms/kitty-9999::gentoo failed (prepare phase):
 *   patch -p1  failed with /var/tmp/portage/x11-terms/kitty-9999/files/kitty-9999-flags.patch
 * 
 * Call stack:
 *               ebuild.sh, line  125:  Called src_prepare
 *             environment, line 2703:  Called default
 *      phase-functions.sh, line  855:  Called default_src_prepare
 *      phase-functions.sh, line  920:  Called __eapi6_src_prepare
 *             environment, line  291:  Called eapply '/var/tmp/portage/x11-terms/kitty-9999/files/kitty-9999-flags.patch' '/var/tmp/portage/x11-terms/kitty-9999/files/kitty-0.20.1-remove-terminfo.patch' '/var/tmp/portage/x11-terms/kitty-9999/files/kitty-0.14.4-svg-icon.patch'
 *             environment, line 1130:  Called _eapply_patch '/var/tmp/portage/x11-terms/kitty-9999/files/kitty-9999-flags.patch'
 *             environment, line 1068:  Called __helpers_die 'patch -p1  failed with /var/tmp/portage/x11-terms/kitty-9999/files/kitty-9999-flags.patch'
 *   isolated-functions.sh, line  112:  Called die
 * The specific snippet of code:
 *   		die "$@"
 * 
 * If you need support, post the output of `emerge --info '=x11-terms/kitty-9999::gentoo'`,
 * the complete build log and the output of `emerge -pqv '=x11-terms/kitty-9999::gentoo'`.
 * The complete build log is located at '/var/tmp/portage/x11-terms/kitty-9999/temp/build.log'.
 * The ebuild environment file is located at '/var/tmp/portage/x11-terms/kitty-9999/temp/environment'.
 * Working directory: '/var/tmp/portage/x11-terms/kitty-9999/work/kitty-9999'
 * S: '/var/tmp/portage/x11-terms/kitty-9999/work/kitty-9999'

Since kitty in Gentoo seems to be all about patching it every release, does these -9999 ebuilds make sense to have?
Comment 1 Joonas Niilola gentoo-dev 2021-05-10 08:13:34 UTC
Okay, I see there's a PR open about it:
https://github.com/gentoo/gentoo/pull/20609
Comment 2 Larry the Git Cow gentoo-dev 2021-05-11 07:17:49 UTC
The bug has been closed via the following commit(s):

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

commit b6722f49733ee33dce839bce0b3e386ecb82e78f
Author:     Luke Peterson <hazelnusse@gmail.com>
AuthorDate: 2021-05-10 17:44:56 +0000
Commit:     Joonas Niilola <juippis@gentoo.org>
CommitDate: 2021-05-11 07:17:42 +0000

    x11-terms/kitty: fix kitty-9999-flags.patch
    
    Upstream updated setup.py to use Python f-strings, breaking the previous
    version of kitty-9999-flags.patch.
    
    Closes: https://bugs.gentoo.org/789282
    Signed-off-by: Dale Lukas Peterson <hazelnusse@gmail.com>
    Closes: https://github.com/gentoo/gentoo/pull/20609
    Signed-off-by: Joonas Niilola <juippis@gentoo.org>

 x11-terms/kitty/files/kitty-9999-flags.patch | 30 ++++++++++++++++------------
 1 file changed, 17 insertions(+), 13 deletions(-)
Comment 3 Dale Lukas Peterson 2021-05-11 15:49:27 UTC
This bug is not fixed:

* ERROR: x11-terms/kitty-9999::gentoo failed (prepare phase):                                                                                                                         *   patch -p1  failed with /var/tmp/portage/x11-terms/kitty-9999/files/kitty-9999-flags.patch                                                                                         *                                                                                                                                                                                     * Call stack:                                                                                                                                                                         *               ebuild.sh, line  125:  Called src_prepare                                                                                                                             *             environment, line 2687:  Called default                                                                                                                                 *      phase-functions.sh, line  855:  Called default_src_prepare                                                                                                                     *      phase-functions.sh, line  920:  Called __eapi6_src_prepare                                                                                                                     *             environment, line  275:  Called eapply '/var/tmp/portage/x11-terms/kitty-9999/files/kitty-9999-flags.patch' '/var/tmp/portage/x11-terms/kitty-9999/files/kitty-0.20.1-remove-terminfo.patch' '/var/tmp/portage/x11-terms/kitty-9999/files/kitty-0.14.4-svg-icon.patch'                                                                                        *             environment, line 1114:  Called _eapply_patch '/var/tmp/portage/x11-terms/kitty-9999/files/kitty-9999-flags.patch'                                                      *             environment, line 1052:  Called __helpers_die 'patch -p1  failed with /var/tmp/portage/x11-terms/kitty-9999/files/kitty-9999-flags.patch'                               *   isolated-functions.sh, line  112:  Called die                                                                                                                                     * The specific snippet of code:                                                                                                                                                       *              die "$@"                                                                                                                                                               *                                                                                                                                                                                     * If you need support, post the output of `emerge --info '=x11-terms/kitty-9999::gentoo'`,                                                                                            * the complete build log and the output of `emerge -pqv '=x11-terms/kitty-9999::gentoo'`.                                                                                             * The complete build log is located at '/var/tmp/portage/x11-terms/kitty-9999/temp/build.log'.                                                                                        * The ebuild environment file is located at '/var/tmp/portage/x11-terms/kitty-9999/temp/environment'.                                                                                 * Working directory: '/var/tmp/portage/x11-terms/kitty-9999/work/kitty-9999'                                                                                                          * S: '/var/tmp/portage/x11-terms/kitty-9999/work/kitty-9999'
Comment 4 Joonas Niilola gentoo-dev 2021-05-12 05:52:40 UTC
Hey, 

as explained in the PR too: We had problems updating our sync-repos, so you most likely didn't have a repository with the patch applied. I tried again, after fresh sync, and it worked fine for me.

Please verify that your tree is up-to-date and has the merged latest patch!