2 files changed, 27 insertions, 35 deletions
diff --git a/x11-terms/zutty/files/zutty-0.11-cxxflags.patch b/x11-terms/zutty/files/zutty-0.11-cxxflags.patch
new file mode 100644
index 000000000000..19b6649bb561
--- /dev/null
+++ b/x11-terms/zutty/files/zutty-0.11-cxxflags.patch
@@ -0,0 +1,27 @@
+From 06927a1f2f88bd9d5f4bb8056661ffbc4a0aeb77 Mon Sep 17 00:00:00 2001
+From: Matthew Smith <matt@offtopica.uk>
+Date: Wed, 19 Jan 2022 18:07:55 +0000
+Subject: [PATCH] Remove default CXXFLAGS and LINKFLAGS
+
+---
+ wscript | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/wscript b/wscript
+index d2bfbc8..b38b50b 100644
+--- a/wscript
++++ b/wscript
+@@ -69,10 +69,6 @@ def configure(cfg):
+            ['-DDEBUG', '-Og', '-g', '-ggdb'])
+     else:
+         cfg.env.target = 'zutty'
+-        cfg.env.append_value('CXXFLAGS',
+-           ['-Werror', '-O3', '-march=native', '-mtune=native', '-flto'])
+-        cfg.env.append_value('LINKFLAGS',
+-           ['-flto'])
+ 
+     cfg.check_cfg(package='freetype2', args=['--cflags', '--libs'],
+                   uselib_store='FT')
+-- 
+2.34.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
deleted file mode 100644
index b5d62204e6be..000000000000
--- a/x11-terms/zutty/files/zutty-0.9-freetype-2.11.0.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-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
-