pool/fwupd
SHA256
12
0
Fork 1
Code Issues Pull Requests Activity

- Add 8588.patch: Fix compile when using Pango >= 1.56.2.

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Base:System/fwupd?expand=0&rev=214
This commit is contained in:
Dominique Leuenberger
2025-03-17 15:16:04 +00:00
committed by Git OBS Bridge
parent 9410dc6cc7
commit f0498b1518
3 changed files with 41 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
8588.patch Normal file
View File

@@ -0,0 +1,33 @@
From 5e095c944557cbebc47cbf42c3738358fa4e45d4 Mon Sep 17 00:00:00 2001
From: Richard Hughes <richard@hughsie.com>
Date: Fri, 14 Mar 2025 19:13:42 +0000
Subject: [PATCH] trivial: Fix compile when using Pango >= 1.56.2
Fixes https://github.com/fwupd/fwupd/issues/8587
---
plugins/uefi-capsule/make-images.py | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/plugins/uefi-capsule/make-images.py b/plugins/uefi-capsule/make-images.py
index d4c2242de5f0..a8641d61282a 100755
--- a/plugins/uefi-capsule/make-images.py
+++ b/plugins/uefi-capsule/make-images.py
@@ -141,8 +141,16 @@ def main(args) -> int:
items = Pango.itemize(pctx, label_translated, 0, length, attrs, None)
if not items:
continue
- gs = Pango.GlyphString()
- Pango.shape(label_translated, length, items[0].analysis, gs)
+ try:
+ # urgh, https://gitlab.gnome.org/GNOME/pango/-/merge_requests/829
+ # -- if we depend on Pango >= 1.56.2 we can drop the fallback
+ #
+ # ...or if we depend on python3-gobject >= 3.51.0 we can use the nicer:
+ # len(inspect.signature(Pango.shape).parameters)
+ gs = Pango.shape(label_translated, length, items[0].analysis)
+ except TypeError:
+ gs = Pango.GlyphString()
+ Pango.shape(label_translated, length, items[0].analysis, gs)
del img, cctx, pctx, layout
def find_size(fs, f, data):

5
fwupd.changes
View File

@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Mar 17 15:11:43 UTC 2025 - Dominique Leuenberger <dimstar@opensuse.org>
- Add 8588.patch: Fix compile when using Pango >= 1.56.2.
-------------------------------------------------------------------
Tue Mar 11 14:41:20 UTC 2025 - Dominique Leuenberger <dimstar@opensuse.org>

4
fwupd.spec
View File

@@ -50,8 +50,10 @@ Source: %{name}-%{version}.tar.xz
# PATCH-FIX-UPSTREAM
Patch0: https://patch-diff.githubusercontent.com/raw/fwupd/fwupd/pull/8583.patch
# PATCH-FIx-UPSTREAM
Patch1: https://patch-diff.githubusercontent.com/raw/fwupd/fwupd/pull/8588.patch
# PATCH-FIX-OPENSUSE fwupd-bsc1130056-shim-path.patch bsc#1130056
Patch1: fwupd-bsc1130056-change-shim-path.patch
Patch99: fwupd-bsc1130056-change-shim-path.patch
BuildRequires: dejavu-fonts
BuildRequires: fdupes