!16 [sync] PR-15: 修正执行fc-cat出现core dumped的问题

From: @openeuler-sync-bot 
Reviewed-by: @leeffo 
Signed-off-by: @leeffo

FcConfigGetFilename.3

@@ -0,0 +1,26 @@
+.\" auto-generated by docbook2man-spec from docbook-utils package
+.TH "FcConfigGetFilename" "3" "27 1月 2020" "Fontconfig 2.13.91" ""
+.SH NAME
+FcConfigGetFilename \- Find a config file
+.SH SYNOPSIS
+.nf
+\fB#include <fontconfig/fontconfig.h>
+.sp
+FcChar8 * FcConfigGetFilename (FcConfig *\fIconfig\fB, const FcChar8 *\fIname\fB);
+.fi\fR
+.SH "DESCRIPTION"
+.PP
+Given the specified external entity name, return the associated filename.
+This provides applications a way to convert various configuration file
+references into filename form.
+.PP
+A null or empty \fIname\fR indicates that the default configuration file should
+be used; which file this references can be overridden with the
+FONTCONFIG_FILE environment variable. Next, if the name starts with \fI~\fR, it
+refers to a file in the current users home directory. Otherwise if the name
+doesn't start with '/', it refers to a file in the default configuration
+directory; the built-in default directory can be overridden with the
+FONTCONFIG_PATH environment variable.
+.PP
+The result of this function is affected by the FONTCONFIG_SYSROOT environment variable or equivalent functionality.
+

backport-Report-more-detailed-logs-instead-of-assertion.patch

