kitty/buildmode-and-skip_docs.diff

29 lines
1.2 KiB
Diff
Raw Permalink Normal View History

Accepting request 1140000 from home:sbradnick:branches:X11:terminals - i586 builds fail with -fcf-protection=full (seems to be default); setting to -fcf-protection=none with CFLAGS export - Removing go-buildmode-pie.diff and optional-disable-docs.diff; replacing with buildmode-and-skip_docs.diff which should be an easier path going forward to disabling 'make docs' from setup.py - Update to 0.32.0: * Conditional mappings depending on the state of the focused window * Support for Modal mappings such as in modal editors like vim * A new option notify_on_cmd_finish to show a desktop notification when a long running command finishes (#6817) * A new action send_key to simplify mapping key presses to other keys without needing send_text * Allow focusing previously active OS windows via nth_os_window (#7009) * Wayland: Fix a regression in the previous release that broke copying to clipboard under wl-roots based compositors in some circumstances (#6890) * macOS: Fix some combining characters not being rendered (#6898) * macOS: Fix returning from full screen via the button when the titlebar is hidden not hiding the buttons (#6883) * macOS: Fix newly created OS windows not always appearing on the "active" monitor (#6932) * Font fallback: Fix the font used to render a character sometimes dependent on the order in which characters appear on screen (#6865) * panel kitten: Fix rendering with non-zero margin/padding in kitty.conf (#6923) * kitty keyboard protocol: Specify the behavior of the modifier bits during modifier key events (#6913) * Wayland: Enable support for the new cursor-shape protocol so that the mouse cursor is always rendered at the correct size in compositors that support this protocol (#6914) OBS-URL: https://build.opensuse.org/request/show/1140000 OBS-URL: https://build.opensuse.org/package/show/X11:terminals/kitty?expand=0&rev=135
2024-01-19 19:04:25 +01:00
--- setup.py.smb 2024-01-19 09:43:25.073225511 -0500
+++ setup.py 2024-01-19 10:26:09.830214118 -0500
@@ -980,7 +980,7 @@
if args.skip_building_kitten:
print('Skipping building of the kitten binary because of a command line option. Build is incomplete', file=sys.stderr)
return ''
- cmd = [go, 'build', '-v']
+ cmd = [go, 'build', '-buildmode=pie', '-v']
vcs_rev = args.vcs_rev or get_vcs_rev()
ld_flags: List[str] = []
binary_data_flags = [f"-X kitty.VCSRevision={vcs_rev}"]
@@ -1165,13 +1165,14 @@
base = Path(ddir)
in_src_launcher = base / (f'{libdir_name}/kitty/kitty/launcher/kitty')
launcher = base / 'bin/kitty'
- skip_docs = False
+ skip_docs = True
if not os.path.exists('docs/_build/html'):
kitten_exe = os.path.join(os.path.dirname(str(launcher)), 'kitten')
if os.path.exists(kitten_exe):
os.environ['KITTEN_EXE_FOR_DOCS'] = kitten_exe
make = 'gmake' if is_freebsd else 'make'
- run_tool([make, 'docs'])
+ if not skip_docs:
+ run_tool([make, 'docs'])
else:
if args.skip_building_kitten:
skip_docs = True