diff --git a/_service b/_service index 77ce24b..ec919e5 100644 --- a/_service +++ b/_service @@ -1,4 +1,4 @@ - + diff --git a/fix-librsync-leap.diff b/fix-librsync-leap.diff deleted file mode 100644 index fc3a31a..0000000 --- a/fix-librsync-leap.diff +++ /dev/null @@ -1,27 +0,0 @@ -diff -Nur kitty-0.25.0/kittens/transfer/rsync.c new/kittens/transfer/rsync.c ---- kitty-0.25.0/kittens/transfer/rsync.c 2022-04-11 16:01:45.000000000 +0200 -+++ new/kittens/transfer/rsync.c 2022-04-18 14:43:47.391998800 +0200 -@@ -6,6 +6,7 @@ - */ - - #include "data-types.h" -+#include - #include - - #define SIGNATURE_CAPSULE "rs_signature_t" -diff -Nur kitty-0.25.0/setup.py new/setup.py ---- kitty-0.25.0/setup.py 2022-04-18 14:44:34.223998795 +0200 -+++ new/setup.py 2022-04-18 14:44:19.307998797 +0200 -@@ -263,10 +263,11 @@ - def detect_librsync(cc: List[str], cflags: List[str], ldflags: List[str]) -> str: - if not test_compile( - cc, *cflags, libraries=('rsync',), ldflags=ldflags, show_stderr=True, -- src='#include \nint main(void) { rs_strerror(0); return 0; }'): -+ src='#include \n#include \nint main(void) { rs_strerror(0); return 0; }'): - raise SystemExit('The librsync library is required') - # check for rs_sig_args() which was added to librsync in Apr 2020 version 2.3.0 - if test_compile(cc, *cflags, libraries=('rsync',), ldflags=ldflags, src=''' -+#include - #include - int main(void) { - rs_magic_number magic_number = 0; diff --git a/kitty-0.29.2.tar.gz b/kitty-0.29.2.tar.gz deleted file mode 100644 index af5cf73..0000000 --- a/kitty-0.29.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2454eb918ce9335e96e84307051135bc306ca6e6ed69dbbba531038564cbfed0 -size 7916689 diff --git a/kitty-0.30.0.tar.gz b/kitty-0.30.0.tar.gz new file mode 100644 index 0000000..c65a5dc --- /dev/null +++ b/kitty-0.30.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1e9c66ed6025b80e143bcde89f3265b51c15d0b71a05d7c6c1dc580a2f00fee7 +size 7958523 diff --git a/kitty-rpmlintrc b/kitty-rpmlintrc index b1654fa..f3e9973 100644 --- a/kitty-rpmlintrc +++ b/kitty-rpmlintrc @@ -1,3 +1,4 @@ addFilter("non-executable-script *"); +addFilter("python-bytecode-inconsistent-mtime *"); addFilter("potential-bashisms /usr/lib64/kitty/shell-integration/ssh/bootstrap-utils.sh"); addFilter("hidden-file-or-dir /usr/lib64/kitty/shell-integration/zsh/.zshenv"); diff --git a/kitty.changes b/kitty.changes index 5ccd182..8ce149d 100644 --- a/kitty.changes +++ b/kitty.changes @@ -1,3 +1,52 @@ +------------------------------------------------------------------- +Thu Sep 21 05:01:36 UTC 2023 - Scott Bradnick + +- Removing fix-librsync-leap.diff (no longer needed) +- Updating optional-disable-docs.diff for changes to setup.py +- Updating go vendor tarball +- Update to 0.30.0: + * A new transfer kitten that can be used to transfer files efficiently over + the TTY device + * ssh kitten: A new configuration directive to automatically forward the + kitty remote control socket + * Allow easily building kitty from source needing the installation of only + C and Go compilers. All other dependencies are automatically vendored + * kitten @ set-user-vars: New remote control command to set user variables + on a window (#6502) + * kitten @ ls: Add user variables set on windows to the output (#6502) + * kitten @ ls: Allow limiting output to matched windows/tabs (#6520) + * kitten icat: Fix image being displayed one cell to the right when using + both --place and --unicode-placeholder (#6556) + * kitten run-shell: Make kitty terminfo database available if needed before + starting the shell + * macOS: Fix keyboard shortcuts in the Apple global menubar not being + changed when reloading the config + * Fix a crash when resizing an OS Window that is displaying more than one + image and the new size is smaller than the image needs (#6555) + * Remote control: Allow using a random TCP port as the remote control + socket and also allow using TCP sockets in listen_on + * unicode_input kitten: Add an option to specify the startup tab (#6552) + * X11: Print an error to STDERR instead of refusing to start when the user + sets a custom window icon larger than 128x128 (#6507) + * Remote control: Allow matching by neighbor of active window. Useful for + navigation plugins like vim-kitty-navigator + * Fix a regression that caused changing text_fg_override_threshold or + text_composition_strategy via config reload causing incorrect rendering (#6559) + * When running a shell for --hold set the env variable KITTY_HOLD=1 to allow + users to customize what happens (#6587) + * When multiple confirmable close requests are made focus the existing close + confirmation window instead of opening a new one for each request (#6601) + * Config file format: allow splitting lines by starting subsequent lines + with a backslash (#6603) + * ssh kitten: Fix a regression causing hostname directives in ssh.conf not + matching when username is specified (#6609) + * diff kitten: Add support for files that are identical apart from mode + changes (#6611) + * Wayland: Do not request idle inhibition for full screen windows (#6613) + * Adjust the workaround for non-linear blending of transparent pixels in + compositors to hopefully further reduce fringing around text with certain + color issues (#6534) + ------------------------------------------------------------------- Thu Jul 27 06:36:40 UTC 2023 - Michael Vetter diff --git a/kitty.spec b/kitty.spec index b827c9e..537d9f2 100644 --- a/kitty.spec +++ b/kitty.spec @@ -19,7 +19,7 @@ # sphinx_copybutton not in Factory %bcond_with docs Name: kitty -Version: 0.29.2 +Version: 0.30.0 Release: 0 Summary: A GPU-based terminal emulator License: GPL-3.0-only @@ -31,7 +31,8 @@ Source2: kitty-rpmlintrc # PATCH-FIX-OPENSUSE optional-disable-docs.diff -- Optionally disable building documentation files Patch0: optional-disable-docs.diff # PATCH-FIX-OPENSUSE fix-librsync-leap.diff -- Fix for Leap, as librsync header is missing the stdio.h header for FILE* -Patch1: fix-librsync-leap.diff +# Seems ./kittens/transfer/rsync.c is gone +#Patch1: fix-librsync-leap.diff Patch2: go-buildmode-pie.diff BuildRequires: ImageMagick-devel BuildRequires: Mesa-libGL-devel @@ -51,13 +52,13 @@ BuildRequires: librsync-devel #BuildRequires: libwayland-egl-devel BuildRequires: libxkbcommon-devel BuildRequires: libxkbcommon-x11-devel -BuildRequires: openssl-devel -# for 'tic' BuildRequires: ncurses-devel +BuildRequires: openssl-devel BuildRequires: pkgconfig BuildRequires: terminfo BuildRequires: wayland-devel BuildRequires: wayland-protocols-devel +BuildRequires: xxhash-devel BuildRequires: zlib-devel BuildRequires: pkgconfig(dbus-1) # Python requirements for Factory and Leap @@ -111,7 +112,7 @@ shell-integration [bash,fish,zsh] file(s) for the Kitty terminal; this package c #%%autosetup -p1 -a 1 %setup -a 1 %patch0 -%patch1 -p1 +#%%patch1 -p1 %patch2 %if 0%{?suse_version} > 1500 diff --git a/optional-disable-docs.diff b/optional-disable-docs.diff index 390bf0e..e1de347 100644 --- a/optional-disable-docs.diff +++ b/optional-disable-docs.diff @@ -1,6 +1,6 @@ ---- setup.py.smb 2023-07-10 10:36:07.831578320 -0400 -+++ setup.py 2023-07-10 10:40:20.503925434 -0400 -@@ -61,6 +61,7 @@ +--- setup.py.smb 2023-09-21 01:30:53.606748707 -0400 ++++ setup.py 2023-09-21 01:36:16.627212417 -0400 +@@ -143,6 +143,7 @@ verbose: int = 0 sanitize: bool = False prefix: str = './linux-package' @@ -8,8 +8,8 @@ dir_for_static_binaries: str = 'build/static' skip_code_generation: bool = False clean_for_cross_compile: bool = False -@@ -1158,12 +1159,13 @@ - c(base_path, ddir='', rx=exclude, force=True, optimize=optimize, quiet=1, workers=num_workers) +@@ -1149,12 +1150,13 @@ + invalidation_mode=py_compile.PycInvalidationMode.UNCHECKED_HASH, ddir='') -def create_linux_bundle_gunk(ddir: str, libdir_name: str) -> None: @@ -28,7 +28,7 @@ for (icdir, ext) in {'256x256': 'png', 'scalable': 'svg'}.items(): icdir = os.path.join(ddir, 'share', 'icons', 'hicolor', icdir, 'apps') safe_makedirs(icdir) -@@ -1541,7 +1543,7 @@ +@@ -1536,7 +1538,7 @@ if not for_freeze and not bundle_type.startswith('macos-'): build_static_kittens(args, launcher_dir=launcher_dir) if not is_macos: @@ -37,7 +37,7 @@ if bundle_type.startswith('macos-'): create_macos_bundle_gunk(ddir, for_freeze, args) -@@ -1644,6 +1646,12 @@ +@@ -1640,6 +1642,12 @@ help='Where to create the linux package' ) p.add_argument( diff --git a/vendor.tar.gz b/vendor.tar.gz index e73d472..d00311b 100644 --- a/vendor.tar.gz +++ b/vendor.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:50fd0f81a74cc4bcb1574fd212028b40ccb29b290482e908d9b5a692cd1465b5 -size 2518244 +oid sha256:c6c0579bb220d1629db82fbd08d234b034360ce550f0a2223a0f07674dee2547 +size 2568618