From 05cbd5239c56f47e0cb5128b1381a7bf3e9d45b1 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Nov 26 2014 08:54:45 +0000
Subject: import harfbuzz-0.9.20-4.el7


---

diff --git a/SOURCES/harfbuzz-0.9.20-fix-graphite2.patch b/SOURCES/harfbuzz-0.9.20-fix-graphite2.patch
new file mode 100644
index 0000000..5f910e6
--- /dev/null
+++ b/SOURCES/harfbuzz-0.9.20-fix-graphite2.patch
@@ -0,0 +1,37 @@
+diff --git a/src/hb-graphite2.cc b/src/hb-graphite2.cc
+index a309ca8..709aa94 100644
+--- a/src/hb-graphite2.cc
++++ b/src/hb-graphite2.cc
+@@ -209,6 +209,7 @@ struct hb_graphite2_cluster_t {
+   unsigned int num_chars;
+   unsigned int base_glyph;
+   unsigned int num_glyphs;
++  unsigned int cluster;
+ };
+ 
+ hb_bool_t
+@@ -299,6 +300,7 @@ _hb_graphite2_shape (hb_shape_plan_t    *shape_plan,
+   memset (clusters, 0, sizeof (clusters[0]) * buffer->len);
+ 
+   hb_codepoint_t *pg = gids;
++  clusters[0].cluster = buffer->info[0].cluster;
+   for (is = gr_seg_first_slot (seg), ic = 0; is; is = gr_slot_next_in_segment (is), ic++)
+   {
+     unsigned int before = gr_slot_before (is);
+@@ -316,6 +318,7 @@ _hb_graphite2_shape (hb_shape_plan_t    *shape_plan,
+     {
+       hb_graphite2_cluster_t *c = clusters + ci + 1;
+       c->base_char = clusters[ci].base_char + clusters[ci].num_chars;
++      c->cluster = buffer->info[c->base_char].cluster;
+       c->num_chars = before - c->base_char;
+       c->base_glyph = ic;
+       c->num_glyphs = 0;
+@@ -335,7 +338,7 @@ _hb_graphite2_shape (hb_shape_plan_t    *shape_plan,
+     {
+       hb_glyph_info_t *info = &buffer->info[clusters[i].base_glyph + j];
+       info->codepoint = gids[clusters[i].base_glyph + j];
+-      info->cluster = gr_cinfo_base(gr_seg_cinfo(seg, clusters[i].base_char));
++      info->cluster = clusters[i].cluster;
+     }
+   }
+   buffer->len = glyph_count;
diff --git a/SPECS/harfbuzz.spec b/SPECS/harfbuzz.spec
index 0311c4f..1e2b61d 100644
--- a/SPECS/harfbuzz.spec
+++ b/SPECS/harfbuzz.spec
@@ -1,12 +1,12 @@
 Name:           harfbuzz
 Version:        0.9.20
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Text shaping library
 
 License:        MIT
 URL:            http://freedesktop.org/wiki/Software/HarfBuzz
 Source0:        http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-%{version}.tar.bz2
-
+Patch0:         harfbuzz-0.9.20-fix-graphite2.patch
 BuildRequires:  cairo-devel
 BuildRequires:  freetype-devel
 BuildRequires:  glib2-devel
@@ -36,7 +36,7 @@ This package contains Harfbuzz ICU support library.
 
 %prep
 %setup -q
-
+%patch0 -p1 -b .fix-graphite2
 
 %build
 %configure --disable-static --with-graphite2
@@ -79,6 +79,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 %{_libdir}/libharfbuzz-icu.so.*
 
 %changelog
+* Mon Aug 18 2014 Parag Nemade <pnemade AT redhat DOT com> - 0.9.20-4
+- Resolves:rh#998812 - gedit segfaults when loading a certain file
+
 * Fri Jan 24 2014 Daniel Mach <dmach@redhat.com> - 0.9.20-3
 - Mass rebuild 2014-01-24