pool/pango
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1006525 from GNOME:Factory

Browse Source 
- Add 639.patch: layout: Fix crash when no font is installed.
- Update to version 1.50.10:
  + Avoid some unnecessary strdups.
  + Fix line height computations with a non-trivial CTM.

OBS-URL: https://build.opensuse.org/request/show/1006525
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pango?expand=0&rev=141
This commit is contained in:
Richard Brown 2022-09-30 15:57:01 +00:00 committed by Git OBS Bridge
commit 55a1e4a0ce
7 changed files with 59 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
639.patch Normal file
View File

@ -0,0 +1,34 @@
From 2771f621ed31deeae6c7ad984db1e5aa33f08a3c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
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

6
_service
View File

@ -1,8 +1,8 @@
<services>
<service name="obs_scm" mode="disabled">
<service name="obs_scm" mode="manual">
<param name="url">https://gitlab.gnome.org/GNOME/pango.git</param>
<param name="scm">git</param>
<param name="revision">refs/tags/1.50.9</param>
<param name="revision">refs/tags/1.50.10</param>
<param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param>
<param name="versionrewrite-pattern">(.*)\+0</param>
<param name="versionrewrite-replacement">\1</param>
@ -12,5 +12,5 @@
<param name="file">*.tar</param>
<param name="compression">xz</param>
</service>
<service mode="disabled" name="set_version" />
<service mode="manual" name="set_version" />
</services>

3
pango-1.50.10.obscpio Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4a5ac5536a085b5749e9fd5a374b3f5c45af3b34571fc46244f5988b08c80881
size 6885901

3
pango-1.50.9.obscpio
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:fe1ddd1c654c53ae79285a7b8b33bf0ff7cd97eeb4820498f771d2e89229c713
size 6883341

12
pango.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Sun Sep 25 20:07:33 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
- Add 639.patch: layout: Fix crash when no font is installed.
-------------------------------------------------------------------
Fri Sep 16 16:59:29 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
- 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 <bjorn.lie@gmail.com>

6
pango.obsinfo
View File

@ -1,4 +1,4 @@
name: pango
version: 1.50.9
mtime: 1660068083
commit: a3517dcc6de9bae1193075b7112aa7db97b39dcc
version: 1.50.10
mtime: 1663332574
commit: 8d4e58f15b6d608d1da7268371f7efde7b35e950

6
pango.spec
View File

@ -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
@ -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 \