From 19ffaad1cfd0c4f6a2b9130689c46b8fe217cffc Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Tue, 11 Jul 2023 14:24:13 -0400 Subject: [PATCH] meta: Remove kitty overlay Not needed anymore since kitty 0.29.0 was released. --- overlays/kitty.nix | 9 ------ patches/kitty-fix-duplicate-lines.patch | 40 ------------------------- 2 files changed, 49 deletions(-) delete mode 100644 overlays/kitty.nix delete mode 100644 patches/kitty-fix-duplicate-lines.patch diff --git a/overlays/kitty.nix b/overlays/kitty.nix deleted file mode 100644 index ee84588d..00000000 --- a/overlays/kitty.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ - nixpkgs.overlays = [ - (final: prev: { - kitty = prev.kitty.overrideAttrs (old: { - patches = (old.patches or [ ]) ++ [ ../patches/kitty-fix-duplicate-lines.patch ]; - }); - }) - ]; -} diff --git a/patches/kitty-fix-duplicate-lines.patch b/patches/kitty-fix-duplicate-lines.patch deleted file mode 100644 index 54286f35..00000000 --- a/patches/kitty-fix-duplicate-lines.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 7f6f1f9a5dac301b9f977e0d1a53c487c5cad9aa Mon Sep 17 00:00:00 2001 -From: Kovid Goyal -Date: Sun, 28 May 2023 06:24:49 +0530 -Subject: [PATCH] Fix a regression in 0.28.0 that caused a buffer overflow when - clearing the screen - -Fixes #6306 -Fixes #6308 ---- - docs/changelog.rst | 2 ++ - kitty/screen.c | 3 ++- - 2 files changed, 4 insertions(+), 1 deletion(-) - -diff --git a/docs/changelog.rst b/docs/changelog.rst -index b8c9a049e8..12f9806fa2 100644 ---- a/docs/changelog.rst -+++ b/docs/changelog.rst -@@ -71,6 +71,8 @@ Detailed list of changes - - - Graphics: Move images up along with text when the window is shrunk vertically (:iss:`6278`) - -+- Fix a regression in 0.28.0 that caused a buffer overflow when clearing the screen (:iss:`6306`, :pull:`6308`) -+ - 0.28.1 [2023-04-21] - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -diff --git a/kitty/screen.c b/kitty/screen.c -index ffa0e9f94d..a73e4084e3 100644 ---- a/kitty/screen.c -+++ b/kitty/screen.c -@@ -894,7 +894,8 @@ cursor_within_margins(Screen *self) { - static void - screen_dirty_line_graphics(Screen *self, unsigned int top, unsigned int bottom) { - bool need_to_remove = false; -- for (unsigned int y = top; y <= bottom; y++) { -+ bottom = MIN(bottom+1, self->lines); -+ for (unsigned int y = top; y < bottom; y++) { - if (self->linebuf->line_attrs[y].has_image_placeholders) { - need_to_remove = true; - linebuf_mark_line_dirty(self->linebuf, y);