Attachment 933885 Details for Bug 1136510 – Respect fontconfig's hintstyle

Respect fontconfig's hintstyle

0001-Respect-fontconfig-s-hintstyle.patch (text/plain), 2.59 KB, created by Michael Kuhn on 2014-09-02 18:16:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Kuhn

Created: 2014-09-02 18:16:37 UTC

Size: 2.59 KB

patch

obsolete

>From b931b67c7d76024a9d7a32f9e246bc65c2c8fd54 Mon Sep 17 00:00:00 2001
>From: Michael Kuhn <suraia@ikkoku.de>
>Date: Sat, 2 Aug 2014 23:28:22 +0200
>Subject: [PATCH] Respect fontconfig's hintstyle.
>
>---
> cairo-hintstyle.patch | 14 ++++++++++++++
> cairo.spec            |  7 ++++++-
> 2 files changed, 20 insertions(+), 1 deletion(-)
> create mode 100644 cairo-hintstyle.patch
>
>diff --git a/cairo-hintstyle.patch b/cairo-hintstyle.patch
>new file mode 100644
>index 0000000..6998879
>--- /dev/null
>+++ b/cairo-hintstyle.patch
>@@ -0,0 +1,14 @@
>+diff -ru cairo-1.13.1.orig/src/cairo-ft-font.c cairo-1.13.1/src/cairo-ft-font.c
>+--- cairo-1.13.1.orig/src/cairo-ft-font.c	2013-09-17 22:52:20.000000000 +0200
>++++ cairo-1.13.1/src/cairo-ft-font.c	2014-08-02 23:13:12.225175547 +0200
>+@@ -1844,8 +1844,8 @@
>+     if (options->base.hint_style == CAIRO_HINT_STYLE_DEFAULT)
>+ 	options->base.hint_style = other->base.hint_style;
>+ 
>+-    if (other->base.hint_style == CAIRO_HINT_STYLE_NONE)
>+-	options->base.hint_style = CAIRO_HINT_STYLE_NONE;
>++    if (other->base.hint_style != CAIRO_HINT_STYLE_DEFAULT)
>++	options->base.hint_style = other->base.hint_style;
>+ 
>+     if (options->base.lcd_filter == CAIRO_LCD_FILTER_DEFAULT)
>+ 	options->base.lcd_filter = other->base.lcd_filter;
>diff --git a/cairo.spec b/cairo.spec
>index 8694fb2..1174b08 100644
>--- a/cairo.spec
>+++ b/cairo.spec
>@@ -7,7 +7,7 @@
> Summary:	A 2D graphics library
> Name:		cairo
> Version:	1.13.1
>-Release:	0.4.git%{shortcommit}%{?dist}
>+Release:	0.5.git%{shortcommit}%{?dist}
> URL:		http://cairographics.org
> #VCS:		git:git://git.freedesktop.org/git/cairo
> #Source0:	http://cairographics.org/snapshots/%{name}-%{version}.tar.gz
>@@ -25,6 +25,7 @@ Group:		System Environment/Libraries
> Patch0:		0001-xlib-Don-t-crash-when-swapping-a-0-sized-glyph.patch
> Patch1:		0002-xcb-Don-t-crash-when-swapping-a-0-sized-glyph.patch
> Patch3:         cairo-multilib.patch
>+Patch4:         cairo-hintstyle.patch
> 
> BuildRequires: pkgconfig
> BuildRequires: libXrender-devel
>@@ -107,6 +108,7 @@ This package contains tools for working with the cairo graphics library.
> %patch0 -p1 -b .xlib-swap
> %patch1 -p1 -b .xcb-swap
> %patch3 -p1 -b .multilib
>+%patch4 -p1 -b .hintstyle
> 
> %build
> export CFLAGS="%{optflags} -flto -ffat-lto-objects"
>@@ -195,6 +197,9 @@ make check V=1 %{?_smp_mflags} ||:
> %{_libdir}/cairo/
> 
> %changelog
>+* Sat Aug 02 2014 Michael Kuhn <suraia@ikkoku.de> - 1.13.1-0.5.git337ab1f
>+- Respect fontconfig's hintstyle.
>+
> * Fri Aug 15 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.13.1-0.4.git337ab1f
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
> 
>-- 
>2.1.0
>

Actions: View

Attachments on bug 1136510: 933885