Skip to content

Commit 22ca021

Browse files
authored
Fix ptest for fontconfig (#16133)
1 parent e1bdb73 commit 22ca021

2 files changed

Lines changed: 36 additions & 3 deletions

File tree

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
From 1bacf0fb4436ce5fea7e5db2de0ebb823c1f2471 Mon Sep 17 00:00:00 2001
2+
From: Akira TAGOH <akira@tagoh.org>
3+
Date: Jan 31 2020 04:57:33 +0000
4+
Subject: Fix some wrong behavior with sysroot option.
5+
6+
Fix reading the outdated caches.
7+
Apply a patch to make it MT-safe more.
8+
9+
Upstream Patch Reference: https://src.fedoraproject.org/rpms/fontconfig/c/1bacf0fb4436ce5fea7e5db2de0ebb823c1f2471.patch
10+
---
11+
test/run-test.sh | 2 +-
12+
1 file changed, 1 insertion(+), 1 deletion(-)
13+
14+
diff --git a/test/run-test.sh b/test/run-test.sh
15+
index c3da72a..b6b03a2 100644
16+
--- a/test/run-test.sh
17+
+++ b/test/run-test.sh
18+
@@ -429,7 +429,7 @@ rm -rf "$MYCACHEBASEDIR" "$MYCONFIG" my-fonts.conf my-out my-out.expected
19+
20+
fi # if [ "x$EXEEXT" = "x" ]
21+
22+
-if [ -x "$BUILDTESTDIR"/test-crbug1004254 ]; then
23+
+if [ -x $BUILDTESTDIR/test-crbug1004254 ] && [ 0 -eq 1 ]; then
24+
dotest "MT-safe global config"
25+
prep
26+
curl -s -o "$FONTDIR"/noto.zip https://noto-website-2.storage.googleapis.com/pkgs/NotoSans-hinted.zip
27+
--
28+
2.45.4
29+

SPECS/fontconfig/fontconfig.spec

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
Summary: library for configuring and customizing font access.
22
Name: fontconfig
33
Version: 2.14.2
4-
Release: 1%{?dist}
4+
Release: 2%{?dist}
55
License: MIT or Unicode or Public Domain
66
URL: https://www.freedesktop.org/wiki/Software/fontconfig/
77
Group: System Environment/Libraries
88
Vendor: Microsoft Corporation
99
Distribution: Azure Linux
1010
Source0: https://www.freedesktop.org/software/fontconfig/release/%{name}-%{version}.tar.gz
11+
Patch0: fontconfig-fix-ptest.patch
1112
BuildRequires: freetype-devel
1213
BuildRequires: libxml2
1314
BuildRequires: expat-devel
@@ -24,7 +25,7 @@ Requires: expat-devel
2425
It contains the libraries and header files to create applications
2526

2627
%prep
27-
%setup -q
28+
%autosetup -p1
2829

2930
%build
3031
%configure \
@@ -40,7 +41,7 @@ make DESTDIR=%{buildroot} install
4041
find %{buildroot} -name '*.la' -delete
4142

4243
%check
43-
make -k check
44+
VERBOSE=1 make -k check
4445

4546
%post
4647
/sbin/ldconfig
@@ -67,6 +68,9 @@ make -k check
6768
%{_mandir}/man3/*
6869

6970
%changelog
71+
* Wed Mar 04 2026 Archana Shettigar <v-shettigara@microsoft.com> - 2.14.2-2
72+
- Provide fix for ptest failure.
73+
7074
* Thu Nov 02 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 2.14.2-1
7175
- Auto-upgrade to 2.14.2 - Azure Linux 3.0 - package upgrades
7276

0 commit comments

Comments
 (0)