[gentoo-commits] gentoo-x86 commit in x11-libs/cairo/files: cairo-respect-fontconfig.patch

[gentoo-commits] gentoo-x86 commit in x11-libs/cairo/files: cairo-respect-fontconfig.patch

[Ben de Groot (yngwin)]

yngwin      12/07/24 13:08:01

  Added:                cairo-respect-fontconfig.patch
  Log:
  Take over maintainership, since spatz is being retired. Add back qt-surface.patch to 1.12.2 (bug #418133). Add respect-fontconfig patch by Paul Bradbury (https://bugs.freedesktop.org/show_bug.cgi?id=11838#c8).
  
  (Portage version: 2.2.0_alpha120/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  x11-libs/cairo/files/cairo-respect-fontconfig.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/files/cairo-respect-fontconfig.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/files/cairo-respect-fontconfig.patch?rev=1.1&content-type=text/plain

Index: cairo-respect-fontconfig.patch
===================================================================
--- cairo-1.7.6-orig/src/cairo-ft-font.c	2008-09-29 21:43:13.000000000 +0100
+++ cairo-1.7.6/src/cairo-ft-font.c	2008-09-29 21:52:19.000000000 +0100
@@ -1705,7 +1705,9 @@
 	options->base.subpixel_order = other->base.subpixel_order;
     }
 
-    if (options->base.hint_style == CAIRO_HINT_STYLE_DEFAULT)
+    options->base.hint_style = CAIRO_HINT_STYLE_DEFAULT;
+
+    if (other->base.hint_style != CAIRO_HINT_STYLE_DEFAULT)
 	options->base.hint_style = other->base.hint_style;
 
     if (other->base.hint_style == CAIRO_HINT_STYLE_NONE)