@@ -0,0 +1,79 @@
+From ea2fe8840d084adebbbd93de162ae76f5fc5ef45 Mon Sep 17 00:00:00 2001
+From: htpeng <htpengc@isoftstone.com>
+Date: Thu, 31 Aug 2023 09:45:49 +0800
+Subject: [PATCH] Report more detailed logs instead of assertion
+
+Reference: https://gitlab.freedesktop.org/fontconfig/fontconfig/-/merge_requests/257
+
+Signed-off-by: htpeng <htpengc@isoftstone.com>
+---
+ src/fccache.c | 17 +++++++----------
+ 1 file changed, 7 insertions(+), 10 deletions(-)
+
+diff --git a/src/fccache.c b/src/fccache.c
+index b2392d3..b39cb0a 100644
+--- a/src/fccache.c
++++ b/src/fccache.c
+@@ -287,7 +287,7 @@ FcDirCacheUnlink (const FcChar8 *dir, FcConfig *config)
+ 	ret = FcFalse;
+ 	goto bail;
+     }
+-	
++
+     while ((cache_dir = FcStrListNext (list)))
+     {
+ 	if (sysroot)
+@@ -381,7 +381,7 @@ FcDirCacheProcess (FcConfig *config, const FcChar8 *dir,
+     list = FcStrListCreate (config->cacheDirs);
+     if (!list)
+         return FcFalse;
+-	
++
+     while ((cache_dir = FcStrListNext (list)))
+     {
+         FcChar8	*cache_hashed;
+@@ -793,20 +793,17 @@ FcCacheFini (void)
+ {
+     int		    i;
+ 
+-    for (i = 0; i < FC_CACHE_MAX_LEVEL; i++)
++    if (FcDebug() & FC_DBG_CACHE)
+     {
+-	if (FcDebug() & FC_DBG_CACHE)
++	for (i = 0; i < FC_CACHE_MAX_LEVEL; i++)
+ 	{
+ 	    if (fcCacheChains[i] != NULL)
+ 	    {
+ 		FcCacheSkip *s = fcCacheChains[i];
+-		printf("Fontconfig error: not freed %p (dir: %s, refcount %" FC_ATOMIC_INT_FORMAT ")\n", s->cache, FcCacheDir(s->cache), s->ref.count);
++		fprintf(stderr, "Fontconfig error: not freed %p (dir: %s, refcount %" FC_ATOMIC_INT_FORMAT ")\n", s->cache, FcCacheDir(s->cache), s->ref.count);
+ 	    }
+ 	}
+-	else
+-	    assert (fcCacheChains[i] == NULL);
+     }
+-    assert (fcCacheMaxLevel == 0);
+ 
+     free_lock ();
+ }
+@@ -1018,7 +1015,7 @@ FcDirCacheMapFd (FcConfig *config, int fd, struct stat *fd_stat, struct stat *di
+     /* Mark allocated caches so they're freed rather than unmapped */
+     if (allocated)
+ 	cache->magic = FC_CACHE_MAGIC_ALLOC;
+-	
++
+     return cache;
+ }
+ 
+@@ -1708,7 +1705,7 @@ FcCacheCopySet args1(const FcCache *c)
+     for (i = 0; i < old->nfont; i++)
+     {
+ 	FcPattern   *font = FcFontSetFont (old, i);
+-	
++
+ 	FcPatternReference (font);
+ 	if (!FcFontSetAdd (new, font))
+ 	{
+-- 
+2.34.1
+

backport-fontconfig-disable-network-required-test.patch

@@ -0,0 +1,42 @@
+Reference:https://src.fedoraproject.org/rpms/fontconfig/blob/rawhide/f/fontconfig-disable-network-required-test.patch
+---
+ test/run-test.sh | 22 +++++++++++-----------
+ 1 file changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/test/run-test.sh b/test/run-test.sh
+index 34d9fc0..1807298 100644
+--- a/test/run-test.sh
++++ b/test/run-test.sh
+@@ -421,18 +421,18 @@ rm -rf "$MYCACHEBASEDIR" "$MYCONFIG" my-fonts.conf my-out my-out.expected
+ 
+ fi # if [ "x$EXEEXT" = "x" ]
+ 
+-if [ -x "$BUILDTESTDIR"/test-crbug1004254 ]; then
+-    dotest "MT-safe global config"
+-    prep
+-    curl -s -o "$FONTDIR"/noto.zip https://noto-website-2.storage.googleapis.com/pkgs/NotoSans-hinted.zip
+-    (cd "$FONTDIR"; unzip noto.zip)
+-    if [ -n "${SOURCE_DATE_EPOCH:-}" ] && [ ${#SOURCE_DATE_EPOCH} -gt 0 ]; then
+-	touch -m -t "$(date -d @"${SOURCE_DATE_EPOCH}" +%y%m%d%H%M.%S)" "$FONTDIR"
+-    fi
+-    "$BUILDTESTDIR"/test-crbug1004254
+-else
++#if [ -x "$BUILDTESTDIR"/test-crbug1004254 ]; then
++#    dotest "MT-safe global config"
++#    prep
++#    curl -s -o "$FONTDIR"/noto.zip https://noto-website-2.storage.googleapis.com/pkgs/NotoSans-hinted.zip
++#    (cd "$FONTDIR"; unzip noto.zip)
++#    if [ -n "${SOURCE_DATE_EPOCH:-}" ] && [ ${#SOURCE_DATE_EPOCH} -gt 0 ]; then
++#	touch -m -t "$(date -d @"${SOURCE_DATE_EPOCH}" +%y%m%d%H%M.%S)" "$FONTDIR"
++#    fi
++#    "$BUILDTESTDIR"/test-crbug1004254
++#else
+     echo "No test-crbug1004254: skipped"
+-fi
++#fi
+ 
+ if [ "x$EXEEXT" = "x" ]; then
+ 
+-- 
+2.27.0
+

fontconfig.spec

@@ -1,15 +1,19 @@
 %global         freetype_version 2.9.1
 
 Name:           fontconfig
-Version:        2.13.1
+Version:        2.13.94
-Release:        4
+Release:        3
 Summary:        Fontconfig is a library for configuring and customizing font access
 License:        MIT and Public Domain and UCD
 URL:            http://fontconfig.org
-Source0:        http://fontconfig.org/release/%{name}-%{version}.tar.bz2
+Source0:        http://fontconfig.org/release/%{name}-%{version}.tar.xz
 Source1:        fc-cache
+Source2:	FcConfigGetFilename.3
 
-BuildRequires:  expat-devel freetype-devel >= %{freetype_version} fontpackages-devel libuuid-devel
+Patch6000:	backport-fontconfig-disable-network-required-test.patch
+Patch6001:	backport-Report-more-detailed-logs-instead-of-assertion.patch
+
+BuildRequires:  libxml2-devel freetype-devel >= %{freetype_version} fontpackages-devel libuuid-devel
 BuildRequires:  autoconf automake libtool gettext itstool gperf
 Requires:       fontpackages-filesystem freetype >= 2.9.1  grep coreutils glibc font(:lang=en)
 Suggests:       dejavu-sans-fonts
@@ -23,7 +27,7 @@ be used in concert with the X Render Extension and FreeType to implement high qu
 
 %package        devel
 Summary:        Font configuration and customization library
-Requires:       %{name}%{?_isa} = %{version}-%{release} freetype-devel >= %{freetype_version} pkgconfig gettext
+Requires:       %{name} = %{version}-%{release} freetype-devel >= %{freetype_version} pkgconfig gettext
 
 %description    devel
 The fontconfig-devel package includes the header files,and developer docs for the fontconfig package.
@@ -40,11 +44,14 @@ applications that uses fontconfig.
 
 %prep
 %autosetup -n %{name}-%{version} -p1
+cp %{SOURCE2} $RPM_BUILD_DIR/%{name}-%{version}/doc
 
 %build
 export HASDOCBOOK=no
+
 autoreconf
 %configure      --with-add-fonts=/usr/share/X11/fonts/Type1,/usr/share/X11/fonts/TTF,/usr/local/share/fonts \
+                --enable-libxml2 \
                 --disable-static --with-cache-dir=/usr/lib/fontconfig/cache
 %make_build
 
@@ -115,11 +122,26 @@ HOME=/root /usr/bin/fc-cache -s
 %{_mandir}/man3/*
 
 %changelog
-* Fri Apr 10 2020 openEuler Buildteam <buildteam@openeuler.org> - 2.13.1-4
+* Thu Aug 31 2023 penghaitao <htpengc@isoftstone.com> - 2.13.94-3
-- Type:bugfix
+- Report more detailed logs by default instead of assertion
-- ID:NA
+
+* Fri Oct 21 2022 zhouwenpei <zhouwenpei1@h-partners.com> - 2.13.94-2
+- delete sensitive words in changelog
+
+* Tue Dec 07 2021 liuyumeng <liuyumeng5@huawei.com> - 2.13.94-1
+- update to fontconfig-2.13.94-1
+
+* Fri Jun 12 2020 hanhui<hanhui15@huawei.com> - 2.13.92-1
+- Type:requirement
+- Id:NA
 - SUG:NA
-- DESC:remove 25-no-bitmap-fedora.conf and 25-no-bitmap.conf
+- DESC:upgrade to 2.13.92
+
+* Thu Apr 9 2020 wuyue<wuyue1@huawei.com> - 2.13.1-4
+- Type:bugfix
+- Id:NA
+- SUG:NA
+- DESC:remove 25-no-bitmap-fedora.conf and  25-no-bitmap.conf
 
 * Thu Jan 9 2020 openEuler Buildteam <buildteam@openeuler.org> - 2.13.1-3
 - Type:enhancement

fontconfig.yaml

@@ -0,0 +1,4 @@
+version_control: git
+src_repo: https://gitlab.freedesktop.org/fontconfig/fontconfig.git
+tag_prefix: "^"
+seperator: "."