[-- Attachment #1: Type: text/plain, Size: 1310 bytes --] There is a new pull request by oreo639 against master on the void-packages repository https://github.com/oreo639/void-packages pango https://github.com/void-linux/void-packages/pull/39428 pango: fix gegl crash when no font is installed https://gitlab.gnome.org/GNOME/pango/-/issues/701 <!-- Uncomment relevant sections and delete options which are not applicable --> #### Testing the changes - I tested the changes in this PR: **YES** <!-- #### New package - This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO** --> <!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration and test at least one native build and, if supported, at least one cross build. Ignore this section if this PR is not skipping CI. --> <!-- #### Local build testing - I built this PR locally for my native architecture, (ARCH-LIBC) - I built this PR locally for these architectures (if supported. mark crossbuilds): - aarch64-musl - armv7l - armv6l-musl --> A patch file from https://github.com/void-linux/void-packages/pull/39428.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-pango-39428.patch --] [-- Type: text/x-diff, Size: 1850 bytes --] From c07e73e55442d6a9a4483a98ed4b1a98a266b029 Mon Sep 17 00:00:00 2001 From: oreo639 <oreo6391@gmail.com> Date: Thu, 22 Sep 2022 16:09:45 -0700 Subject: [PATCH] pango: fix gegl crash when no font is installed https://gitlab.gnome.org/GNOME/pango/-/issues/701 --- srcpkgs/pango/patches/fix-segfault-no-font.patch | 14 ++++++++++++++ srcpkgs/pango/template | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/pango/patches/fix-segfault-no-font.patch diff --git a/srcpkgs/pango/patches/fix-segfault-no-font.patch b/srcpkgs/pango/patches/fix-segfault-no-font.patch new file mode 100644 index 000000000000..5d1a01448bc6 --- /dev/null +++ b/srcpkgs/pango/patches/fix-segfault-no-font.patch @@ -0,0 +1,14 @@ +diff --git a/pango/pango-layout.c b/pango/pango-layout.c +index a1c47203..fde9276b 100644 +--- a/pango/pango-layout.c ++++ b/pango/pango-layout.c +@@ -5713,7 +5713,8 @@ pango_layout_run_get_extents_and_height (PangoLayoutRun *run, + 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); + } + } diff --git a/srcpkgs/pango/template b/srcpkgs/pango/template index 84ee68ccd307..d244222b0e36 100644 --- a/srcpkgs/pango/template +++ b/srcpkgs/pango/template @@ -1,7 +1,7 @@ # Template file for 'pango' pkgname=pango version=1.50.10 -revision=1 +revision=2 build_style=meson build_helper=gir configure_args="-Dintrospection=$(vopt_if gir enabled disabled)"
[-- Attachment #1: Type: text/plain, Size: 1363 bytes --] There is an updated pull request by oreo639 against master on the void-packages repository https://github.com/oreo639/void-packages pango https://github.com/void-linux/void-packages/pull/39428 pango: fix gegl crash when no font is installed <!-- Uncomment relevant sections and delete options which are not applicable --> #### Testing the changes - I tested the changes in this PR: **YES** This patch has been submitted upstream: https://gitlab.gnome.org/GNOME/pango/-/merge_requests/639 <!-- #### New package - This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO** --> <!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration and test at least one native build and, if supported, at least one cross build. Ignore this section if this PR is not skipping CI. --> <!-- #### Local build testing - I built this PR locally for my native architecture, (ARCH-LIBC) - I built this PR locally for these architectures (if supported. mark crossbuilds): - aarch64-musl - armv7l - armv6l-musl --> A patch file from https://github.com/void-linux/void-packages/pull/39428.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-pango-39428.patch --] [-- Type: text/x-diff, Size: 1995 bytes --] From 918c9a081e9303273e50d31e28a025b3c16e1eb0 Mon Sep 17 00:00:00 2001 From: oreo639 <oreo6391@gmail.com> Date: Thu, 22 Sep 2022 16:09:45 -0700 Subject: [PATCH] pango: fix gegl crash when no font is installed https://gitlab.gnome.org/GNOME/pango/-/issues/701 --- .../pango/patches/fix-segfault-no-font.patch | 21 +++++++++++++++++++ srcpkgs/pango/template | 2 +- 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/pango/patches/fix-segfault-no-font.patch diff --git a/srcpkgs/pango/patches/fix-segfault-no-font.patch b/srcpkgs/pango/patches/fix-segfault-no-font.patch new file mode 100644 index 000000000000..4aec1d27b237 --- /dev/null +++ b/srcpkgs/pango/patches/fix-segfault-no-font.patch @@ -0,0 +1,21 @@ +diff --git a/pango/pango-layout.c b/pango/pango-layout.c +index a1c47203..b8eeede0 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); + } + } diff --git a/srcpkgs/pango/template b/srcpkgs/pango/template index 84ee68ccd307..d244222b0e36 100644 --- a/srcpkgs/pango/template +++ b/srcpkgs/pango/template @@ -1,7 +1,7 @@ # Template file for 'pango' pkgname=pango version=1.50.10 -revision=1 +revision=2 build_style=meson build_helper=gir configure_args="-Dintrospection=$(vopt_if gir enabled disabled)"
[-- Attachment #1: Type: text/plain, Size: 1209 bytes --] There's a merged pull request on the void-packages repository pango: fix gegl crash when no font is installed https://github.com/void-linux/void-packages/pull/39428 Description: <!-- Uncomment relevant sections and delete options which are not applicable --> #### Testing the changes - I tested the changes in this PR: **YES** This patch has been submitted upstream: https://gitlab.gnome.org/GNOME/pango/-/merge_requests/639 <!-- #### New package - This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO** --> <!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration and test at least one native build and, if supported, at least one cross build. Ignore this section if this PR is not skipping CI. --> <!-- #### Local build testing - I built this PR locally for my native architecture, (ARCH-LIBC) - I built this PR locally for these architectures (if supported. mark crossbuilds): - aarch64-musl - armv7l - armv6l-musl -->