From c48fcceda934bc373a0296f1417409bd0edf0179 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Mon, 27 Mar 2023 09:03:42 +0000 Subject: [PATCH] - Update to 0.27.0 & 0.27.1 - Adjust optional-disable-docs.patch for new version - Add _service and vendor.tar.gz to to download, verify, and vendor Go module dependency sources - Drop support for openSUSE Leap 15.4 as it cannot provide go1.20 If you have any suggestions for improvement, please let me know! OBS-URL: https://build.opensuse.org/package/show/X11:terminals/kitty?expand=0&rev=115 --- _service | 4 +++ kitty-0.26.5.tar.gz | 3 -- kitty-0.27.1.tar.gz | 3 ++ kitty.changes | 66 +++++++++++++++++++++++++++++++++++++ kitty.spec | 9 +++-- optional-disable-docs.patch | 34 +++++++++---------- vendor.tar.gz | 3 ++ 7 files changed, 99 insertions(+), 23 deletions(-) create mode 100644 _service delete mode 100644 kitty-0.26.5.tar.gz create mode 100644 kitty-0.27.1.tar.gz create mode 100644 vendor.tar.gz diff --git a/_service b/_service new file mode 100644 index 0000000..4984e83 --- /dev/null +++ b/_service @@ -0,0 +1,4 @@ + + + + diff --git a/kitty-0.26.5.tar.gz b/kitty-0.26.5.tar.gz deleted file mode 100644 index 9db74c5..0000000 --- a/kitty-0.26.5.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7a1b444f1cc10e16ee0f20a804c0f80b52417eeabf60d9f25e37ef192503ba26 -size 6080707 diff --git a/kitty-0.27.1.tar.gz b/kitty-0.27.1.tar.gz new file mode 100644 index 0000000..1d0323c --- /dev/null +++ b/kitty-0.27.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8e05b02709d0af771b83ba653b0684164b7615946eb67244b2371fb47ecfce1a +size 8554771 diff --git a/kitty.changes b/kitty.changes index c5dd0ef..97c25c3 100644 --- a/kitty.changes +++ b/kitty.changes @@ -1,3 +1,69 @@ +------------------------------------------------------------------- +Mon Mar 13 03:47:53 UTC 2023 - Simon Vogl + +- Adjust optional-disable-docs.patch for new version +- Add _service and vendor.tar.gz to to download, verify, and vendor Go module dependency sources +- Drop support for openSUSE Leap 15.4 as it cannot provide go1.20 +- Update to 0.27.0 & 0.27.1: + * Fix modify_font not working for strikethrough position (#5946) + * Fix a regression causing the edit-in-kitty command not working + if kitten is not added to PATH (#5956) + * icat kitten: Fix a regression that broke display of animated + GIFs over SSH (#5958) + * Wayland GNOME: Fix for ibus not working when using XWayland (#5967) + * Fix regression in previous release that caused incorrect entries + in terminfo for modifier+F3 key combinations (#5970) + * Bring back the deprecated and removed kitty +complete and delegate + it to kitten for backward compatibility (#5977) + * Bump the version of Go needed to build kitty to 1.20 so we can + use the Go stdlib ecdh package for crypto. + * A new statically compiled, standalone executable, kitten (written in Go) + that can be used on all UNIX-like servers for remote control (kitten @), + viewing images (kitten icat), manipulating the + clipboard (kitten clipboard), etc. + * clipboard kitten: Allow copying arbitrary data types to/from + the clipboard, not just plain text + * Speed up the kitty @ executable by ~10x reducing the time for + typical remote control commands from ~50ms to ~5ms + * icat kitten: Speed up by using POSIX shared memory when possible + to transfer image data to the terminal. Also support common image + formats GIF/PNG/JPEG/WEBP/TIFF/BMP out of the box without needing ImageMagick. + * Option show_hyperlink_targets to show the target of terminal + hyperlinks when hovering over them with the mouse (#5830) + * Keyboard protocol: Remove CSI R from the allowed encodings of + the F3 key as it conflicts with the Cursor Position Report escape code (#5813) + * Allow using the cwd of the original process for launch --cwd (#5672) + * Session files: Expand environment variables (#5917) + * Pass key events mapped to scroll actions to the program running in + the terminal when the terminal is in alternate screen mode (#5839) + * Implement edit-in-kitty using the new kitten static executable (#5546, #5630) + * Add an option background_tint_gaps to control background image + tinting for window gaps (#5596) + * A new option undercurl_style to control the rendering of undercurls (#5883) + * Bash integration: Fix clone-in-kitty not working on bash >= 5.2 if environment + variable values contain newlines or other special characters (#5629) + * A new sleep action useful in combine based mappings to make + kitty sleep before executing the next action + * Wayland GNOME: Workaround for latest mutter release breaking full + screen for semi-transparent kitty windows (#5677) + * A new option tab_title_max_length to limit the length of tab (#5718) + * When drawing the tab bar have the default left and right margins + drawn in a color matching the neighboring tab (#5719) + * When using the include directive in kitty.conf make the environment + variable KITTY_OS available for OS specific config + * Wayland: Fix signal handling not working with some GPU drivers (#4636) + * Remote control: When matching windows allow using negative id numbers + to match recently created windows (#5753) + * ZSH Integration: Bind alt+left and alt+right to move by word if not already bound. + This mimics the default bindings in Terminal.app (#5793) + * When a multi-key sequence does not match any action, + send all key events to the child program (#5841) + * broadcast kitten: Allow pressing a key to stop echoing of + input into the broadcast window itself (#5868) + * When reporting unused activity in a window, ignore activity + that occurs soon after a window resize (#5881) + * Fix using cursor = none not working on text that has reverse video (#5897) + ------------------------------------------------------------------- Mon Nov 7 10:50:41 UTC 2022 - Michael Vetter diff --git a/kitty.spec b/kitty.spec index 1652aeb..d71a633 100644 --- a/kitty.spec +++ b/kitty.spec @@ -1,7 +1,7 @@ # # spec file for package kitty # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,13 +19,14 @@ # sphinx_copybutton not in Factory %bcond_with docs Name: kitty -Version: 0.26.5 +Version: 0.27.1 Release: 0 Summary: A GPU-based terminal emulator License: GPL-3.0-only Group: System/X11/Terminals URL: https://github.com/kovidgoyal/kitty Source: https://github.com/kovidgoyal/kitty/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz +Source1: vendor.tar.gz # PATCH-FIX-OPENSUSE optional-disable-docs.patch -- Optionally disable building documentation files Patch0: optional-disable-docs.patch # PATCH-FIX-OPENSUSE fix-librsync-leap.patch -- Fix for Leap, as librsync header is missing the stdio.h header for FILE* @@ -35,6 +36,7 @@ BuildRequires: Mesa-libGL-devel BuildRequires: fdupes BuildRequires: fontconfig-devel BuildRequires: freetype2-devel +BuildRequires: go >= 1.20 BuildRequires: harfbuzz-devel >= 1.5.0 BuildRequires: libXcursor-devel BuildRequires: libXi-devel @@ -80,7 +82,7 @@ true-color, OpenType ligatures, mouse protocol, focus tracking, bracketed paste and so on, and which can be controlled by scripts. %prep -%autosetup -p1 +%autosetup -p1 -a 1 %if 0%{?suse_version} > 1500 find . -type f -exec sed -i 's@#!/usr/bin/env python3$@#!%{_bindir}/python3@' {} + @@ -113,6 +115,7 @@ python3.9 -B \ %license LICENSE %doc CHANGELOG.rst README.asciidoc %{_bindir}/%{name} +%{_bindir}/kitten %{_libdir}/%{name} %{_datadir}/applications/%{name}{,-open}.desktop %{_datadir}/icons/hicolor/ diff --git a/optional-disable-docs.patch b/optional-disable-docs.patch index 2482e2f..decb46c 100644 --- a/optional-disable-docs.patch +++ b/optional-disable-docs.patch @@ -1,19 +1,19 @@ -Index: kitty-0.26.1/setup.py +Index: kitty-0.27.1/setup.py =================================================================== ---- kitty-0.26.1.orig/setup.py -+++ kitty-0.26.1/setup.py -@@ -66,6 +66,7 @@ class Options(argparse.Namespace): +--- kitty-0.27.1.orig/setup.py ++++ kitty-0.27.1/setup.py +@@ -61,6 +61,7 @@ verbose: int = 0 sanitize: bool = False prefix: str = './linux-package' + no_docs: bool = False + dir_for_static_binaries: str = 'build/static' incremental: bool = True profile: bool = False - libdir_name: str = 'lib' -@@ -999,12 +1000,13 @@ def compile_python(base_path: str) -> No +@@ -1085,12 +1086,13 @@ c(base_path, ddir='', rx=exclude, force=True, optimize=optimize, quiet=1, workers=num_workers) - - + + -def create_linux_bundle_gunk(ddir: str, libdir_name: str) -> None: - if not os.path.exists('docs/_build/html'): - make = 'gmake' if is_freebsd else 'make' @@ -30,16 +30,16 @@ Index: kitty-0.26.1/setup.py for (icdir, ext) in {'256x256': 'png', 'scalable': 'svg'}.items(): icdir = os.path.join(ddir, 'share', 'icons', 'hicolor', icdir, 'apps') safe_makedirs(icdir) -@@ -1377,7 +1379,7 @@ def package(args: Options, bundle_type: - path = os.path.join(root, f_) - os.chmod(path, 0o755 if should_be_executable(path) else 0o644) +@@ -1468,7 +1470,7 @@ + if not for_freeze and not bundle_type.startswith('macos-'): + build_static_kittens(args, launcher_dir=launcher_dir) if not is_macos: - create_linux_bundle_gunk(ddir, args.libdir_name) + create_linux_bundle_gunk(ddir, args.libdir_name, args.no_docs) - + if bundle_type.startswith('macos-'): - create_macos_bundle_gunk(ddir) -@@ -1470,6 +1472,12 @@ def option_parser() -> argparse.Argument + create_macos_bundle_gunk(ddir, for_freeze, args) +@@ -1564,6 +1566,12 @@ help='Where to create the linux package' ) p.add_argument( @@ -49,6 +49,6 @@ Index: kitty-0.26.1/setup.py + help='Disable building documentation when creating the linux package' + ) + p.add_argument( - '--full', - dest='incremental', - default=Options.incremental, + '--dir-for-static-binaries', + default=Options.dir_for_static_binaries, + help='Where to create the static kitten binary' diff --git a/vendor.tar.gz b/vendor.tar.gz new file mode 100644 index 0000000..d5d7947 --- /dev/null +++ b/vendor.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cba4e45d796b23611ccde7416e26e02db5b8d137774628084d17cf22e678f161 +size 1607786