| 1 |
commit: fcaa927cebf1bc3db1404487e3fa7757a8e1eb99 |
| 2 |
Author: Maciej Barć <xgqt <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Feb 24 01:18:06 2022 +0000 |
| 4 |
Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Feb 24 01:23:49 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fcaa927c |
| 7 |
|
| 8 |
media-sound/lilypond: add free temporary font description patch |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/833864 |
| 11 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
| 12 |
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org> |
| 13 |
|
| 14 |
media-sound/lilypond/files/lilypond-2.22.1-free_font.patch | 14 ++++++++++++++ |
| 15 |
.../{lilypond-2.22.1.ebuild => lilypond-2.22.1-r1.ebuild} | 1 + |
| 16 |
.../{lilypond-2.23.0.ebuild => lilypond-2.23.0-r1.ebuild} | 1 + |
| 17 |
.../{lilypond-2.23.2.ebuild => lilypond-2.23.2-r1.ebuild} | 3 ++- |
| 18 |
media-sound/lilypond/lilypond-9999.ebuild | 1 + |
| 19 |
5 files changed, 19 insertions(+), 1 deletion(-) |
| 20 |
|
| 21 |
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 |
| 22 |
new file mode 100644 |
| 23 |
index 000000000000..2d27291551d4 |
| 24 |
--- /dev/null |
| 25 |
+++ b/media-sound/lilypond/files/lilypond-2.22.1-free_font.patch |
| 26 |
@@ -0,0 +1,14 @@ |
| 27 |
+Revert "Pango_font: Free temporary font description" |
| 28 |
+This reverts commit 102bed8b5a6332f2021a284bd5a937a2603fb327. |
| 29 |
+diff --git a/lily/pango-font.cc b/lily/pango-font.cc |
| 30 |
+index 053ce17143..1a63b18338 100644 |
| 31 |
+--- a/lily/pango-font.cc |
| 32 |
++++ b/lily/pango-font.cc |
| 33 |
+@@ -385,7 +385,6 @@ Pango_font::pango_item_string_stencil (PangoGlyphItem const *glyph_item) const |
| 34 |
+ PangoFontDescription *descr = pango_font_describe (pa->font); |
| 35 |
+ Real size = pango_font_description_get_size (descr) |
| 36 |
+ / (static_cast<Real> (PANGO_SCALE)); |
| 37 |
+- pango_font_description_free (descr); |
| 38 |
+ |
| 39 |
+ if (ps_name_str0.empty ()) |
| 40 |
+ warning (_f ("no PostScript font name for font `%s'", file_name)); |
| 41 |
|
| 42 |
diff --git a/media-sound/lilypond/lilypond-2.22.1.ebuild b/media-sound/lilypond/lilypond-2.22.1-r1.ebuild |
| 43 |
similarity index 98% |
| 44 |
rename from media-sound/lilypond/lilypond-2.22.1.ebuild |
| 45 |
rename to media-sound/lilypond/lilypond-2.22.1-r1.ebuild |
| 46 |
index 8757a650991f..48e98a5be8f0 100644 |
| 47 |
--- a/media-sound/lilypond/lilypond-2.22.1.ebuild |
| 48 |
+++ b/media-sound/lilypond/lilypond-2.22.1-r1.ebuild |
| 49 |
@@ -64,6 +64,7 @@ RESTRICT="test" |
| 50 |
|
| 51 |
PATCHES=( |
| 52 |
"${FILESDIR}"/${P}-fix-font-size.patch |
| 53 |
+ "${FILESDIR}"/${P}-free_font.patch |
| 54 |
) |
| 55 |
|
| 56 |
DOCS=( DEDICATION HACKING README.md ROADMAP ) |
| 57 |
|
| 58 |
diff --git a/media-sound/lilypond/lilypond-2.23.0.ebuild b/media-sound/lilypond/lilypond-2.23.0-r1.ebuild |
| 59 |
similarity index 98% |
| 60 |
rename from media-sound/lilypond/lilypond-2.23.0.ebuild |
| 61 |
rename to media-sound/lilypond/lilypond-2.23.0-r1.ebuild |
| 62 |
index 71ce2205451a..e20ef84346b3 100644 |
| 63 |
--- a/media-sound/lilypond/lilypond-2.23.0.ebuild |
| 64 |
+++ b/media-sound/lilypond/lilypond-2.23.0-r1.ebuild |
| 65 |
@@ -59,6 +59,7 @@ RESTRICT="test" |
| 66 |
|
| 67 |
PATCHES=( |
| 68 |
"${FILESDIR}"/${P}-fix-font-size.patch |
| 69 |
+ "${FILESDIR}"/${PN}-2.22.1-free_font.patch |
| 70 |
) |
| 71 |
|
| 72 |
DOCS=( DEDICATION HACKING README.md ROADMAP ) |
| 73 |
|
| 74 |
diff --git a/media-sound/lilypond/lilypond-2.23.2.ebuild b/media-sound/lilypond/lilypond-2.23.2-r1.ebuild |
| 75 |
similarity index 97% |
| 76 |
rename from media-sound/lilypond/lilypond-2.23.2.ebuild |
| 77 |
rename to media-sound/lilypond/lilypond-2.23.2-r1.ebuild |
| 78 |
index adb492fe79e4..267d1a8af4de 100644 |
| 79 |
--- a/media-sound/lilypond/lilypond-2.23.2.ebuild |
| 80 |
+++ b/media-sound/lilypond/lilypond-2.23.2-r1.ebuild |
| 81 |
@@ -1,4 +1,4 @@ |
| 82 |
-# Copyright 1999-2021 Gentoo Authors |
| 83 |
+# Copyright 1999-2022 Gentoo Authors |
| 84 |
# Distributed under the terms of the GNU General Public License v2 |
| 85 |
|
| 86 |
EAPI=7 |
| 87 |
@@ -59,6 +59,7 @@ RESTRICT="test" |
| 88 |
|
| 89 |
PATCHES=( |
| 90 |
"${FILESDIR}"/${PN}-2.23.0-fix-font-size.patch |
| 91 |
+ "${FILESDIR}"/${PN}-2.22.1-free_font.patch |
| 92 |
) |
| 93 |
|
| 94 |
DOCS=( DEDICATION HACKING README.md ROADMAP ) |
| 95 |
|
| 96 |
diff --git a/media-sound/lilypond/lilypond-9999.ebuild b/media-sound/lilypond/lilypond-9999.ebuild |
| 97 |
index ebce02eda789..23bd30635ead 100644 |
| 98 |
--- a/media-sound/lilypond/lilypond-9999.ebuild |
| 99 |
+++ b/media-sound/lilypond/lilypond-9999.ebuild |
| 100 |
@@ -59,6 +59,7 @@ RESTRICT="test" |
| 101 |
|
| 102 |
PATCHES=( |
| 103 |
"${FILESDIR}"/${PN}-2.23.0-fix-font-size.patch |
| 104 |
+ "${FILESDIR}"/${PN}-2.22.1-free_font.patch |
| 105 |
) |
| 106 |
|
| 107 |
DOCS=( DEDICATION HACKING README.md ROADMAP ) |
Archives