5 files changed, 19 insertions, 1 deletions
diff --git a/media-sound/lilypond/files/lilypond-2.22.1-free_font.patch b/media-sound/lilypond/files/lilypond-2.22.1-free_font.patch
new file mode 100644
index 000000000000..2d27291551d4
--- /dev/null
+++ b/media-sound/lilypond/files/lilypond-2.22.1-free_font.patch
@@ -0,0 +1,14 @@
+Revert "Pango_font: Free temporary font description"
+This reverts commit 102bed8b5a6332f2021a284bd5a937a2603fb327.
+diff --git a/lily/pango-font.cc b/lily/pango-font.cc
+index 053ce17143..1a63b18338 100644
+--- a/lily/pango-font.cc
++++ b/lily/pango-font.cc
+@@ -385,7 +385,6 @@ Pango_font::pango_item_string_stencil (PangoGlyphItem const *glyph_item) const
+   PangoFontDescription *descr = pango_font_describe (pa->font);
+   Real size = pango_font_description_get_size (descr)
+               / (static_cast<Real> (PANGO_SCALE));
+-  pango_font_description_free (descr);
+ 
+   if (ps_name_str0.empty ())
+     warning (_f ("no PostScript font name for font `%s'", file_name));
diff --git a/media-sound/lilypond/lilypond-2.22.1.ebuild b/media-sound/lilypond/lilypond-2.22.1-r1.ebuild
index 8757a650991f..48e98a5be8f0 100644
--- a/media-sound/lilypond/lilypond-2.22.1.ebuild
+++ b/media-sound/lilypond/lilypond-2.22.1-r1.ebuild
@@ -64,6 +64,7 @@ RESTRICT="test"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-fix-font-size.patch
+	"${FILESDIR}"/${P}-free_font.patch
 )
 
 DOCS=( DEDICATION HACKING README.md ROADMAP )
diff --git a/media-sound/lilypond/lilypond-2.23.0.ebuild b/media-sound/lilypond/lilypond-2.23.0-r1.ebuild
index 71ce2205451a..e20ef84346b3 100644
--- a/media-sound/lilypond/lilypond-2.23.0.ebuild
+++ b/media-sound/lilypond/lilypond-2.23.0-r1.ebuild
@@ -59,6 +59,7 @@ RESTRICT="test"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-fix-font-size.patch
+	"${FILESDIR}"/${PN}-2.22.1-free_font.patch
 )
 
 DOCS=( DEDICATION HACKING README.md ROADMAP )
diff --git a/media-sound/lilypond/lilypond-2.23.2.ebuild b/media-sound/lilypond/lilypond-2.23.2-r1.ebuild
index adb492fe79e4..267d1a8af4de 100644
--- a/media-sound/lilypond/lilypond-2.23.2.ebuild
+++ b/media-sound/lilypond/lilypond-2.23.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -59,6 +59,7 @@ RESTRICT="test"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.23.0-fix-font-size.patch
+	"${FILESDIR}"/${PN}-2.22.1-free_font.patch
 )
 
 DOCS=( DEDICATION HACKING README.md ROADMAP )
diff --git a/media-sound/lilypond/lilypond-9999.ebuild b/media-sound/lilypond/lilypond-9999.ebuild
index ebce02eda789..23bd30635ead 100644
--- a/media-sound/lilypond/lilypond-9999.ebuild
+++ b/media-sound/lilypond/lilypond-9999.ebuild
@@ -59,6 +59,7 @@ RESTRICT="test"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.23.0-fix-font-size.patch
+	"${FILESDIR}"/${PN}-2.22.1-free_font.patch
 )
 
 DOCS=( DEDICATION HACKING README.md ROADMAP )