From deba8115d2c2af26df42966b91ef04ff4dd79cde Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 14 May 2020 11:09:11 +0100 Subject: gentoo resync : 14.05.2020 --- .../lilypond/files/lilypond-2.17.2-tex-docs.patch | 20 --------------- .../lilypond/files/lilypond-2.18.2-fontforge.patch | 29 ---------------------- .../files/lilypond-2.21.1-fix-font-size.patch | 10 ++++++++ 3 files changed, 10 insertions(+), 49 deletions(-) delete mode 100644 media-sound/lilypond/files/lilypond-2.17.2-tex-docs.patch delete mode 100644 media-sound/lilypond/files/lilypond-2.18.2-fontforge.patch create mode 100644 media-sound/lilypond/files/lilypond-2.21.1-fix-font-size.patch (limited to 'media-sound/lilypond/files') diff --git a/media-sound/lilypond/files/lilypond-2.17.2-tex-docs.patch b/media-sound/lilypond/files/lilypond-2.17.2-tex-docs.patch deleted file mode 100644 index 9e0d7082c0d8..000000000000 --- a/media-sound/lilypond/files/lilypond-2.17.2-tex-docs.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- lilypond-2.17.2/GNUmakefile.in -+++ lilypond-2.17.2/GNUmakefile.in -@@ -5,7 +5,7 @@ - SUBDIRS = python scripts \ - flower lily \ - mf ly \ -- tex ps scm \ -+ ps scm \ - po \ - elisp vim \ - input \ -@@ -14,7 +14,7 @@ - - ## this convoluted construction is necessary, since we don't know the - ## value of DOCUMENTATION here. --documentation-dir=$(if $(findstring no,$(DOCUMENTATION)),,Documentation) -+documentation-dir=$(if $(findstring no,$(DOCUMENTATION)),,Documentation tex) - - SCRIPTS = configure autogen.sh smart-autogen.sh smart-configure.sh - README_FILES = COPYING COPYING.FDL DEDICATION ROADMAP HACKING \ diff --git a/media-sound/lilypond/files/lilypond-2.18.2-fontforge.patch b/media-sound/lilypond/files/lilypond-2.18.2-fontforge.patch deleted file mode 100644 index cfd3295b3948..000000000000 --- a/media-sound/lilypond/files/lilypond-2.18.2-fontforge.patch +++ /dev/null @@ -1,29 +0,0 @@ -From a832764e7300d48468a6812077b899a4beed271b Mon Sep 17 00:00:00 2001 -From: Masamichi Hosoda -Date: Sat, 22 Aug 2015 21:20:17 +0900 -Subject: [PATCH] Fix fontforge version detection - -Newer fontforge shows git hash in `fontforge --version`. -In that case, configure script -might recognize it as date (version). ---- - aclocal.m4 | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/aclocal.m4 b/aclocal.m4 -index 48d0b77..0037c58 100644 ---- a/aclocal.m4 -+++ b/aclocal.m4 -@@ -42,7 +42,8 @@ AC_DEFUN(STEPMAKE_GET_VERSION, [ - - if test -z "$_ver"; then - ## If empty, try date [fontforge] -- eval _ver=\"\`("$1" --version || "$1" -V) 2>&1 | grep '[0-9]\{6,8\}' \ -+ eval _ver=\"\`("$1" --version || "$1" -V) 2>&1 \ -+ | grep '\(^\|[^0-9a-f]\)[0-9]\{6,8\}\([^0-9a-f]\|$\)' \ - | head -n 1 \ - | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" - fi --- -2.6.2 - diff --git a/media-sound/lilypond/files/lilypond-2.21.1-fix-font-size.patch b/media-sound/lilypond/files/lilypond-2.21.1-fix-font-size.patch new file mode 100644 index 000000000000..cdd49584900e --- /dev/null +++ b/media-sound/lilypond/files/lilypond-2.21.1-fix-font-size.patch @@ -0,0 +1,10 @@ +--- lilypond-2.19.49.orig/lily/pango-font.cc 2016-10-16 07:16:18.000000000 -0400 ++++ lilypond-2.19.49.new/lily/pango-font.cc 2016-10-29 22:39:02.921622080 -0400 +@@ -317,7 +317,7 @@ + pango_fc_font_unlock_face (fcfont); + pango_glyph_string_free (pgs); + pgs = 0; +- PangoFontDescription *descr = pango_font_describe (pa->font); ++ PangoFontDescription *descr = pango_context_get_font_description (context_); + Real size = pango_font_description_get_size (descr) + / (Real (PANGO_SCALE)); -- cgit v1.2.3