Bug 270703 - x11/kitty: Update to 0.27.1
Summary: x11/kitty: Update to 0.27.1
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: Robert Clausecker
URL: https://sw.kovidgoyal.net/kitty/chang...
Keywords:
Depends on:
Blocks:
 
Reported: 2023-04-08 14:22 UTC by Alexis Praga
Modified: 2023-04-20 13:39 UTC (History)
3 users (show)

See Also:
fuz: merge-quarterly-


Attachments
Update to 0.27.1 (15.62 KB, patch)
2023-04-08 14:22 UTC, Alexis Praga
alexis.praga: maintainer-approval+
Details | Diff
Updated maintainer email (15.70 KB, patch)
2023-04-08 15:37 UTC, Alexis Praga
alexis.praga: maintainer-approval+
Details | Diff
Update to 0.27.1 with timeout fix. (16.26 KB, patch)
2023-04-09 07:43 UTC, Alexis Praga
alexis.praga: maintainer-approval+
Details | Diff
Update to 0.28.0, based on #241363 (19.17 KB, patch)
2023-04-20 05:17 UTC, Chad Jacob Milios
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Alexis Praga 2023-04-08 14:22:13 UTC
Created attachment 241351 [details]
Update to 0.27.1

Hi,

With this upgrade, docs could no longer be build as the process was stuck in a forever loop. A fix was to disable sphinx-build "quiet" flags.
I also removed the main tree patches for glfw as it seems there are no longer needed.
Finally, it build locally but poudriere gives me build_fs_violation error:

=>> Checking for filesystem violations... done
=>> Error: Filesystem touched during build:
extra: usr/local/lib/python3.9/site-packages/_distutils_hack/__pycache__/__init__.cpython-39.opt-2.pyc

Nevertheless, I would like to submit this update, at least for suggestions to improve the code.

Thanks,
Comment 1 Bugzilla Automation freebsd_committer freebsd_triage 2023-04-08 14:22:13 UTC
Maintainer informed via mail
Comment 2 Robert Clausecker freebsd_committer freebsd_triage 2023-04-08 14:58:16 UTC
Are you the maintainer?  The MAINTAINER field has a different email address than the one you use on Bugzilla.  Consider changing it to match your bugzilla email.

Would you like for this update to be merged into the quarterly branch (2023Q2)?

Is there a changelog for this update?
Comment 3 Alexis Praga 2023-04-08 15:37:05 UTC
Created attachment 241354 [details]
Updated maintainer email
Comment 4 Alexis Praga 2023-04-08 15:38:53 UTC
Thanks for you feedback. Maintainer email (me) has been updated, as well as a changelog.
If it could be merged into 2023Q2, it would be great, thanks.
Comment 5 Robert Clausecker freebsd_committer freebsd_triage 2023-04-09 00:22:00 UTC
The build of your port hangs when building without Poudriere:

gmake docs                                                                                                     [0/1880]
gmake[1]: Entering directory '/usr/home/main.ports/x11/kitty/work/github.com/kovidgoyal/kitty@v0.27.1'                 
gmake -C docs man                                          
gmake[2]: Entering directory '/usr/home/main.ports/x11/kitty/work/github.com/kovidgoyal/kitty@v0.27.1/docs'            
sphinx-build -M man "." "_build" -n -q -j auto -T          
fatal: ambiguous argument '8dea5b3': unknown revision or path not in the working tree.                                 
Use '--' to separate paths from revisions, like this:      
'git <command> [<revision>...] -- [<file>...]'             
fatal: ambiguous argument 'ad1109b': unknown revision or path not in the working tree.                                 
Use '--' to separate paths from revisions, like this:      
'git <command> [<revision>...] -- [<file>...]'             
fatal: ambiguous argument '889ca77': unknown revision or path not in the working tree.                                 
Use '--' to separate paths from revisions, like this:      
'git <command> [<revision>...] -- [<file>...]'             
/usr/home/main.ports/x11/kitty/work/github.com/kovidgoyal/kitty@v0.27.1/docs/changelog.rst:2815: ERROR: GitHub commit id "8dea5b3" not recognized.
/usr/home/main.ports/x11/kitty/work/github.com/kovidgoyal/kitty@v0.27.1/docs/changelog.rst:2930: ERROR: GitHub commit id "ad1109b" not recognized.
/usr/home/main.ports/x11/kitty/work/github.com/kovidgoyal/kitty@v0.27.1/docs/changelog.rst:2942: ERROR: GitHub commit id "889ca77" not recognized.
gmake[2]: Leaving directory '/usr/home/main.ports/x11/kitty/work/github.com/kovidgoyal/kitty@v0.27.1/docs'             
gmake -C docs html     
gmake[2]: Entering directory '/usr/home/main.ports/x11/kitty/work/github.com/kovidgoyal/kitty@v0.27.1/docs'            
sphinx-build -M html "." "_build" -n -q -j auto -T         
^CTraceback (most recent call last):                       
  File "/usr/home/main.ports/x11/kitty/work/github.com/kovidgoyal/kitty@v0.27.1/setup.py", line 1762, in <module>      
    main() 
  File "/usr/home/main.ports/x11/kitty/work/github.com/kovidgoyal/kitty@v0.27.1/setup.py", line 1737, in main          
    package(args, bundle_type='linux-package')
  File "/usr/home/main.ports/x11/kitty/work/github.com/kovidgoyal/kitty@v0.27.1/setup.py", line 1455, in package       
    create_linux_bundle_gunk(ddir, args.libdir_name)
  File "/usr/home/main.ports/x11/kitty/work/github.com/kovidgoyal/kitty@v0.27.1/setup.py", line 1075, in create_linux_bundle_gunk                                                 
    run_tool([make, 'docs'])
  File "/usr/home/main.ports/x11/kitty/work/github.com/kovidgoyal/kitty@v0.27.1/setup.py", line 482, in run_tool       
    ret = p.wait()
  File "/usr/local/lib/python3.9/subprocess.py", line 1189, in wait                                                    
    return self._wait(timeout=timeout)                     
  File "/usr/local/lib/python3.9/subprocess.py", line 1917, in _wait                                                   
    (pid, sts) = self._try_wait(0)                         
  File "/usr/local/lib/python3.9/subprocess.py", line 1875, in _try_wait                                               
    (pid, sts) = os.waitpid(self.pid, wait_flags)          
