Accepting request 1009280 from GNOME:Factory

OBS-URL: https://build.opensuse.org/request/show/1009280
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pango?expand=0&rev=142

639.patch

@@ -1,34 +0,0 @@
-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
-

_service

@@ -2,7 +2,7 @@
   <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.10</param>
+    <param name="revision">refs/tags/1.50.11</param>
     <param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param>
     <param name="versionrewrite-pattern">(.*)\+0</param>
     <param name="versionrewrite-replacement">\1</param>

pango-1.50.10.obscpio

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

pango-1.50.11.obscpio

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

pango.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Oct  4 07:52:51 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- 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 <bjorn.lie@gmail.com>
 

pango.obsinfo

@@ -1,4 +1,4 @@
 name: pango
-version: 1.50.10
-mtime: 1663332574
-commit: 8d4e58f15b6d608d1da7268371f7efde7b35e950
+version: 1.50.11
+mtime: 1664816974
+commit: eabdbd54ee38fa658be574c4fa4574a05c755f16

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