Attachment 933896 Details for Bug 1136522 – Use HarfBuzz

Use HarfBuzz

0001-Use-HarfBuzz.patch (text/plain), 3.65 KB, created by Michael Kuhn on 2014-09-02 18:34:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Kuhn

Created: 2014-09-02 18:34:40 UTC

Size: 3.65 KB

patch

obsolete

>From 5f3e244572a2a4ce1b6b9c69b733a73d294d04fd Mon Sep 17 00:00:00 2001
>From: Michael Kuhn <suraia@ikkoku.de>
>Date: Wed, 6 Aug 2014 12:07:35 +0200
>Subject: [PATCH] Use HarfBuzz.
>
>---
> freetype-2.5.3-harfbuzz.patch | 32 ++++++++++++++++++++++++++++++++
> freetype.spec                 | 17 +++++++++++++++--
> 2 files changed, 47 insertions(+), 2 deletions(-)
> create mode 100644 freetype-2.5.3-harfbuzz.patch
>
>diff --git a/freetype-2.5.3-harfbuzz.patch b/freetype-2.5.3-harfbuzz.patch
>new file mode 100644
>index 0000000..414e779
>--- /dev/null
>+++ b/freetype-2.5.3-harfbuzz.patch
>@@ -0,0 +1,32 @@
>+From 23367ff97f33ef6a2b7e1fced1157c87a46d9596 Mon Sep 17 00:00:00 2001
>+From: Werner Lemberg <wl@gnu.org>
>+Date: Mon, 17 Mar 2014 07:33:14 +0100
>+Subject: [PATCH 04/58] Fix Savannah bug #41869.
>+
>+This works around a problem with HarfBuzz (<= 0.9.26), which doesn't
>+validate glyph indices returned by
>+`hb_ot_layout_lookup_collect_glyphs'.
>+
>+* src/autofit/hbshim.c (af_get_coverage): Guard `idx'.
>+
>+* docs/CHANGES: Updated.
>+---
>+diff --git a/src/autofit/hbshim.c b/src/autofit/hbshim.c
>+index 11fb743..2eda8d7 100644
>+--- a/src/autofit/hbshim.c
>++++ b/src/autofit/hbshim.c
>+@@ -347,6 +347,11 @@
>+       count++;
>+ #endif
>+ 
>++      /* HarfBuzz 0.9.26 and older doesn't validate glyph indices */
>++      /* returned by `hb_ot_layout_lookup_collect_glyphs'...      */
>++      if ( idx >= (hb_codepoint_t)globals->glyph_count )
>++        continue;
>++
>+       if ( gstyles[idx] == AF_STYLE_UNASSIGNED )
>+         gstyles[idx] = (FT_Byte)style_class->style;
>+ #ifdef FT_DEBUG_LEVEL_TRACE
>+-- 
>+2.0.4
>+
>diff --git a/freetype.spec b/freetype.spec
>index 0eff89a..30bdf37 100644
>--- a/freetype.spec
>+++ b/freetype.spec
>@@ -2,12 +2,13 @@
> # Pass '--with subpixel_rendering' on rpmbuild command-line to enable.
> %{!?_with_subpixel_rendering: %{!?_without_subpixel_rendering: %define _without_subpixel_rendering --without-subpixel_rendering}}
> 
>+%{!?with_harfbuzz:%define with_harfbuzz 1}
> %{!?with_xfree86:%define with_xfree86 1}
> 
> Summary: A free and portable font rendering engine
> Name: freetype
> Version: 2.5.3
>-Release: 9%{?dist}
>+Release: 10%{?dist}
> License: (FTL or GPLv2+) and BSD and MIT and Public Domain and zlib with acknowledgement
> Group: System Environment/Libraries
> URL: http://www.freetype.org
>@@ -32,6 +33,9 @@ Patch90:  freetype-2.4.12-pkgconfig.patch
> # https://bugzilla.redhat.com/show_bug.cgi?id=1079302
> Patch91:  freetype-2.5.3-freetype-config-libs.patch
> 
>+# https://savannah.nongnu.org/bugs/?41869
>+Patch92:  freetype-2.5.3-harfbuzz.patch
>+
> Buildroot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
> 
> BuildRequires: libX11-devel
>@@ -39,6 +43,10 @@ BuildRequires: libpng-devel
> BuildRequires: zlib-devel
> BuildRequires: bzip2-devel
> 
>+%if %{with_harfbuzz}
>+BuildRequires: harfbuzz-devel
>+%endif
>+
> Provides: %{name}-bytecode
> %if %{?_with_subpixel_rendering:1}%{!?_with_subpixel_rendering:0}
> Provides: %{name}-subpixel
>@@ -97,13 +105,15 @@ popd
> 
> %patch91 -p1 -b .freetype-config-libs
> 
>+%patch92 -p1 -b .harfbuzz
>+
> %build
> 
> %configure --disable-static \
>            --with-zlib=yes \
>            --with-bzip2=yes \
>            --with-png=yes \
>-           --with-harfbuzz=no
>+           --with-harfbuzz=%{?with_harfbuzz:yes}%{!?with_harfbuzz:no}
> sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' builds/unix/libtool
> sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' builds/unix/libtool
> make %{?_smp_mflags}
>@@ -217,6 +227,9 @@ rm -rf $RPM_BUILD_ROOT
> %{_mandir}/man1/*
> 
> %changelog
>+* Tue Sep 02 2014 Michael Kuhn <suraia@ikkoku.de> - 2.5.3-10
>+- Use HarfBuzz.
>+
> * Mon Aug 18 2014 Marek Kasik <mkasik@redhat.com> - 2.5.3-9
> - Simplify getting of wordsize
> 
>-- 
>2.1.0
>

Actions: View

Attachments on bug 1136522: 933896 | 934031