public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/appstream] rawhide: Add a backport patch to build against fontconfig 2.18
@ 2026-06-30  9:37 Akira TAGOH
  0 siblings, 0 replies; only message in thread
From: Akira TAGOH @ 2026-06-30  9:37 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : rpms/appstream
Branch : rawhide
Commit : 7edeeb1906454d0893550c96b3fa8045383ddf65
Author : Akira TAGOH <akira@tagoh.org>
Date   : 2026-06-30T18:28:40+09:00
Stats  : +32/-1 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/appstream/c/7edeeb1906454d0893550c96b3fa8045383ddf65?branch=rawhide

Log:
Add a backport patch to build against fontconfig 2.18

---
diff --git a/appstream-fcfreetype.patch b/appstream-fcfreetype.patch
new file mode 100644
index 0000000..5af4442
--- /dev/null
+++ b/appstream-fcfreetype.patch
@@ -0,0 +1,27 @@
+From 510ec119e36a660d10db64be0bdadd2909434e53 Mon Sep 17 00:00:00 2001
+From: Tom Pollard <tom.pollard@codethink.co.uk>
+Date: Tue, 26 May 2026 11:37:33 +0100
+Subject: [PATCH] Explicitly add fcfreetype.h include to asc-font.c
+
+As of https://gitlab.freedesktop.org/fontconfig/fontconfig/-/commit/
+b4b753d66dea17d645166adca239a0fba84d03a9 first included in 2.18.0
+FcFreeTypeQuery has been moved to fcfreetype.h
+---
+ compose/asc-font.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/compose/asc-font.c b/compose/asc-font.c
+index 71e8869d..422fb4c2 100644
+--- a/compose/asc-font.c
++++ b/compose/asc-font.c
+@@ -29,6 +29,7 @@
+ 
+ #include <glib/gstdio.h>
+ #include <fontconfig/fontconfig.h>
++#include <fontconfig/fcfreetype.h>
+ #include FT_SFNT_NAMES_H
+ #include FT_TRUETYPE_IDS_H
+ #include <pango/pango-language.h>
+-- 
+2.54.0
+

diff --git a/appstream.spec b/appstream.spec
index 89819a3..a38b59c 100644
--- a/appstream.spec
+++ b/appstream.spec
@@ -3,13 +3,14 @@
 Summary: Utilities to generate, maintain and access the AppStream database
 Name:    appstream
 Version: 1.1.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 # lib LGPLv2+, tools GPLv2+
 License: GPL-2.0-or-later AND LGPL-2.1-or-later
 #URL:     http://www.freedesktop.org/wiki/Distributions/AppStream
 URL:     https://github.com/ximion/appstream
 Source0: https://www.freedesktop.org/software/appstream/releases/AppStream-%{version}.tar.xz
+Patch0:  appstream-fcfreetype.patch
 
 # upstream patches
 
@@ -200,6 +201,9 @@ mv %{buildroot}%{_datadir}/metainfo/*.xml \
 
 
 %changelog
+* Thu Jun 11 2026 Akira TAGOH <tagoh@redhat.com> - 1.1.0-4
+- Add a backport patch to include fontconfig/fcfreetype.h header for FcFreeType* functions
+
 * Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
 

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-06-30  9:37 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-06-30  9:37 [rpms/appstream] rawhide: Add a backport patch to build against fontconfig 2.18 Akira TAGOH

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox