Control: tags -1 + patch upstream

Hi Reiner,

On Tue, Jul 15, 2025 at 11:39:23PM +0200, Chris Hofstaedtler wrote:
> https://gitlab.gnome.org/GNOME/pango/-/merge_requests/829
> looks like the "smoking gun". Especially the change in fwupd looks 
> relevant: https://github.com/fwupd/fwupd/issues/8587
> https://github.com/fwupd/fwupd/commit/d0d3eff666d2a6d9c09346ea050eed1c78271f0a

the attached patch fixes the FTBFS for me. Please consider applying 
it, asking for an unblock and also for upstream.

Chris

>From dee9b774f0b9de389a44b3f961903421a9d0ffb8 Mon Sep 17 00:00:00 2001
From: Chris Hofstaedtler <z...@debian.org>
Date: Tue, 15 Jul 2025 23:41:04 +0200
Subject: [PATCH] Adapt to new pango bindings

See https://gitlab.gnome.org/GNOME/pango/-/merge_requests/829
and https://github.com/fwupd/fwupd/commit/d0d3eff666d2a6d9c09346ea050eed1c78271f0a
---
 debian/patches/pango-1-56-2.patch | 14 ++++++++++++++
 debian/patches/series             |  1 +
 2 files changed, 15 insertions(+)
 create mode 100644 debian/patches/pango-1-56-2.patch

diff --git a/debian/patches/pango-1-56-2.patch b/debian/patches/pango-1-56-2.patch
new file mode 100644
index 0000000..f4193b9
--- /dev/null
+++ b/debian/patches/pango-1-56-2.patch
@@ -0,0 +1,14 @@
+diff --git i/tests/pango.lua w/tests/pango.lua
+index e20a679..ea00b90 100644
+--- i/tests/pango.lua
++++ w/tests/pango.lua
+@@ -35,8 +35,7 @@ function pango.glyphstring()
+       local offset = items[i].offset
+       local length = items[i].length
+       local analysis = items[i].analysis
+-      local pgs = Pango.GlyphString()
+-      Pango.shape(string.sub(s,1+offset), length, analysis, pgs)
++      pgs = Pango.shape(string.sub(s,1+offset), length, analysis)
+       -- Pull out individual glyphs with pgs.glyphs
+       local glyphs = pgs.glyphs
+       check(type(glyphs) == 'table')
diff --git a/debian/patches/series b/debian/patches/series
index 1017207..fce9154 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 tests_timing.patch
 ftbfs_bigendian64.patch
 cppflags.patch
+pango-1-56-2.patch
-- 
2.49.0

Reply via email to