KeyboardInterrupt      
*** Signal 2        

(I hit Ctrl+C to abort the build after 2h30m with no progress).

Please check and patch out any code that checks for git versions.  As ports are built from inside the ports tree git repository when built by hand, any code that assumes the port is in its own git repository usually don't work.  Make sure to disable any such code so the port can be built manually.

I plan to still commit the patch if it builds in Poudriere (currently testing).
Comment 6 Alexis Praga 2023-04-09 07:43:18 UTC
Created attachment 241363 [details]
Update to 0.27.1 with timeout fix.

Added fix about timeout when generating documenatation.
Comment 7 Alexis Praga 2023-04-09 07:47:11 UTC
Sorry, the fix was somehow not included in the patch. It should build locally.

On my machine, the issue is that the process is waiting forever for a lock on /root/.cache/matplotlib/fontlist-v330.json.matplotlib-lock. I'm not sure how disabling verbosity with sphinx-build helps with that but it does.

Please note that I could not build it with poudriere due to build_fs_violation. I have submitted the patch as the update was waiting for too long.
If you know how to fix that, please let me know.
Comment 8 Robert Clausecker freebsd_committer freebsd_triage 2023-04-09 10:41:58 UTC
The build furthermore fails on i386, too during the docs stage with a segmentation fault:

gmake[1]: Entering directory '/wrkdirs/usr/ports/x11/kitty/work/github.com/kovidgoyal/kitty@v0.27.1'
gmake -C docs man
gmake[2]: Entering directory '/wrkdirs/usr/ports/x11/kitty/work/github.com/kovidgoyal/kitty@v0.27.1/docs'
sphinx-build -M man "." "_build" -n -q -j auto -T   
/wrkdirs/usr/ports/x11/kitty/work/github.com/kovidgoyal/kitty@v0.27.1/docs/changelog.rst:2815: ERROR: GitHub commit id "8dea5b3" not recognized.
/wrkdirs/usr/ports/x11/kitty/work/github.com/kovidgoyal/kitty@v0.27.1/docs/changelog.rst:2930: ERROR: GitHub commit id "ad1109b" not recognized.
/wrkdirs/usr/ports/x11/kitty/work/github.com/kovidgoyal/kitty@v0.27.1/docs/changelog.rst:2942: ERROR: GitHub commit id "889ca77" not recognized.
gmake[2]: Leaving directory '/wrkdirs/usr/ports/x11/kitty/work/github.com/kovidgoyal/kitty@v0.27.1/docs'
gmake -C docs html
gmake[2]: Entering directory '/wrkdirs/usr/ports/x11/kitty/work/github.com/kovidgoyal/kitty@v0.27.1/docs'
sphinx-build -M html "." "_build" -n -q -j auto -T   
gmake[2]: *** [Makefile:24: html] Segmentation fault (core dumped)
gmake[2]: Leaving directory '/wrkdirs/usr/ports/x11/kitty/work/github.com/kovidgoyal/kitty@v0.27.1/docs'
gmake[1]: *** [Makefile:48: html] Error 2
gmake[1]: Leaving directory '/wrkdirs/usr/ports/x11/kitty/work/github.com/kovidgoyal/kitty@v0.27.1'
gmake docs
*** Error code 2

