diff --git a/.gitignore b/.gitignore index f2abbaf..7672be8 100644 --- a/.gitignore +++ b/.gitignore @@ -60,3 +60,4 @@ pango-1.28.1.tar.bz2 /pango-1.42.2.tar.xz /pango-1.42.3.tar.xz /pango-1.42.4.tar.xz +/pango-1.43.0.tar.xz diff --git a/pango-fixes-get-variations-crash.patch b/pango-fixes-get-variations-crash.patch deleted file mode 100644 index ca96086..0000000 --- a/pango-fixes-get-variations-crash.patch +++ /dev/null @@ -1,31 +0,0 @@ -commit ad92e199f221499c19f22dce7a16e7d770ad3ae7 -Author: Carsten Pfeiffer -Date: Fri Aug 10 16:06:20 2018 +0200 - - Fix crash in pango_fc_font_key_get_variations() when key is null - -diff --git a/pango/pangofc-shape.c b/pango/pangofc-shape.c -index a59ca67c..53269d73 100644 ---- a/pango/pangofc-shape.c -+++ b/pango/pangofc-shape.c -@@ -380,8 +380,10 @@ _pango_fc_shape (PangoFont *font, - fc_font->is_hinted ? ft_face->size->metrics.x_ppem : 0, - fc_font->is_hinted ? ft_face->size->metrics.y_ppem : 0); - -- variations = pango_fc_font_key_get_variations (key); -- if (variations) -+ if (key) -+ { -+ variations = pango_fc_font_key_get_variations (key); -+ if (variations) - { - guint n_variations; - hb_variation_t *hb_variations; -@@ -391,6 +393,7 @@ _pango_fc_shape (PangoFont *font, - - g_free (hb_variations); - } -+ } - - hb_buffer = acquire_buffer (&free_buffer); - diff --git a/pango.spec b/pango.spec index 801b39a..e5cd08d 100644 --- a/pango.spec +++ b/pango.spec @@ -8,14 +8,13 @@ %global fribidi_version 1.0 Name: pango -Version: 1.42.4 -Release: 2%{?dist} +Version: 1.43.0 +Release: 1%{?dist} Summary: System for layout and rendering of internationalized text License: LGPLv2+ URL: http://www.pango.org -Source0: https://download.gnome.org/sources/%{name}/1.42/%{name}-%{version}.tar.xz -Patch0: pango-fixes-get-variations-crash.patch +Source0: https://download.gnome.org/sources/%{name}/1.43/%{name}-%{version}.tar.xz BuildRequires: pkgconfig(cairo) >= %{cairo_version} BuildRequires: pkgconfig(freetype2) >= %{freetype_version} @@ -76,7 +75,6 @@ the functionality of the installed %{name} package. %prep %setup -q -n pango-%{version} -%patch0 -p1 -b .crash %build @@ -102,7 +100,7 @@ fi %files %license COPYING -%doc README AUTHORS NEWS +%doc NEWS README.md %{_libdir}/libpango*-*.so.* %{_bindir}/pango-list %{_bindir}/pango-view @@ -130,6 +128,9 @@ fi %changelog +* Wed Jan 23 2019 Kalev Lember - 1.43.0-1 +- Update to 1.43.0 + * Fri Jan 18 2019 Peng Wu - 1.42.4-2 - Fixes crash in pango_fc_font_key_get_variations when key is null diff --git a/sources b/sources index 7c50a41..61a028f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pango-1.42.4.tar.xz) = 993e97f647eba0c5ed90bcfcb8228bf67fa3f20b1f4331e4e40a30788d7c3ac55eee1209471bf21df125cb8fc6121acc8062a9da2f8a7d6cbe8e9ad13a9320dc +SHA512 (pango-1.43.0.tar.xz) = 079a46bf95772f9f7ea537a84aec2fc4486dfee7377e605be4ce2309b4c9027ce8a23d722cef7c211fa5239108d3910f55488436e9e466be885c728557df26a9