2 files changed, 35 insertions, 24 deletions
diff --git a/x11-terms/zutty/files/zutty-0.8-gcc11.patch b/x11-terms/zutty/files/zutty-0.8-gcc11.patch
deleted file mode 100644
index 75b8234d24bf..000000000000
--- a/x11-terms/zutty/files/zutty-0.8-gcc11.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 75bffab09e842bfff56a6cf111360421a5ee9e15 Mon Sep 17 00:00:00 2001
-From: Matt Smith <matt@offtopica.uk>
-Date: Thu, 29 Apr 2021 19:23:00 +0100
-Subject: [PATCH] Add missing include to fix GCC 11 build
-
----
- src/font.cc | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/font.cc b/src/font.cc
-index 0dd2166..f8da582 100644
---- a/src/font.cc
-+++ b/src/font.cc
-@@ -15,6 +15,7 @@
- 
- #include <algorithm>
- #include <cmath>
-+#include <limits>
- #include <sstream>
- #include <stdexcept>
- #include <string>
--- 
-2.31.1
-
diff --git a/x11-terms/zutty/files/zutty-0.9-freetype-2.11.0.patch b/x11-terms/zutty/files/zutty-0.9-freetype-2.11.0.patch
new file mode 100644
index 000000000000..b5d62204e6be
--- /dev/null
+++ b/x11-terms/zutty/files/zutty-0.9-freetype-2.11.0.patch
@@ -0,0 +1,35 @@
+From c73c99d6b024047d9f9e53e263be56093b6bf986 Mon Sep 17 00:00:00 2001
+From: Matt Smith <matt@offtopica.uk>
+Date: Sun, 29 Aug 2021 19:15:01 +0100
+Subject: [PATCH] Prevent rendering glyphs twice
+
+Characters are loaded with FT_LOAD_RENDER.  Calling FT_Render_Glyph
+again causes an error in Freetype 2.11.0 and later.
+
+Thanks to Stephan Hartmann <sultan@gentoo.org> for debugging and creating initial patch.
+
+Bug: https://bugs.gentoo.org/809611
+---
+ src/font.cc | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/src/font.cc b/src/font.cc
+index f8da582..350a1a6 100644
+--- a/src/font.cc
++++ b/src/font.cc
+@@ -255,12 +255,6 @@ namespace zutty
+             std::to_string (c));
+       }
+ 
+-      if (FT_Render_Glyph (face->glyph, FT_RENDER_MODE_NORMAL))
+-         throw std::runtime_error (
+-            std::string ("FreeType: Failed to render glyph for char ") +
+-            std::to_string (c));
+-
+-
+       // destination pixel offset
+       const unsigned int dx = face->glyph->bitmap_left > 0
+                             ? face->glyph->bitmap_left : 0;
+-- 
+2.33.0
+