diff --git a/.gitignore b/.gitignore index ce83c44..cd364be 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ pango-1.28.1.tar.bz2 /pango-1.35.3.tar.xz /pango-1.36.0.tar.xz /pango-1.36.1.tar.xz +/pango-1.36.2.tar.xz diff --git a/pango-fix-sigfpe.patch b/pango-fix-sigfpe.patch deleted file mode 100644 index 2028e62..0000000 --- a/pango-fix-sigfpe.patch +++ /dev/null @@ -1,35 +0,0 @@ -From a6c318ee505aeabe6f84e1543d68834b9e0e7acf Mon Sep 17 00:00:00 2001 -From: Behdad Esfahbod -Date: Sun, 15 Dec 2013 18:42:17 -0500 -Subject: [PATCH] Bug 720379 - SIGFPE in pango_layout_iter_get_char_extents() - -Untested. ---- - pango/pango-layout.c | 11 +++++++++-- - 1 file changed, 9 insertions(+), 2 deletions(-) - -diff --git a/pango/pango-layout.c b/pango/pango-layout.c -index a024d11..607a5f0 100644 ---- a/pango/pango-layout.c -+++ b/pango/pango-layout.c -@@ -6178,8 +6178,15 @@ pango_layout_iter_get_char_extents (PangoLayoutIter *iter, - return; - } - -- x0 = (iter->character_position * cluster_rect.width) / iter->cluster_num_chars; -- x1 = ((iter->character_position + 1) * cluster_rect.width) / iter->cluster_num_chars; -+ if (iter->cluster_num_chars) -+ { -+ x0 = (iter->character_position * cluster_rect.width) / iter->cluster_num_chars; -+ x1 = ((iter->character_position + 1) * cluster_rect.width) / iter->cluster_num_chars; -+ } -+ else -+ { -+ x0 = x1 = 0; -+ } - - logical_rect->width = x1 - x0; - logical_rect->height = cluster_rect.height; --- -1.8.4.2 - diff --git a/pango.spec b/pango.spec index d98bec8..91a675f 100644 --- a/pango.spec +++ b/pango.spec @@ -9,8 +9,8 @@ Summary: System for layout and rendering of internationalized text Name: pango -Version: 1.36.1 -Release: 2%{?dist} +Version: 1.36.2 +Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries #VCS: git:git://git.gnome.org/pango @@ -35,8 +35,6 @@ BuildRequires: cairo-gobject-devel # Bootstrap requirements BuildRequires: gnome-common intltool gtk-doc -Patch0: %{name}-fix-sigfpe.patch - %description Pango is a library for laying out and rendering of text, with an emphasis on internationalization. Pango can be used anywhere that text layout is needed, @@ -74,7 +72,6 @@ the functionality of the installed %{name} package. %prep %setup -q -n pango-%{version} -%patch0 -p1 -b .0-sigfpe %build @@ -158,6 +155,9 @@ fi %changelog +* Wed Feb 05 2014 Richard Hughes - 1.36.2-1 +- Update to 1.36.2 + * Wed Jan 22 2014 Akira TAGOH - 1.36.1-2 - Backport a patch to fix SIGFPE in pango_layout_iter_get_char_extents() (#1036351) diff --git a/sources b/sources index 172d968..93460f7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9e0d3a1ea395172f8c39ba98a4d2081a pango-1.36.1.tar.xz +253026c7132c22e52cefd998ba89a742 pango-1.36.2.tar.xz