[arch-commits] Commit in lilypond/trunk (PKGBUILD lilyfontsize.patch)

[Sergej Pupykin]

    Date: Friday, December 2, 2016 @ 18:31:49
  Author: spupykin
Revision: 197771

Added:
  lilypond/trunk/lilyfontsize.patch
Modified:
  lilypond/trunk/PKGBUILD

--------------------+
 PKGBUILD           |    9 ++++++---
 lilyfontsize.patch |   13 +++++++++++++
 2 files changed, 19 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-12-02 17:22:49 UTC (rev 197770)
+++ PKGBUILD	2016-12-02 18:31:49 UTC (rev 197771)
@@ -6,7 +6,7 @@
 
 pkgname=lilypond
 pkgver=2.18.2
-pkgrel=3
+pkgrel=4
 pkgdesc="An automated music engraving system"
 arch=('i686' 'x86_64')
 url="http://lilypond.org"
@@ -16,8 +16,10 @@
 	     'gsfonts' 'texi2html' 'dblatex' 'texlive-langcyrillic' 'imagemagick'
 	     'zip' 'rsync' 'netpbm')
 options=('emptydirs')
-source=(http://download.linuxaudio.org/lilypond/sources/v2.18/$pkgname-$pkgver.tar.gz)
-md5sums=('3c4bcbb708d12644668b32bfe82ebf25')
+source=("http://download.linuxaudio.org/lilypond/sources/v2.18/$pkgname-$pkgver.tar.gz"
+	lilyfontsize.patch)
+sha256sums=('329d733765b0ba7be1878ae3f457dbbb875cc2840d2b75af4afc48c9454fba07'
+            '17b86b7a0b09b73cb5cf8751464571cf6a785c0b1a23db425cc828855a9d8ae6')
 
 prepare() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -32,6 +34,7 @@
   sed -i 's|GUILE_LDFLAGS=.*|GUILE_LDFLAGS="`pkg-config --libs guile-1.8`"|' configure
 
   rm -rf lily/out/ python/out/
+  patch -p1 -i "$srcdir/lilyfontsize.patch"
 }
 
 build() {

Added: lilyfontsize.patch
===================================================================
--- lilyfontsize.patch	                        (rev 0)
+++ lilyfontsize.patch	2016-12-02 18:31:49 UTC (rev 197771)
@@ -0,0 +1,13 @@
+diff -wbBur lilypond-2.18.2/lily/pango-font.cc lilypond-2.18.2.fix/lily/pango-font.cc
+--- lilypond-2.18.2/lily/pango-font.cc	2014-03-17 19:29:16.000000000 +0400
++++ lilypond-2.18.2.fix/lily/pango-font.cc	2016-12-02 19:36:55.634555707 +0300
+@@ -315,7 +315,8 @@
+   pango_fc_font_unlock_face (fcfont);
+   pango_glyph_string_free (pgs);
+   pgs = 0;
+-  PangoFontDescription *descr = pango_font_describe (pa->font);
++//  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));
+