diff --git a/639.patch b/639.patch deleted file mode 100644 index 6ed178b..0000000 --- a/639.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 2771f621ed31deeae6c7ad984db1e5aa33f08a3c Mon Sep 17 00:00:00 2001 -From: oreo639 -Date: Thu, 22 Sep 2022 16:12:37 -0700 -Subject: [PATCH] layout: Fix crash when no font is installed - -Fixes: https://gitlab.gnome.org/GNOME/pango/-/issues/701 ---- - pango/pango-layout.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/pango/pango-layout.c b/pango/pango-layout.c -index a1c472039..b8eeede00 100644 ---- a/pango/pango-layout.c -+++ b/pango/pango-layout.c -@@ -5707,13 +5707,14 @@ pango_layout_run_get_extents_and_height (PangoLayoutRun *run, - } - else - { -- double xscale, yscale; -+ double xscale = 0, yscale = 0; - - if (!metrics) - metrics = pango_font_get_metrics (run->item->analysis.font, - run->item->analysis.language); - -- pango_font_get_scale_factors (run->item->analysis.font, &xscale, &yscale); -+ if (G_LIKELY(run->item->analysis.font)) -+ pango_font_get_scale_factors (run->item->analysis.font, &xscale, &yscale); - *height = pango_font_metrics_get_height (metrics) * MAX (xscale, yscale); - } - } --- -GitLab - diff --git a/_service b/_service index 1bb54fb..df07062 100644 --- a/_service +++ b/_service @@ -2,7 +2,7 @@ https://gitlab.gnome.org/GNOME/pango.git git - refs/tags/1.50.10 + refs/tags/1.50.11 @PARENT_TAG@+@TAG_OFFSET@ (.*)\+0 \1 diff --git a/pango-1.50.10.obscpio b/pango-1.50.10.obscpio deleted file mode 100644 index f98d0f0..0000000 --- a/pango-1.50.10.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4a5ac5536a085b5749e9fd5a374b3f5c45af3b34571fc46244f5988b08c80881 -size 6885901 diff --git a/pango-1.50.11.obscpio b/pango-1.50.11.obscpio new file mode 100644 index 0000000..ae7238b --- /dev/null +++ b/pango-1.50.11.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1a9738e2cbefbe717a194bb472cd47be8e72b05413613159a866cb6ef34cf71e +size 6892045 diff --git a/pango.changes b/pango.changes index e61dcf0..28fb3cd 100644 --- a/pango.changes +++ b/pango.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Oct 4 07:52:51 UTC 2022 - Bjørn Lie + +- Update to version 1.50.11: + + Don't crash for lack of fonts. + + Avoid a crash in shaping. +- Drop 639.patch: Fixed upstream. + ------------------------------------------------------------------- Sun Sep 25 20:07:33 UTC 2022 - Bjørn Lie diff --git a/pango.obsinfo b/pango.obsinfo index 6424111..c7b5489 100644 --- a/pango.obsinfo +++ b/pango.obsinfo @@ -1,4 +1,4 @@ name: pango -version: 1.50.10 -mtime: 1663332574 -commit: 8d4e58f15b6d608d1da7268371f7efde7b35e950 +version: 1.50.11 +mtime: 1664816974 +commit: eabdbd54ee38fa658be574c4fa4574a05c755f16 diff --git a/pango.spec b/pango.spec index 3e94e5a..c1ba08e 100644 --- a/pango.spec +++ b/pango.spec @@ -17,7 +17,7 @@ Name: pango -Version: 1.50.10 +Version: 1.50.11 Release: 0 Summary: Library for Layout and Rendering of Text License: LGPL-2.1-or-later @@ -26,8 +26,6 @@ URL: https://pango.gnome.org/ Source0: %{name}-%{version}.tar.xz Source2: macros.pango Source99: baselibs.conf -# PATCH-FIX-UPSTREAM 639.patch -- layout: Fix crash when no font is installed -Patch0: https://gitlab.gnome.org/GNOME/pango/-/merge_requests/639.patch BuildRequires: gcc-c++ BuildRequires: help2man