From ac900347fcfae1772521950559d26923a7ef5a8c82afb4bc447e79806b0cc34b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Mon, 19 Sep 2022 16:26:50 +0000 Subject: [PATCH 1/2] Accepting request 1004164 from GNOME:Next New stable release OBS-URL: https://build.opensuse.org/request/show/1004164 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/pango?expand=0&rev=241 --- _service | 6 +++--- pango-1.50.10.obscpio | 3 +++ pango-1.50.9.obscpio | 3 --- pango.changes | 7 +++++++ pango.obsinfo | 6 +++--- pango.spec | 2 +- 6 files changed, 17 insertions(+), 10 deletions(-) create mode 100644 pango-1.50.10.obscpio delete mode 100644 pango-1.50.9.obscpio diff --git a/_service b/_service index eef3f44..1bb54fb 100644 --- a/_service +++ b/_service @@ -1,8 +1,8 @@ - + https://gitlab.gnome.org/GNOME/pango.git git - refs/tags/1.50.9 + refs/tags/1.50.10 @PARENT_TAG@+@TAG_OFFSET@ (.*)\+0 \1 @@ -12,5 +12,5 @@ *.tar xz - + diff --git a/pango-1.50.10.obscpio b/pango-1.50.10.obscpio new file mode 100644 index 0000000..f98d0f0 --- /dev/null +++ b/pango-1.50.10.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4a5ac5536a085b5749e9fd5a374b3f5c45af3b34571fc46244f5988b08c80881 +size 6885901 diff --git a/pango-1.50.9.obscpio b/pango-1.50.9.obscpio deleted file mode 100644 index 2948006..0000000 --- a/pango-1.50.9.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fe1ddd1c654c53ae79285a7b8b33bf0ff7cd97eeb4820498f771d2e89229c713 -size 6883341 diff --git a/pango.changes b/pango.changes index e254415..ed51871 100644 --- a/pango.changes +++ b/pango.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Sep 16 16:59:29 UTC 2022 - Bjørn Lie + +- Update to version 1.50.10: + + Avoid some unnecessary strdups. + + Fix line height computations with a non-trivial CTM. + ------------------------------------------------------------------- Wed Aug 10 17:37:27 UTC 2022 - Bjørn Lie diff --git a/pango.obsinfo b/pango.obsinfo index f9a5ce7..6424111 100644 --- a/pango.obsinfo +++ b/pango.obsinfo @@ -1,4 +1,4 @@ name: pango -version: 1.50.9 -mtime: 1660068083 -commit: a3517dcc6de9bae1193075b7112aa7db97b39dcc +version: 1.50.10 +mtime: 1663332574 +commit: 8d4e58f15b6d608d1da7268371f7efde7b35e950 diff --git a/pango.spec b/pango.spec index 195ba27..b3fc920 100644 --- a/pango.spec +++ b/pango.spec @@ -17,7 +17,7 @@ Name: pango -Version: 1.50.9 +Version: 1.50.10 Release: 0 Summary: Library for Layout and Rendering of Text License: LGPL-2.1-or-later From 21b98facf55f18d610cfddd0fab18ebbace13a6e1dadd8e234288ab83ded471c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Tue, 27 Sep 2022 20:44:22 +0000 Subject: [PATCH 2/2] Accepting request 1006200 from GNOME:Next - Add 639.patch: layout: Fix crash when no font is installed. OBS-URL: https://build.opensuse.org/request/show/1006200 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/pango?expand=0&rev=242 --- 639.patch | 34 ++++++++++++++++++++++++++++++++++ pango.changes | 5 +++++ pango.spec | 4 +++- 3 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 639.patch diff --git a/639.patch b/639.patch new file mode 100644 index 0000000..6ed178b --- /dev/null +++ b/639.patch @@ -0,0 +1,34 @@ +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/pango.changes b/pango.changes index ed51871..e61dcf0 100644 --- a/pango.changes +++ b/pango.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Sep 25 20:07:33 UTC 2022 - Bjørn Lie + +- Add 639.patch: layout: Fix crash when no font is installed. + ------------------------------------------------------------------- Fri Sep 16 16:59:29 UTC 2022 - Bjørn Lie diff --git a/pango.spec b/pango.spec index b3fc920..3e94e5a 100644 --- a/pango.spec +++ b/pango.spec @@ -26,6 +26,8 @@ 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 @@ -117,7 +119,7 @@ This package contains all necessary include files and libraries needed to develop applications that require these. %prep -%setup +%autosetup -p1 %build %meson \