Let me know if you can fix this one.  As a workaround, you can alternatively disable building docs on i386 or mark the port as BROKEN_i386 (worst case).
Comment 9 Robert Clausecker freebsd_committer freebsd_triage 2023-04-09 14:25:26 UTC
The build fails with your updated patch with plist issues (so progress!).  Please check and resubmit.

====> Checking for pkg-plist issues (check-plist)
===> Parsing plist
===> Checking for items in STAGEDIR missing from pkg-plist
Error: Orphaned: bin/kitten
Error: Orphaned: lib/kitty/kitty/bash.py
Error: Orphaned: lib/kitty/shell-integration/fish/vendor_completions.d/kitten.fish
Error: Orphaned: lib/kitty/shell-integration/ssh/kitten
===> Checking for items in pkg-plist which are not in STAGEDIR
===> Error: Plist issues found.


As for the shell completion files, please check if you can get them installed into the appropriate directories as per ยง 6.31 Porter's Handbook.
Comment 10 Robert Clausecker freebsd_committer freebsd_triage 2023-04-09 14:28:50 UTC
Oh and the updated patch also fixes the i386 build issue.  So that's some progress, too.
Comment 11 Chad Jacob Milios 2023-04-20 05:17:00 UTC
Created attachment 241609 [details]
Update to 0.28.0, based on #241363

thank you very much for your patch

upstream released 0.28.0 just a few days ago:

https://github.com/kovidgoyal/kitty/releases/tag/v0.28.0

i modified your patch ever so slightly
Comment 12 Robert Clausecker freebsd_committer freebsd_triage 2023-04-20 09:41:26 UTC
Your updated patch does not take care to install the shell completion files into the right locations as requested in comment #9.  PORTVERSION should not be used when DISTVERSION can be used.  Will change your patch to use DISTVERSION instead.  Will commence with build test shortly.

As 0.28.0 is not just a patch release, I will not MFH this update.
Comment 13 commit-hook freebsd_committer freebsd_triage 2023-04-20 13:36:18 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=a7f1c84d77946c9f27714088099183c2344642b0

commit a7f1c84d77946c9f27714088099183c2344642b0
Author:     Alexis Praga <alexis.praga@proton.me>
AuthorDate: 2023-04-20 09:39:59 +0000
Commit:     Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2023-04-20 11:49:24 +0000

    x11/kitty: update to 0.28.0

     - update maintainer address
     - work around a hang in sphinx build

    Changelog: https://sw.kovidgoyal.net/kitty/changelog

    PR:             270703

 x11/kitty/Makefile                                 | 24 +++++++++++----
 x11/kitty/distinfo                                 |  8 +++--
 x11/kitty/files/patch-docs_Makefile (new)          | 11 +++++++
 x11/kitty/files/patch-glfw_dbus__glfw.c (gone)     | 20 -------------
 x11/kitty/files/patch-glfw_wl__window.c (gone)     | 17 -----------
 .../patch-kittens_choose_unix__compat.c (gone)     | 11 -------
 x11/kitty/files/patch-kitty_colors.c (gone)        | 20 -------------
 x11/kitty/files/patch-kitty_cursor.c (gone)        | 11 -------
 x11/kitty/files/patch-kitty_data-types.c (gone)    | 19 ------------
 x11/kitty/files/patch-kitty_gl-wrapper.h (gone)    | 20 -------------
 x11/kitty/files/patch-kitty_gl.c (gone)            | 11 -------
 x11/kitty/files/patch-kitty_glfw.c (gone)          | 20 -------------
 x11/kitty/files/patch-kitty_graphics.c (gone)      | 11 -------
 x11/kitty/files/patch-kitty_line.c (gone)          | 11 -------
 x11/kitty/files/patch-kitty_mouse.c (gone)         | 20 -------------
 x11/kitty/files/patch-kitty_shaders.c (gone)       | 20 -------------
 x11/kitty/files/patch-kitty_state.c (gone)         | 11 -------
 x11/kitty/files/patch-setup.py                     |  4 +--
 x11/kitty/pkg-plist                                | 34 +++-------------------
 19 files changed, 41 insertions(+), 262 deletions(-)
Comment 14 Robert Clausecker freebsd_committer freebsd_triage 2023-04-20 13:39:53 UTC
Thank you for your contribution.

Please fix the shell completion file paths with a future update.