diff options
| -rw-r--r-- | recipes/cairo.recipe | 4 | ||||
| -rw-r--r-- | recipes/cairo/0001-Fix-broken-canvas-text-font-size-in-Inkscape.patch | 32 |
2 files changed, 35 insertions, 1 deletions
diff --git a/recipes/cairo.recipe b/recipes/cairo.recipe index 0939e9c3..f8073c43 100644 --- a/recipes/cairo.recipe +++ b/recipes/cairo.recipe @@ -12,7 +12,9 @@ class Recipe(recipe.Recipe): autoreconf_sh = 'NOCONFIGURE=1 ./autogen.sh' deps = ['glib', 'libpng', 'zlib', 'pixman', 'fontconfig', 'freetype'] patches = ['cairo/0001-Fix-compilation-with-Android-s-bionic-libc.patch', - 'cairo/0001-Disable-building-of-the-tests.patch'] + 'cairo/0001-Disable-building-of-the-tests.patch', + 'cairo/0001-Fix-broken-canvas-text-font-size-in-Inkscape.patch', + ] files_libs = ['libcairo', 'libcairo-gobject', 'libcairo-script-interpreter'] files_devel = [ diff --git a/recipes/cairo/0001-Fix-broken-canvas-text-font-size-in-Inkscape.patch b/recipes/cairo/0001-Fix-broken-canvas-text-font-size-in-Inkscape.patch new file mode 100644 index 00000000..b128eab7 --- /dev/null +++ b/recipes/cairo/0001-Fix-broken-canvas-text-font-size-in-Inkscape.patch @@ -0,0 +1,32 @@ +From 8b798c320f6fd2d87349d0a716304474022bc5ea Mon Sep 17 00:00:00 2001 +From: Bryce Harrington <bryce@osg.samsung.com> +Date: Fri, 24 Apr 2015 18:23:46 -0700 +Subject: [PATCH] Fix broken canvas text font size in Inkscape + +An earlier fix to bug 84324 added a regression in the font size of +canvas text in Inkscape when compiled with the Quartz backend. + +Patch from Andrea Canciani + +Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=84324 +Reviewed-by: Bryce Harrington <bryce@osg.samsung.com> +--- + src/cairo-quartz-font.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/cairo-quartz-font.c b/src/cairo-quartz-font.c +index 02f3426..feee61a 100644 +--- a/src/cairo-quartz-font.c ++++ b/src/cairo-quartz-font.c +@@ -560,7 +560,7 @@ _cairo_quartz_init_glyph_path (cairo_quartz_scaled_font_t *font, + -font->base.scale.yy, + 0, 0); + +- ctFont = CTFontCreateWithGraphicsFont (font_face->cgFont, 0.0, NULL, NULL); ++ ctFont = CTFontCreateWithGraphicsFont (font_face->cgFont, 1.0, NULL, NULL); + glyphPath = CTFontCreatePathForGlyph (ctFont, glyph, &textMatrix); + CFRelease (ctFont); + if (!glyphPath) +-- +2.4.3 + |