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 -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/template b/srcpkgs/pango/template index 0ed686f9b6a..29c4d8a4cf3 100644 --- a/srcpkgs/pango/template +++ b/srcpkgs/pango/template @@ -1,11 +1,9 @@ # Template file for 'pango' pkgname=pango -reverts="1.44.5_1" -version=1.42.4 -revision=5 -build_style=gnu-configure # switch to meson when possible +version=1.44.7 +revision=1 +build_style=meson build_helper="gir" -configure_args="$(vopt_enable gir introspection) --disable-gtk-doc" hostmakedepends="glib-devel help2man pkg-config" makedepends="fribidi-devel harfbuzz-devel libXft-devel libthai-devel" short_desc="Library for layout and rendering of text" @@ -13,25 +11,18 @@ maintainer="Orphaned " 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" - -# Package build options -build_options="gir" -build_options_default="gir" +checksum=66a5b6cc13db73efed67b8e933584509f8ddb7b10a8a40c3850ca4a985ea1b1f post_install() { - rm -rf -- "${DESTDIR}"/usr/share/installed-tests - rm -rf -- "${DESTDIR}"/usr/libexec/installed-tests + rm -rf -- ${DESTDIR}/usr/share/installed-tests + rm -rf -- ${DESTDIR}/usr/libexec/installed-tests } pango-xft_package() { short_desc+=" - X font rendering" pkg_install() { vmove usr/lib/libpangoxft*.so.* - if [ "$build_option_gir" ]; then - vmove usr/lib/girepository-1.0/PangoXft-1.0.typelib - fi + vmove usr/lib/girepository-1.0/PangoXft-1.0.typelib } } pango-view_package() { @@ -47,10 +38,7 @@ pango-devel_package() { pkg_install() { vmove usr/include vmove usr/lib/pkgconfig - if [ "$build_option_gir" ]; then - vmove "usr/share/gir-*" - fi - vmove usr/share/gtk-doc + vmove "usr/share/gir-*" vmove "usr/lib/*.so" } }