[PR PATCH] [RFC] pango: update to 1.46.1

[q66 <q66@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1522 bytes --]

There is a new pull request by q66 against master on the void-packages repository

https://github.com/q66/void-packages pango146
https://github.com/void-linux/void-packages/pull/24842

[RFC] pango: update to 1.46.1
Since about a year ago, we've been holding back the pango version at now long obsolete 1.42 series, as pango upstream's move to harfbuzz resulted in bitmap font formats no longer working. This is now starting to become increasingly problematic, for various reasons:

1) some parts of the upcoming GNOME 3.38 update depend on newer versions and require clunky patching otherwise
2) the soon upcoming Gtk 4.0 stable release (why do we have a very old alpha version of that packaged anyway, nothing currently depends on it?) carries a hard dependency on much newer Pango and there is no hope of backporting things
3) the old Pango has some code paths with fairly poor performance that have improved since
4) it means things such as the `librsvg` testsuite fail, because of a different text shaping behavior between the versions

IMO this is not our problem. A year should've been more than enough time for people to fix/adjust their setups, and if they still have problems with it, they should take it to upstream - it's not our issue to solve. Keeping things at the older version is not sustainable, and the issue only affects a small minority of users, so I just wouldn't bother.

@void-linux/pkg-committers

A patch file from https://github.com/void-linux/void-packages/pull/24842.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pango146-24842.patch --]
[-- Type: text/x-diff, Size: 4814 bytes --]

From 3b0216e13313369866426ddf82c3f0d81dedf91c Mon Sep 17 00:00:00 2001
From: Daniel Kolesa <daniel@octaforge.org>
Date: Mon, 7 Sep 2020 21:45:36 +0200
Subject: [PATCH] pango: update to 1.46.1

---
 srcpkgs/pango/patches/CVE-2019-1010238.patch  | 33 ------------
 .../pango/patches/pangoattribute-boxed.patch  | 50 -------------------
 srcpkgs/pango/template                        | 12 ++---
 3 files changed, 5 insertions(+), 90 deletions(-)
 delete mode 100644 srcpkgs/pango/patches/CVE-2019-1010238.patch
 delete mode 100644 srcpkgs/pango/patches/pangoattribute-boxed.patch

diff --git a/srcpkgs/pango/patches/CVE-2019-1010238.patch b/srcpkgs/pango/patches/CVE-2019-1010238.patch
deleted file mode 100644
index afb832e0cfc..00000000000
--- a/srcpkgs/pango/patches/CVE-2019-1010238.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 490f8979a260c16b1df055eab386345da18a2d54 Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Wed, 10 Jul 2019 20:26:23 -0400
-Subject: [PATCH] bidi: Be safer against bad input
-
-Don't run off the end of an array that we
-allocated to certain length.
-
-Closes: https://gitlab.gnome.org/GNOME/pango/issues/342
----
- pango/pango-bidi-type.c | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/pango/pango-bidi-type.c b/pango/pango-bidi-type.c
-index 3e46b66c..5c02dbbb 100644
---- a/pango/pango-bidi-type.c
-+++ b/pango/pango-bidi-type.c
-@@ -181,8 +181,11 @@ pango_log2vis_get_embedding_levels (const gchar    *text,
-   for (i = 0, p = text; p < text + length; p = g_utf8_next_char(p), i++)
-     {
-       gunichar ch = g_utf8_get_char (p);
--      FriBidiCharType char_type;
--      char_type = fribidi_get_bidi_type (ch);
-+      FriBidiCharType char_type = fribidi_get_bidi_type (ch);
-+
-+      if (i == n_chars)
-+        break;
-+
-       bidi_types[i] = char_type;
-       ored_types |= char_type;
-       if (FRIBIDI_IS_STRONG (char_type))
--- 
-2.22.0
diff --git a/srcpkgs/pango/patches/pangoattribute-boxed.patch b/srcpkgs/pango/patches/pangoattribute-boxed.patch
deleted file mode 100644
index 071d82aa9df..00000000000
--- a/srcpkgs/pango/patches/pangoattribute-boxed.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-This is necessary so some updates can be done on things using
-Pango without updating Pango to 1.44, e.g. gnome-music.
-
-https://gitlab.gnome.org/GNOME/pygobject/-/issues/312
-
-From 3d5b7c10fbe63c069af4c140126c2295d1b75016 Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Thu, 11 Jul 2019 00:37:24 -0400
-Subject: [PATCH] Make PangoAttribute a boxed type
-
-Based on a patch by Matijs van Zuijlen <matijs@matijs.net>.
-
-Closes https://gitlab.gnome.org/GNOME/pango/issues/259
----
- pango/pango-attributes.c | 4 ++++
- pango/pango-attributes.h | 3 +++
- 2 files changed, 7 insertions(+)
-
-diff --git a/pango/pango-attributes.c b/pango/pango-attributes.c
-index df3104f0c..85e5a240e 100644
---- a/pango/pango-attributes.c
-+++ b/pango/pango-attributes.c
-@@ -192,6 +192,10 @@ pango_attribute_destroy (PangoAttribute *attr)
-   attr->klass->destroy (attr);
- }
- 
-+G_DEFINE_BOXED_TYPE (PangoAttribute, pango_attribute,
-+                     pango_attribute_copy,
-+                     pango_attribute_destroy);
-+
- /**
-  * pango_attribute_equal:
-  * @attr1: a #PangoAttribute
-diff --git a/pango/pango-attributes.h b/pango/pango-attributes.h
-index e9b195713..cff495b25 100644
---- a/pango/pango-attributes.h
-+++ b/pango/pango-attributes.h
-@@ -56,6 +56,9 @@ struct _PangoColor
- PANGO_AVAILABLE_IN_ALL
- GType       pango_color_get_type (void) G_GNUC_CONST;
- 
-+PANGO_AVAILABLE_IN_ALL
-+GType       pango_attribute_get_type    (void) G_GNUC_CONST;
-+
- PANGO_AVAILABLE_IN_ALL
- PangoColor *pango_color_copy     (const PangoColor *src);
- PANGO_AVAILABLE_IN_ALL
--- 
-GitLab
-
diff --git a/srcpkgs/pango/template b/srcpkgs/pango/template
index 1a4f74fb0a3..b5eb7ea3648 100644
--- a/srcpkgs/pango/template
+++ b/srcpkgs/pango/template
@@ -1,10 +1,9 @@
 # Template file for 'pango'
 pkgname=pango
-reverts="1.44.5_1 1.44.7_1"
-version=1.42.4
-revision=8
-build_style=gnu-configure
-build_helper="gir"
+version=1.46.1
+revision=1
+build_style=meson
+build_helper=gir
 hostmakedepends="glib-devel help2man pkg-config"
 makedepends="fribidi-devel harfbuzz-devel libXft-devel libthai-devel"
 short_desc="Library for layout and rendering of text"
@@ -12,8 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://www.pango.org/"
 distfiles="${GNOME_SITE}/pango/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1d2b74cd63e8bd41961f2f8d952355aa0f9be6002b52c8aa7699d9f5da597c9d
-patch_args="-Np1"
+checksum=fe516b10711bbb6fd75011d66dd08fabfce18f7931aed7415136d53c4aadf1c5
 
 post_install() {
 	rm -rf -- ${DESTDIR}/usr/share/installed-tests